Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-19 00:41:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

[cmd3] Report incorrect coroutine usage on the variable use site (#8481)

Browse Source 
This makes error messages point directly at the variable use, instead of
on the enclosing AST node:

```
error: `outerCoroutine` may not be in scope
    outerCoroutine.yield()
    ^

error: `outerCoroutine` may not be in scope
    consume(x, outerCoroutine);
               ^
```

instead of 

```
error: `outerCoroutine` may not be in scope
    outerCoroutine.yield()
                        ^

error: `outerCoroutine` may not be in scope
    consume(x, outerCoroutine);
           ^
```
This commit is contained in:
Sam Carlberg
2025-12-17 01:23:30 -05:00
committed by GitHub
parent 6ef55654f6
commit 5bebaebcc0
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
javacPlugin/src/main/java/org/wpilib/javacplugin/IncorrectCoroutineUseDetector.java
View File

@@ -145,7 +145,7 @@ public class IncorrectCoroutineUseDetector extends CoroutineBasedDetector {
&& ve.asType().equals(m_coroutineType)
&& !state.isLocalCoroutine(ve)) {
m_trees.printMessage(
Diagnostic.Kind.ERROR, nonlocalCoroutineUsageMessage(ve, state), node, m_root);
Diagnostic.Kind.ERROR, nonlocalCoroutineUsageMessage(ve, state), id, m_root);
}
}
@@ -157,7 +157,10 @@ public class IncorrectCoroutineUseDetector extends CoroutineBasedDetector {
&& ve.asType().equals(m_coroutineType)
&& !state.isLocalCoroutine(ve)) {
m_trees.printMessage(
Diagnostic.Kind.ERROR, nonlocalCoroutineUsageMessage(ve, state), node, m_root);
Diagnostic.Kind.ERROR,
nonlocalCoroutineUsageMessage(ve, state),
argPath.getLeaf(),
m_root);
}
}

7
javacPlugin/src/test/java/org/wpilib/javacplugin/IncorrectCoroutineUseDetectorTest.java
View File

@@ -55,6 +55,7 @@ class IncorrectCoroutineUseDetectorTest {
assertEquals(
"Coroutine `outerCoroutine` may not be in scope. Consider using `innerCoroutine`",
error.getMessage(null));
assertEquals(7, error.getColumnNumber()); // leading "o" in "outerCoroutine.yield()"
}
@Test
@@ -90,6 +91,8 @@ class IncorrectCoroutineUseDetectorTest {
assertEquals(
"Coroutine `outerCoroutine` may not be in scope. Consider using `innerCoroutine`",
error.getMessage(null));
// leading "o" in "outerCoroutine" passed to `method(outerCoroutine)`
assertEquals(14, error.getColumnNumber());
}
@Test
@@ -126,6 +129,8 @@ class IncorrectCoroutineUseDetectorTest {
assertEquals(
"Coroutine `outerCoroutine` may not be in scope. Consider using `a` or `b`",
error.getMessage(null));
// leading "o" in "outerCoroutine" passed to `method(outerCoroutine)`
assertEquals(14, error.getColumnNumber());
}
@Test
@@ -166,6 +171,8 @@ class IncorrectCoroutineUseDetectorTest {
assertEquals(
"Coroutine `outerCoroutine` may not be in scope. Consider using `a`, `b`, or `c`",
error.getMessage(null));
// leading "o" in "outerCoroutine" passed to `method(outerCoroutine)`
assertEquals(14, error.getColumnNumber());
}
@Test