I noticed in the byte-offsets refactor that the JsonEmitter uses on…

…e indexed column numbers for the the diagnostic start and end locations but not for `edits`. This PR changes the `JsonEmitter` to emit one-indexed column numbers for edits, the same as we already to for `Message::location` and `Message::end_location`.
astral-sh · May 10, 2023 · 9c079a3 · 9c079a3
1 parent 64c4cca
commit 9c079a3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 19 deletions.
diff --git a/crates/ruff/src/message/json.rs b/crates/ruff/src/message/json.rs
@@ -1,10 +1,10 @@
 use crate::message::{Emitter, EmitterContext, Message};
 use crate::registry::AsRule;
 use ruff_diagnostics::Edit;
-use ruff_python_ast::source_code::{SourceCode, SourceLocation};
+use ruff_python_ast::source_code::SourceCode;
 use serde::ser::SerializeSeq;
 use serde::{Serialize, Serializer};
-use serde_json::{json, Value};
+use serde_json::json;
 use std::io::Write;
 
 #[derive(Default)]
@@ -79,12 +79,10 @@ impl Serialize for ExpandedEdits<'_> {
         let mut s = serializer.serialize_seq(Some(self.edits.len()))?;
 
         for edit in self.edits {
-            let start_location = self.source_code.source_location(edit.start());
-            let end_location = self.source_code.source_location(edit.end());
             let value = json!({
                 "content": edit.content().unwrap_or_default(),
-                "location": to_zero_indexed_column(&start_location),
-                "end_location": to_zero_indexed_column(&end_location)
+                "location": self.source_code.source_location(edit.start()),
+                "end_location": self.source_code.source_location(edit.end())
             });
 
             s.serialize_element(&value)?;
@@ -94,13 +92,6 @@ impl Serialize for ExpandedEdits<'_> {
     }
 }
 
-fn to_zero_indexed_column(location: &SourceLocation) -> Value {
-    json!({
-        "row": location.row,
-        "column": location.column.to_zero_indexed()
-    })
-}
-
 #[cfg(test)]
 mod tests {
     use crate::message::tests::{capture_emitter_output, create_messages};

diff --git a/crates/ruff/src/message/snapshots/ruff__message__json__tests__output.snap b/crates/ruff/src/message/snapshots/ruff__message__json__tests__output.snap
@@ -14,11 +14,11 @@ expression: content
           "content": "",
           "location": {
             "row": 1,
-            "column": 0
+            "column": 1
           },
           "end_location": {
             "row": 2,
-            "column": 0
+            "column": 1
           }
         }
       ]
@@ -45,11 +45,11 @@ expression: content
           "content": "",
           "location": {
             "row": 6,
-            "column": 4
+            "column": 5
           },
           "end_location": {
             "row": 6,
-            "column": 9
+            "column": 10
           }
         }
       ]

diff --git a/crates/ruff_cli/tests/integration_test.rs b/crates/ruff_cli/tests/integration_test.rs
@@ -100,11 +100,11 @@ fn test_stdin_json() -> Result<()> {
           "content": "",
           "location": {{
             "row": 1,
-            "column": 0
+            "column": 1
           }},
           "end_location": {{
             "row": 2,
-            "column": 0
+            "column": 1
           }}
         }}
       ]