JavaIndenter: fix BadLocationException in first line - fixes 1955

Used to happen in breakpoint condition #1955
eclipse-jdt · Jan 23, 2025 · d5ec49f · d5ec49f
1 parent e079114
commit d5ec49f
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/JavaIndenter.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/JavaIndenter.java
@@ -805,8 +805,11 @@ else if (!bracelessBlockStart && fPrefs.prefIndentBracesForMethods)
 								fAlign= JavaHeuristicScanner.NOT_FOUND;
 								fIndent= fPrefs.prefContinuationIndent;
 							} else {
-								int previousLineOffset= fDocument.getLineOffset(fDocument.getLineOfOffset(offset) - 1);
-								fAlign= fScanner.findNonWhitespaceForwardInAnyPartition(previousLineOffset, JavaHeuristicScanner.UNBOUND);
+								int lineOfOffset= fDocument.getLineOfOffset(offset);
+								if (lineOfOffset != 0) {
+									int previousLineOffset= fDocument.getLineOffset(lineOfOffset - 1);
+									fAlign= fScanner.findNonWhitespaceForwardInAnyPartition(previousLineOffset, JavaHeuristicScanner.UNBOUND);
+								}
 							}
 							return fPosition;
 						}
@@ -1127,8 +1130,11 @@ public int findReferencePosition(int offset, boolean danglingElse, boolean match
 							fAlign= JavaHeuristicScanner.NOT_FOUND;
 							fIndent= fPrefs.prefContinuationIndent;
 						} else {
-							int previousLineOffset= fDocument.getLineOffset(fDocument.getLineOfOffset(offset) - 1);
-							fAlign= fScanner.findNonWhitespaceForwardInAnyPartition(previousLineOffset, JavaHeuristicScanner.UNBOUND);
+							int lineOfOffset= fDocument.getLineOfOffset(offset);
+							if (lineOfOffset != 0) {
+								int previousLineOffset= fDocument.getLineOffset(lineOfOffset - 1);
+								fAlign= fScanner.findNonWhitespaceForwardInAnyPartition(previousLineOffset, JavaHeuristicScanner.UNBOUND);
+							}
 						}
 					} catch (BadLocationException e) {
 						JavaPlugin.log(e);