Post merge fix

jlahoda · jlahoda · commit 3f54dc01f165 · 2025-08-14T07:15:55.000+02:00
diff --git a/java/java.editor.base/src/org/netbeans/modules/java/editor/base/semantic/SemanticHighlighterBase.java b/java/java.editor.base/src/org/netbeans/modules/java/editor/base/semantic/SemanticHighlighterBase.java
@@ -714,6 +714,7 @@ public Void visitRequires(RequiresTree tree, Void p) {
         @Override
         public Void visitCase(CaseTree node, Void p) {
             int restartIndex = tl.index();
+            int restartOffset = tl.embeddedOffset();
             tl.moveToOffset(sourcePositions.getStartPosition(info.getCompilationUnit(), node));
             List<? extends CaseLabelTree> labels = node.getLabels();
             for (CaseLabelTree labelTree : labels) {
@@ -726,7 +727,7 @@ public Void visitCase(CaseTree node, Void p) {
                     }
                 }
             }
-            tl.resetToIndex(restartIndex);
+            tl.resetToIndex(restartIndex, restartOffset);
             return super.visitCase(node, p);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -714,6 +714,7 @@ public Void visitRequires(RequiresTree tree, Void p) {`
`714`	`714`	`@Override`
`715`	`715`	`public Void visitCase(CaseTree node, Void p) {`
`716`	`716`	`int restartIndex = tl.index();`
	`717`	`+ int restartOffset = tl.embeddedOffset();`
`717`	`718`	`tl.moveToOffset(sourcePositions.getStartPosition(info.getCompilationUnit(), node));`
`718`	`719`	`List<? extends CaseLabelTree> labels = node.getLabels();`
`719`	`720`	`for (CaseLabelTree labelTree : labels) {`
`@@ -726,7 +727,7 @@ public Void visitCase(CaseTree node, Void p) {`
`726`	`727`	`}`
`727`	`728`	`}`
`728`	`729`	`}`
`729`		`- tl.resetToIndex(restartIndex);`
	`730`	`+ tl.resetToIndex(restartIndex, restartOffset);`
`730`	`731`	`return super.visitCase(node, p);`
`731`	`732`	`}`
`732`	`733`