Skip to content

fix: update Java grammar to fix parsing of lambda switch rule results and keyword statement labels #953

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jtkiesel merged 1 commit into from
Jun 25, 2026
Merged

fix: update Java grammar to fix parsing of lambda switch rule results and keyword statement labels #953

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
"mitata": "^1.0.34",
"mocha": "^11.7.5",
"prettier": "^3.8.1",
"tree-sitter-java-orchard": "0.5.6",
"tree-sitter-java-orchard": "0.5.8",
"tsdown": "^0.22.0",
"typescript": "^6.0.3",
"typescript-eslint": "^8.57.1"
Expand Down
4 changes: 4 additions & 0 deletions test/unit-test/expressions/_input.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,10 @@ public void printIf() {
}
}

void labeledStatement() {
record: if (true) {}
}

public void printSwitch() {
switch(myValue == 42 || myValue == 42 && myValue == 42 && myValue == 42 || myValue == 42 && myValue == 42) {

Expand Down
5 changes: 5 additions & 0 deletions test/unit-test/expressions/_output.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,11 @@ public void printIf() {
}
}

void labeledStatement() {
record: if (true) {
}
}

public void printSwitch() {
switch (
myValue == 42 ||
Expand Down
9 changes: 9 additions & 0 deletions test/unit-test/lambda/arrow-parens-always/_input.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,15 @@ void lambdaInParentheses() {
void lambdaWithAssignmentBody() {
a -> b = c;
}

void switchRulesWithLambdaResults() {
Function<Integer, Integer> f = switch (o) {
case false -> a -> a + 1;
case B -> a -> a + 2;
case Boolean b when b -> a -> a + 3;
default -> c -> c + 4;
};
}
}

class T {
Expand Down
9 changes: 9 additions & 0 deletions test/unit-test/lambda/arrow-parens-always/_output.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -575,6 +575,15 @@ void lambdaInParentheses() {
void lambdaWithAssignmentBody() {
(a) -> b = c;
}

void switchRulesWithLambdaResults() {
Function<Integer, Integer> f = switch (o) {
case false -> (a) -> a + 1;
case B -> (a) -> a + 2;
case Boolean b when b -> (a) -> a + 3;
default -> (c) -> c + 4;
};
}
}

class T {
Expand Down
9 changes: 9 additions & 0 deletions test/unit-test/lambda/arrow-parens-avoid/_input.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,15 @@ void lambdaInParentheses() {
void lambdaWithAssignmentBody() {
a -> b = c;
}

void switchRulesWithLambdaResults() {
Function<Integer, Integer> f = switch (o) {
case false -> a -> a + 1;
case B -> a -> a + 2;
case Boolean b when b -> a -> a + 3;
default -> c -> c + 4;
};
}
}

class T {
Expand Down
9 changes: 9 additions & 0 deletions test/unit-test/lambda/arrow-parens-avoid/_output.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -575,6 +575,15 @@ void lambdaInParentheses() {
void lambdaWithAssignmentBody() {
a -> b = c;
}

void switchRulesWithLambdaResults() {
Function<Integer, Integer> f = switch (o) {
case false -> a -> a + 1;
case B -> a -> a + 2;
case Boolean b when b -> a -> a + 3;
default -> c -> c + 4;
};
}
}

class T {
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4751,10 +4751,10 @@ tree-kill@^1.2.2:
resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.2.tgz#4ca09a9092c88b73a7cdc5e8a01b507b0790a0cc"
integrity sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==

tree-sitter-java-orchard@0.5.6:
version "0.5.6"
resolved "https://registry.yarnpkg.com/tree-sitter-java-orchard/-/tree-sitter-java-orchard-0.5.6.tgz#9bcac73eee928ef8fbf4c2c8c57de2d0627711b3"
integrity sha512-nn6D9bE73ltYTtLudi3fxJ4/lFQCcRyXb9qaVRGOcv5Xi+y0xQNZ/z4PJaVki+KqaiIcR70tViZztLhnSvouYA==
tree-sitter-java-orchard@0.5.8:
version "0.5.8"
resolved "https://registry.yarnpkg.com/tree-sitter-java-orchard/-/tree-sitter-java-orchard-0.5.8.tgz#c3e2f02ce4c1aabe2fa66cd21c91ffc0620b7b56"
integrity sha512-vT7d1MbTL2ceVkfqZZRr0AVfNC2b2Vl/bReql4kJ4cMfbT3K/RS4FlK05bjaW/Q6gAa7FEHFP9HODIQDLXr1Zg==
dependencies:
node-addon-api "^8.3.1"
node-gyp-build "^4.8.4"
Expand Down