AnnotationPosition: avoid IOOBE on annotated var keyword usages

Stephan202 · Stephan202 · commit f0ef90904af6 · 2022-01-19T06:59:23.000+01:00
Fixes google#1327. See google#2867.
diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/AnnotationPosition.java b/core/src/main/java/com/google/errorprone/bugpatterns/AnnotationPosition.java
@@ -167,7 +167,7 @@ private static List<ErrorProneToken> annotationTokens(
         endPos = state.getEndPosition(methodTree);
       }
     } else if (tree instanceof JCVariableDecl) {
-      endPos = ((JCVariableDecl) tree).getType().getStartPosition();
+      endPos = state.getEndPosition(((JCVariableDecl) tree).getModifiers());
     } else if (tree instanceof JCClassDecl) {
       JCClassDecl classTree = (JCClassDecl) tree;
       endPos =
diff --git a/core/src/test/java/com/google/errorprone/bugpatterns/AnnotationPositionTest.java b/core/src/test/java/com/google/errorprone/bugpatterns/AnnotationPositionTest.java
@@ -513,4 +513,20 @@ public void parameters_withInterspersedModifiers() {
             "}")
         .doTest(TEXT_MATCH);
   }
+
+  @Test
+  public void varKeyword() {
+    refactoringHelper
+        .addInputLines(
+            "Test.java",
+            "import com.google.errorprone.annotations.Var;",
+            "class T {",
+            "  void m() {",
+            "    @Var var x = 1;",
+            "    x = 2;",
+            "  }",
+            "}")
+        .expectUnchanged()
+        .doTest(TEXT_MATCH);
+  }
 }

Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,7 @@ private static List<ErrorProneToken> annotationTokens(`
`167`	`167`	`endPos = state.getEndPosition(methodTree);`
`168`	`168`	`}`
`169`	`169`	`} else if (tree instanceof JCVariableDecl) {`
`170`		`- endPos = ((JCVariableDecl) tree).getType().getStartPosition();`
	`170`	`+ endPos = state.getEndPosition(((JCVariableDecl) tree).getModifiers());`
`171`	`171`	`} else if (tree instanceof JCClassDecl) {`
`172`	`172`	`JCClassDecl classTree = (JCClassDecl) tree;`
`173`	`173`	`endPos =`