Merge pull request #1784 from enebo/fix_line_calculation

ruby · Nov 7, 2023 · 4a459b2 · 4a459b2
2 parents d76f295 + 67a28e5
commit 4a459b2
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/templates/java/org/prism/Nodes.java.erb b/templates/java/org/prism/Nodes.java.erb
@@ -69,20 +69,22 @@ public abstract class Nodes {
             return Arrays.copyOf(lineOffsets, lineOffsetsSize);
         }
 
+        // 1-based
         public int line(int byteOffset) {
             return startLine + findLine(byteOffset);
         }
 
+        // 0-based
         public int findLine(int byteOffset) {
             assert byteOffset >= 0 && byteOffset < bytes.length : byteOffset;
             int index = Arrays.binarySearch(lineOffsets, byteOffset);
             int line;
             if (index < 0) {
-                line = -index - 1;
+                line = -index - 2;
             } else {
-                line = index + 1;
+                line = index;
             }
-            assert line >= 1 && line <= getLineCount() : line;
+            assert line >= 0 && line <= getLineCount() : line;
             return line;
         }