Fix for bug eclipse-jdt#1539

jakub-suliga · Jan 15, 2025 · b14ee04 · b14ee04
1 parent 8d52085
commit b14ee04
Showing 1 changed file with 3 additions and 11 deletions.
diff --git a/...clipse.jdt.ui/ui/org/eclipse/jdt/ui/text/folding/DefaultJavaFoldingStructureProvider.java b/...clipse.jdt.ui/ui/org/eclipse/jdt/ui/text/folding/DefaultJavaFoldingStructureProvider.java
@@ -1279,23 +1279,15 @@ protected final IRegion alignRegion(IRegion region, FoldingStructureComputationC
 		IDocument document= ctx.getDocument();
 
 		try {
-
 			int start= document.getLineOfOffset(region.getOffset());
-			int end= document.getLineOfOffset(region.getOffset() + region.getLength());
+			int end= document.getLineOfOffset(region.getOffset() + region.getLength() - 1);
 			if (start >= end)
 				return null;
-
-			int offset= document.getLineOffset(start);
-			int endOffset;
-			if (document.getNumberOfLines() > end + 1)
-				endOffset= document.getLineOffset(end + 1);
-			else
-				endOffset= document.getLineOffset(end) + document.getLineLength(end);
+			int offset = document.getLineOffset(start);
+			int endOffset = document.getLineOffset(end);
 
 			return new Region(offset, endOffset - offset);
-
 		} catch (BadLocationException x) {
-			// concurrent modification
 			return null;
 		}
 	}