Skip to content

Java: Fix parsing of extra semicolons after imports #7138

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
greg-at-moderne merged 3 commits into from
Mar 25, 2026
Merged

Java: Fix parsing of extra semicolons after imports #7138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7f39c55
Fix extra semicolons after imports
greg-at-moderne Mar 25, 2026
5264b55
Test case for #6310
greg-at-moderne Mar 25, 2026
f92e67a
Merge comments
greg-at-moderne Mar 25, 2026
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
7 changes: 6 additions & 1 deletion ...te-java-11/src/main/java/org/openrewrite/java/isolated/ReloadableJava11ParserVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -719,7 +719,12 @@ public J visitIf(IfTree node, Space fmt) {

@Override
public J visitImport(ImportTree node, Space fmt) {
skip("import");
Space beforeImport = sourceBefore("import");
if (!beforeImport.isEmpty()) {
fmt = Space.build(
fmt.getWhitespace() + beforeImport.getWhitespace(),
ListUtils.concatAll(fmt.getComments(), beforeImport.getComments()));
}
return new J.Import(randomId(), fmt, Markers.EMPTY,
new JLeftPadded<>(node.isStatic() ? sourceBefore("static") : EMPTY,
node.isStatic(), Markers.EMPTY),
Expand Down
7 changes: 6 additions & 1 deletion ...te-java-17/src/main/java/org/openrewrite/java/isolated/ReloadableJava17ParserVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -825,7 +825,12 @@ public J visitIf(IfTree node, Space fmt) {

@Override
public J visitImport(ImportTree node, Space fmt) {
skip("import");
Space beforeImport = sourceBefore("import");
if (!beforeImport.isEmpty()) {
fmt = Space.build(
fmt.getWhitespace() + beforeImport.getWhitespace(),
ListUtils.concatAll(fmt.getComments(), beforeImport.getComments()));
}
return new J.Import(randomId(), fmt, Markers.EMPTY,
new JLeftPadded<>(node.isStatic() ? sourceBefore("static") : EMPTY,
node.isStatic(), Markers.EMPTY),
Expand Down
7 changes: 6 additions & 1 deletion ...te-java-21/src/main/java/org/openrewrite/java/isolated/ReloadableJava21ParserVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -832,7 +832,12 @@ public J visitIf(IfTree node, Space fmt) {

@Override
public J visitImport(ImportTree node, Space fmt) {
skip("import");
Space beforeImport = sourceBefore("import");
if (!beforeImport.isEmpty()) {
fmt = Space.build(
fmt.getWhitespace() + beforeImport.getWhitespace(),
ListUtils.concatAll(fmt.getComments(), beforeImport.getComments()));
}
return new J.Import(randomId(), fmt, Markers.EMPTY,
new JLeftPadded<>(node.isStatic() ? sourceBefore("static") : EMPTY,
node.isStatic(), Markers.EMPTY),
Expand Down
7 changes: 6 additions & 1 deletion ...te-java-25/src/main/java/org/openrewrite/java/isolated/ReloadableJava25ParserVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -848,7 +848,12 @@ public J visitIf(IfTree node, Space fmt) {

@Override
public J visitImport(ImportTree node, Space fmt) {
skip("import");
Space beforeImport = sourceBefore("import");
if (!beforeImport.isEmpty()) {
fmt = Space.build(
fmt.getWhitespace() + beforeImport.getWhitespace(),
ListUtils.concatAll(fmt.getComments(), beforeImport.getComments()));
}
return new J.Import(randomId(), fmt, Markers.EMPTY,
new JLeftPadded<>(node.isStatic() ? sourceBefore("static") : EMPTY,
node.isStatic(), Markers.EMPTY),
Expand Down
7 changes: 6 additions & 1 deletion rewrite-java-8/src/main/java/org/openrewrite/java/ReloadableJava8ParserVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -718,7 +718,12 @@ public J visitIf(IfTree node, Space fmt) {

@Override
public J visitImport(ImportTree node, Space fmt) {
skip("import");
Space beforeImport = sourceBefore("import");
if (!beforeImport.isEmpty()) {
fmt = Space.build(
fmt.getWhitespace() + beforeImport.getWhitespace(),
ListUtils.concatAll(fmt.getComments(), beforeImport.getComments()));
}
return new J.Import(randomId(), fmt, Markers.EMPTY,
new JLeftPadded<>(node.isStatic() ? sourceBefore("static") : EMPTY,
node.isStatic(), Markers.EMPTY),
Expand Down
24 changes: 21 additions & 3 deletions rewrite-java-tck/src/main/java/org/openrewrite/java/tree/ImportTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
*/
package org.openrewrite.java.tree;

import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.openrewrite.Issue;
import org.openrewrite.test.RewriteTest;
Expand Down Expand Up @@ -188,7 +187,6 @@ void spaceBeforeSemiColon() {
);
}

@Disabled("Parser does not support semicolon after package declaration yet")
@Issue("https://github.com/openrewrite/rewrite-migrate-java/issues/396")
@Test
void semicolonAfterPackage() {
Expand All @@ -206,7 +204,6 @@ class AfterPackage { }
);
}

@Disabled("Parser does not support semicolon between imports yet")
@Issue("https://github.com/openrewrite/rewrite-migrate-java/issues/396")
@Test
void semicolonBetweenImports() {
Expand Down Expand Up @@ -239,4 +236,25 @@ void semicolonAfterImports() {
)
);
}

@Issue("https://github.com/openrewrite/rewrite/issues/6310")
@Test
void extraSemicolonAfterImportWithComment() {
rewriteRun(
spec -> spec
.typeValidationOptions(TypeValidation.all().allowNonWhitespaceInWhitespace(true)),
java(
"""
import java.util.*;; // Semicolon here
import java.io.*; // Followed by another import

public class Main {
public static void main(String[] args) {
System.out.printf("Hello and welcome!");
}
}
"""
)
);
}
}