Adds offset '1', because pyrights offsets are zero-based (issue #25) (#…

…26) * Adds offset '1', because pyrights offsets are zero-based (issue #25) * Adds offset '1', because pyrights offsets are zero-based (issue #25) * Update pyright_to_rdjson/pyright_to_rdjson.py Co-authored-by: Jordan Webb <[email protected]> * Update pyright_to_rdjson/pyright_to_rdjson.py Co-authored-by: Jordan Webb <[email protected]> * Update pyright_to_rdjson/tests/test_pyright_to_rdjson.py Co-authored-by: Jordan Webb <[email protected]> * Update pyright_to_rdjson/tests/test_pyright_to_rdjson.py Co-authored-by: Jordan Webb <[email protected]> Co-authored-by: Jordan Webb <[email protected]>
jordemort · Mar 24, 2022 · a72509b · a72509b
1 parent 0f069d0
commit a72509b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/pyright_to_rdjson/pyright_to_rdjson.py b/pyright_to_rdjson/pyright_to_rdjson.py
@@ -33,12 +33,13 @@ def pyright_to_rdjson(jsonin: TextIO):
                     "path": d["file"],
                     "range": {
                         "start": {
-                            "line": d["range"]["start"]["line"],
-                            "column": d["range"]["start"]["character"],
+                            # pyright uses zero-based offsets
+                            "line": d["range"]["start"]["line"] + 1,
+                            "column": d["range"]["start"]["character"] + 1,
                         },
                         "end": {
-                            "line": d["range"]["end"]["line"],
-                            "column": d["range"]["end"]["character"],
+                            "line": d["range"]["end"]["line"] + 1,
+                            "column": d["range"]["end"]["character"] + 1,
                         },
                     },
                 },

diff --git a/pyright_to_rdjson/tests/test_pyright_to_rdjson.py b/pyright_to_rdjson/tests/test_pyright_to_rdjson.py
@@ -43,8 +43,9 @@ def test_pyright_to_rdjson(self):
             pyright_line_start = pyright_line_range["start"]
             pyright_line_end = pyright_line_range["end"]
 
-            assert rdjson_line_start["line"] == pyright_line_start["line"]
-            assert rdjson_line_start["column"] == pyright_line_start["character"]
+            # pyrights offsets are zero-based
+            assert rdjson_line_start["line"] == pyright_line_start["line"] + 1
+            assert rdjson_line_start["column"] == pyright_line_start["character"] + 1
 
-            assert rdjson_line_end["line"] == pyright_line_end["line"]
-            assert rdjson_line_end["column"] == pyright_line_end["character"]
+            assert rdjson_line_end["line"] == pyright_line_end["line"] + 1
+            assert rdjson_line_end["column"] == pyright_line_end["character"] + 1