Merge pull request #19033 from ChayimFriedman2/span-1

fix: Make proc_macro span's line & column 1-indexed, as documented
rust-lang · Jan 26, 2025 · be9710e · be9710e
2 parents 90bf50c + 3f2fb17
commit be9710e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/crates/proc-macro-srv/src/server_impl/rust_analyzer_span.rs b/crates/proc-macro-srv/src/server_impl/rust_analyzer_span.rs
@@ -392,12 +392,12 @@ impl server::Span for RaSpanServer {
 
     fn line(&mut self, _span: Self::Span) -> usize {
         // FIXME requires db to resolve line index, THIS IS NOT INCREMENTAL
-        0
+        1
     }
 
     fn column(&mut self, _span: Self::Span) -> usize {
         // FIXME requires db to resolve line index, THIS IS NOT INCREMENTAL
-        0
+        1
     }
 }
 

diff --git a/crates/proc-macro-srv/src/server_impl/token_id.rs b/crates/proc-macro-srv/src/server_impl/token_id.rs
@@ -291,11 +291,11 @@ impl server::Span for TokenIdServer {
     }
 
     fn line(&mut self, _span: Self::Span) -> usize {
-        0
+        1
     }
 
     fn column(&mut self, _span: Self::Span) -> usize {
-        0
+        1
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -291,11 +291,11 @@ impl server::Span for TokenIdServer { @@
         }
         fn line(&mut self, _span: Self::Span) -> usize {
         }
         fn column(&mut self, _span: Self::Span) -> usize {
         }
     }
@@ Expand Down @@