Skip to content

Java: fix two comment-scanning defects that drop modifiers from the LST #8564

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
timtebeek merged 2 commits into from
Aug 20, 2026
Merged

Java: fix two comment-scanning defects that drop modifiers from the LST #8564

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c9f784b
Java: don't treat `/*` inside a line comment as a block comment opener
timtebeek Aug 19, 2026
611efaf
Java: `/*/` does not close a block comment in the modifier scanner
timtebeek Aug 19, 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
14 changes: 10 additions & 4 deletions ...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 @@ -2186,6 +2186,7 @@ private ReloadableJava11ModifierResults sortedModifiersAndAnnotations(ModifiersT
boolean afterFirstModifier = false;
boolean inComment = false;
boolean inMultilineComment = false;
int multilineCommentStart = -1;
final AtomicReference<String> word = new AtomicReference<>("");
int afterLastModifierPosition = cursor;
int lastAnnotationPosition = cursor;
Expand All @@ -2208,16 +2209,18 @@ private ReloadableJava11ModifierResults sortedModifiersAndAnnotations(ModifiersT
continue;
}
char c = source.charAt(i);
if (c == '/' && source.length() > i + 1) {
if (c == '/' && source.length() > i + 1 && !inComment && !inMultilineComment) {
char next = source.charAt(i + 1);
if (next == '*') {
inMultilineComment = true;
multilineCommentStart = i;
} else if (next == '/') {
inComment = true;
}
}

if (inMultilineComment && c == '/' && source.charAt(i - 1) == '*') {
// The closing `/` cannot be part of the opener, so `/*/` does not terminate a block comment.
if (inMultilineComment && c == '/' && i >= multilineCommentStart + 3 && source.charAt(i - 1) == '*') {
inMultilineComment = false;
} else if (inComment && (c == '\n' || c == '\r')) {
inComment = false;
Expand Down Expand Up @@ -2321,6 +2324,7 @@ private List<J.Annotation> collectAnnotations(Map<Integer, JCAnnotation> annotat
List<J.Annotation> annotations = new ArrayList<>();
boolean inComment = false;
boolean inMultilineComment = false;
int multilineCommentStart = -1;
for (int i = cursor; i <= maxAnnotationPosition && i < source.length(); i++) {
if (annotationPosTable.containsKey(i)) {
JCAnnotation jcAnnotation = annotationPosTable.get(i);
Expand All @@ -2333,16 +2337,18 @@ private List<J.Annotation> collectAnnotations(Map<Integer, JCAnnotation> annotat
continue;
}
char c = source.charAt(i);
if (c == '/' && source.length() > i + 1) {
if (c == '/' && source.length() > i + 1 && !inComment && !inMultilineComment) {
char next = source.charAt(i + 1);
if (next == '*') {
inMultilineComment = true;
multilineCommentStart = i;
} else if (next == '/') {
inComment = true;
}
}

if (inMultilineComment && c == '/' && i > 0 && source.charAt(i - 1) == '*') {
// The closing `/` cannot be part of the opener, so `/*/` does not terminate a block comment.
if (inMultilineComment && c == '/' && i >= multilineCommentStart + 3 && source.charAt(i - 1) == '*') {
inMultilineComment = false;
} else if (inComment && (c == '\n' || c == '\r')) {
inComment = false;
Expand Down
14 changes: 10 additions & 4 deletions ...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 @@ -2341,6 +2341,7 @@ private ReloadableJava17ModifierResults sortedModifiersAndAnnotations(ModifiersT
boolean afterFirstModifier = false;
boolean inComment = false;
boolean inMultilineComment = false;
int multilineCommentStart = -1;
int afterLastModifierPosition = cursor;
int lastAnnotationPosition = cursor;

Expand All @@ -2362,16 +2363,18 @@ private ReloadableJava17ModifierResults sortedModifiersAndAnnotations(ModifiersT
continue;
}
char c = source.charAt(i);
if (c == '/' && source.length() > i + 1) {
if (c == '/' && source.length() > i + 1 && !inComment && !inMultilineComment) {
char next = source.charAt(i + 1);
if (next == '*') {
inMultilineComment = true;
multilineCommentStart = i;
} else if (next == '/') {
inComment = true;
}
}

if (inMultilineComment && c == '/' && source.charAt(i - 1) == '*') {
// The closing `/` cannot be part of the opener, so `/*/` does not terminate a block comment.
if (inMultilineComment && c == '/' && i >= multilineCommentStart + 3 && source.charAt(i - 1) == '*') {
inMultilineComment = false;
} else if (inComment && (c == '\n' || c == '\r')) {
inComment = false;
Expand Down Expand Up @@ -2473,6 +2476,7 @@ private List<J.Annotation> collectAnnotations(Map<Integer, JCAnnotation> annotat
List<J.Annotation> annotations = new ArrayList<>();
boolean inComment = false;
boolean inMultilineComment = false;
int multilineCommentStart = -1;
for (int i = cursor; i <= maxAnnotationPosition && i < source.length(); i++) {
if (annotationPosTable.containsKey(i)) {
JCAnnotation jcAnnotation = annotationPosTable.get(i);
Expand All @@ -2485,16 +2489,18 @@ private List<J.Annotation> collectAnnotations(Map<Integer, JCAnnotation> annotat
continue;
}
char c = source.charAt(i);
if (c == '/' && source.length() > i + 1) {
if (c == '/' && source.length() > i + 1 && !inComment && !inMultilineComment) {
char next = source.charAt(i + 1);
if (next == '*') {
inMultilineComment = true;
multilineCommentStart = i;
} else if (next == '/') {
inComment = true;
}
}

if (inMultilineComment && c == '/' && i > 0 && source.charAt(i - 1) == '*') {
// The closing `/` cannot be part of the opener, so `/*/` does not terminate a block comment.
if (inMultilineComment && c == '/' && i >= multilineCommentStart + 3 && source.charAt(i - 1) == '*') {
inMultilineComment = false;
} else if (inComment && (c == '\n' || c == '\r')) {
inComment = false;
Expand Down
14 changes: 10 additions & 4 deletions ...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 @@ -2379,6 +2379,7 @@ private ReloadableJava21ModifierResults sortedModifiersAndAnnotations(ModifiersT
boolean afterFirstModifier = false;
boolean inComment = false;
boolean inMultilineComment = false;
int multilineCommentStart = -1;
int afterLastModifierPosition = cursor;
int lastAnnotationPosition = cursor;

Expand All @@ -2400,16 +2401,18 @@ private ReloadableJava21ModifierResults sortedModifiersAndAnnotations(ModifiersT
continue;
}
char c = source.charAt(i);
if (c == '/' && source.length() > i + 1) {
if (c == '/' && source.length() > i + 1 && !inComment && !inMultilineComment) {
char next = source.charAt(i + 1);
if (next == '*') {
inMultilineComment = true;
multilineCommentStart = i;
} else if (next == '/') {
inComment = true;
}
}

if (inMultilineComment && c == '/' && source.charAt(i - 1) == '*') {
// The closing `/` cannot be part of the opener, so `/*/` does not terminate a block comment.
if (inMultilineComment && c == '/' && i >= multilineCommentStart + 3 && source.charAt(i - 1) == '*') {
inMultilineComment = false;
} else if (inComment && (c == '\n' || c == '\r')) {
inComment = false;
Expand Down Expand Up @@ -2511,6 +2514,7 @@ private List<J.Annotation> collectAnnotations(Map<Integer, JCAnnotation> annotat
List<J.Annotation> annotations = new ArrayList<>();
boolean inComment = false;
boolean inMultilineComment = false;
int multilineCommentStart = -1;
for (int i = cursor; i <= maxAnnotationPosition && i < source.length(); i++) {
if (annotationPosTable.containsKey(i)) {
JCAnnotation jcAnnotation = annotationPosTable.get(i);
Expand All @@ -2523,16 +2527,18 @@ private List<J.Annotation> collectAnnotations(Map<Integer, JCAnnotation> annotat
continue;
}
char c = source.charAt(i);
if (c == '/' && source.length() > i + 1) {
if (c == '/' && source.length() > i + 1 && !inComment && !inMultilineComment) {
char next = source.charAt(i + 1);
if (next == '*') {
inMultilineComment = true;
multilineCommentStart = i;
} else if (next == '/') {
inComment = true;
}
}

if (inMultilineComment && c == '/' && i > 0 && source.charAt(i - 1) == '*') {
// The closing `/` cannot be part of the opener, so `/*/` does not terminate a block comment.
if (inMultilineComment && c == '/' && i >= multilineCommentStart + 3 && source.charAt(i - 1) == '*') {
inMultilineComment = false;
} else if (inComment && (c == '\n' || c == '\r')) {
inComment = false;
Expand Down
14 changes: 10 additions & 4 deletions ...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 @@ -2411,6 +2411,7 @@ private ReloadableJava25ModifierResults sortedModifiersAndAnnotations(ModifiersT
boolean afterFirstModifier = false;
boolean inComment = false;
boolean inMultilineComment = false;
int multilineCommentStart = -1;
int afterLastModifierPosition = cursor;
int lastAnnotationPosition = cursor;

Expand All @@ -2432,16 +2433,18 @@ private ReloadableJava25ModifierResults sortedModifiersAndAnnotations(ModifiersT
continue;
}
char c = source.charAt(i);
if (c == '/' && source.length() > i + 1) {
if (c == '/' && source.length() > i + 1 && !inComment && !inMultilineComment) {
char next = source.charAt(i + 1);
if (next == '*') {
inMultilineComment = true;
multilineCommentStart = i;
} else if (next == '/') {
inComment = true;
}
}

if (inMultilineComment && c == '/' && source.charAt(i - 1) == '*') {
// The closing `/` cannot be part of the opener, so `/*/` does not terminate a block comment.
if (inMultilineComment && c == '/' && i >= multilineCommentStart + 3 && source.charAt(i - 1) == '*') {
inMultilineComment = false;
} else if (inComment && (c == '\n' || c == '\r')) {
inComment = false;
Expand Down Expand Up @@ -2543,6 +2546,7 @@ private List<J.Annotation> collectAnnotations(Map<Integer, JCAnnotation> annotat
List<J.Annotation> annotations = new ArrayList<>();
boolean inComment = false;
boolean inMultilineComment = false;
int multilineCommentStart = -1;
for (int i = cursor; i <= maxAnnotationPosition && i < source.length(); i++) {
if (annotationPosTable.containsKey(i)) {
JCAnnotation jcAnnotation = annotationPosTable.get(i);
Expand All @@ -2555,16 +2559,18 @@ private List<J.Annotation> collectAnnotations(Map<Integer, JCAnnotation> annotat
continue;
}
char c = source.charAt(i);
if (c == '/' && source.length() > i + 1) {
if (c == '/' && source.length() > i + 1 && !inComment && !inMultilineComment) {
char next = source.charAt(i + 1);
if (next == '*') {
inMultilineComment = true;
multilineCommentStart = i;
} else if (next == '/') {
inComment = true;
}
}

if (inMultilineComment && c == '/' && i > 0 && source.charAt(i - 1) == '*') {
// The closing `/` cannot be part of the opener, so `/*/` does not terminate a block comment.
if (inMultilineComment && c == '/' && i >= multilineCommentStart + 3 && source.charAt(i - 1) == '*') {
inMultilineComment = false;
} else if (inComment && (c == '\n' || c == '\r')) {
inComment = false;
Expand Down
14 changes: 10 additions & 4 deletions 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 @@ -2168,6 +2168,7 @@ private Java8ModifierResults sortedModifiersAndAnnotations(ModifiersTree modifie
boolean afterFirstModifier = false;
boolean inComment = false;
boolean inMultilineComment = false;
int multilineCommentStart = -1;
final AtomicReference<String> word = new AtomicReference<>("");
int afterLastModifierPosition = cursor;
int lastAnnotationPosition = cursor;
Expand All @@ -2190,16 +2191,18 @@ private Java8ModifierResults sortedModifiersAndAnnotations(ModifiersTree modifie
continue;
}
char c = source.charAt(i);
if (c == '/' && source.length() > i + 1) {
if (c == '/' && source.length() > i + 1 && !inComment && !inMultilineComment) {
char next = source.charAt(i + 1);
if (next == '*') {
inMultilineComment = true;
multilineCommentStart = i;
} else if (next == '/') {
inComment = true;
}
}

if (inMultilineComment && c == '/' && source.charAt(i - 1) == '*') {
// The closing `/` cannot be part of the opener, so `/*/` does not terminate a block comment.
if (inMultilineComment && c == '/' && i >= multilineCommentStart + 3 && source.charAt(i - 1) == '*') {
inMultilineComment = false;
} else if (inComment && (c == '\n' || c == '\r')) {
inComment = false;
Expand Down Expand Up @@ -2303,6 +2306,7 @@ private List<J.Annotation> collectAnnotations(Map<Integer, JCAnnotation> annotat
List<J.Annotation> annotations = new ArrayList<>();
boolean inComment = false;
boolean inMultilineComment = false;
int multilineCommentStart = -1;
for (int i = cursor; i <= maxAnnotationPosition && i < source.length(); i++) {
if (annotationPosTable.containsKey(i)) {
JCAnnotation jcAnnotation = annotationPosTable.get(i);
Expand All @@ -2315,16 +2319,18 @@ private List<J.Annotation> collectAnnotations(Map<Integer, JCAnnotation> annotat
continue;
}
char c = source.charAt(i);
if (c == '/' && source.length() > i + 1) {
if (c == '/' && source.length() > i + 1 && !inComment && !inMultilineComment) {
char next = source.charAt(i + 1);
if (next == '*') {
inMultilineComment = true;
multilineCommentStart = i;
} else if (next == '/') {
inComment = true;
}
}

if (inMultilineComment && c == '/' && i > 0 && source.charAt(i - 1) == '*') {
// The closing `/` cannot be part of the opener, so `/*/` does not terminate a block comment.
if (inMultilineComment && c == '/' && i >= multilineCommentStart + 3 && source.charAt(i - 1) == '*') {
inMultilineComment = false;
} else if (inComment && (c == '\n' || c == '\r')) {
inComment = false;
Expand Down
76 changes: 76 additions & 0 deletions rewrite-java-tck/src/main/java/org/openrewrite/java/tree/CommentTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,82 @@ class Test {// /*
);
}

@Test
void multilineOpenerInsideSingleLineCommentBeforeMethodModifier() {
rewriteRun(
java(
"""
class Test {
@Deprecated //*not a block comment
public String value() {
return null;
}
}
"""
)
);
}

@Test
void multilineOpenerInsideSingleLineCommentBeforeMultipleModifiers() {
rewriteRun(
java(
"""
class Test {
@Deprecated //*not a block comment
public static String value() {
return null;
}
}
"""
)
);
}

@Test
void multilineOpenerLaterInSingleLineCommentBeforeFieldModifier() {
rewriteRun(
java(
"""
class Test {
@Deprecated //see /*.java
public int value = 1;
}
"""
)
);
}

@Test
void slashImmediatelyAfterMultilineOpenerBeforeModifier() {
rewriteRun(
java(
"""
class Test {
@Deprecated /*/ not the end of the comment */ public String value() {
return null;
}
}
"""
)
);
}

@Test
void singleLineOpenerInsideMultilineCommentBeforeModifiers() {
rewriteRun(
java(
"""
class Test {
@Deprecated /* // */ public static String value() {
return null;
}
}
"""
)
);
}

@Issue("https://github.com/openrewrite/rewrite/issues/4995")
@Test
void trailingComment() {
Expand Down