Hopefully the final off-by-one bug with source positions

sampsyo · May 19, 2022 · 83ef192 · 83ef192
1 parent 6947e02
commit 83ef192
Showing 1 changed file with 21 additions and 12 deletions.
diff --git a/bril-rs/bril2json/src/lib.rs b/bril-rs/bril2json/src/lib.rs
@@ -32,19 +32,28 @@ impl Lines {
 
     fn get_position(&self, index: usize) -> Option<Position> {
         if self.use_pos {
-            Some(self.new_lines.iter().enumerate().fold(
-                Position { col: 1, row: 1 },
-                |current, (line_num, idx)| {
-                    if *idx < index {
+            Some(
+                self.new_lines
+                    .iter()
+                    .enumerate()
+                    .map(|(i, j)| (i + 1, j))
+                    .fold(
                         Position {
-                            row: (line_num + 1) as u64,
-                            col: (index - idx) as u64,
-                        }
-                    } else {
-                        current
-                    }
-                },
-            ))
+                            col: 1,
+                            row: index as u64,
+                        },
+                        |current, (line_num, idx)| {
+                            if *idx < index {
+                                Position {
+                                    row: (line_num + 1) as u64,
+                                    col: (index - idx) as u64,
+                                }
+                            } else {
+                                current
+                            }
+                        },
+                    ),
+            )
         } else {
             None
         }