Handle final var lambda variables

cushon · google-java-format Team · commit 1fe678942551 · 2023-09-12T07:04:43.000-07:00
The start position of `final` variable is apparently after the token for `final`, this works around that by inlining a call to `visitVariable` and dropping the `sync` call that asserts the start position of the current node matches the next token. Fixes #959 PiperOrigin-RevId: 564710136
diff --git a/core/src/main/java/com/google/googlejavaformat/java/JavaInputAstVisitor.java b/core/src/main/java/com/google/googlejavaformat/java/JavaInputAstVisitor.java
@@ -1250,7 +1250,10 @@ public Void visitLambdaExpression(LambdaExpressionTree node, Void unused) {
         token(",");
         builder.breakOp(" ");
       }
-      scan(parameter, null);
+      visitVariables(
+          ImmutableList.of(parameter),
+          DeclarationKind.NONE,
+          fieldAnnotationDirection(parameter.getModifiers()));
       first = false;
     }
     if (parens) {
diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/I959.input b/core/src/test/resources/com/google/googlejavaformat/java/testdata/I959.input
@@ -0,0 +1,5 @@
+class I959 {
+  public void test() {
+      new File(".").listFiles((final var dir, final var name) -> true);
+  }
+}
diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/I959.output b/core/src/test/resources/com/google/googlejavaformat/java/testdata/I959.output
@@ -0,0 +1,5 @@
+class I959 {
+  public void test() {
+    new File(".").listFiles((final var dir, final var name) -> true);
+  }
+}

Original file line number	Diff line number	Diff line change
`@@ -1250,7 +1250,10 @@ public Void visitLambdaExpression(LambdaExpressionTree node, Void unused) {`
`1250`	`1250`	`token(",");`
`1251`	`1251`	`builder.breakOp(" ");`
`1252`	`1252`	`}`
`1253`		`- scan(parameter, null);`
	`1253`	`+ visitVariables(`
	`1254`	`+ ImmutableList.of(parameter),`
	`1255`	`+ DeclarationKind.NONE,`
	`1256`	`+ fieldAnnotationDirection(parameter.getModifiers()));`
`1254`	`1257`	`first = false;`
`1255`	`1258`	`}`
`1256`	`1259`	`if (parens) {`