Skip to content

Commit e19b763

Browse files
cushoncpovirk
authored andcommitted
Support var in enhanced for loops
Fixes #463 ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=308891540
1 parent ca529a2 commit e19b763

File tree

3 files changed

+19
-3
lines changed

3 files changed

+19
-3
lines changed

core/src/main/java/com/google/googlejavaformat/java/JavaInputAstVisitor.java

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2561,13 +2561,21 @@ private void visitToDeclare(
25612561
String equals,
25622562
Optional<String> trailing) {
25632563
sync(node);
2564-
TypeWithDims extractedDims = DimensionHelpers.extractDims(node.getType(), SortedDims.YES);
2565-
Optional<TypeWithDims> typeWithDims = Optional.of(extractedDims);
2564+
Optional<TypeWithDims> typeWithDims;
2565+
Tree type;
2566+
if (node.getType() != null) {
2567+
TypeWithDims extractedDims = DimensionHelpers.extractDims(node.getType(), SortedDims.YES);
2568+
typeWithDims = Optional.of(extractedDims);
2569+
type = extractedDims.node;
2570+
} else {
2571+
typeWithDims = Optional.empty();
2572+
type = null;
2573+
}
25662574
declareOne(
25672575
kind,
25682576
annotationsDirection,
25692577
Optional.of(node.getModifiers()),
2570-
extractedDims.node,
2578+
type,
25712579
node.getName(),
25722580
"",
25732581
equals,

core/src/test/resources/com/google/googlejavaformat/java/testdata/java14.input

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,8 @@ class Java14 {
4343
case WEDNESDAY -> 9;
4444
};
4545
}
46+
47+
{
48+
for (var arg : List.of()) {}
49+
}
4650
}

core/src/test/resources/com/google/googlejavaformat/java/testdata/java14.output

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,8 @@ class Java14 {
4444
case WEDNESDAY -> 9;
4545
};
4646
}
47+
48+
{
49+
for (var arg : List.of()) {}
50+
}
4751
}

0 commit comments

Comments
 (0)