diff options
| author | Chayim Refael Friedman <chayimfr@gmail.com> | 2025-01-26 06:41:54 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-01-26 06:41:54 +0000 |
| commit | bbf9ff69c974439d7160d59aeb1883e13f1ba0c5 (patch) | |
| tree | d03cb6675d50d1cdebcc47b2033d3c214a976e70 | |
| parent | 2d94c69c6bd699b02b29a5893c0b2fd712296c57 (diff) | |
| parent | 3149e0ff83c8a0bbd87d8f2319d8b49eeb2ea605 (diff) | |
| download | rust-bbf9ff69c974439d7160d59aeb1883e13f1ba0c5.tar.gz rust-bbf9ff69c974439d7160d59aeb1883e13f1ba0c5.zip | |
Merge pull request #19033 from ChayimFriedman2/span-1
fix: Make proc_macro span's line & column 1-indexed, as documented
| -rw-r--r-- | src/tools/rust-analyzer/crates/proc-macro-srv/src/server_impl/rust_analyzer_span.rs | 4 | ||||
| -rw-r--r-- | src/tools/rust-analyzer/crates/proc-macro-srv/src/server_impl/token_id.rs | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/tools/rust-analyzer/crates/proc-macro-srv/src/server_impl/rust_analyzer_span.rs b/src/tools/rust-analyzer/crates/proc-macro-srv/src/server_impl/rust_analyzer_span.rs index c7614849e01..59293ee3f96 100644 --- a/src/tools/rust-analyzer/crates/proc-macro-srv/src/server_impl/rust_analyzer_span.rs +++ b/src/tools/rust-analyzer/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/src/tools/rust-analyzer/crates/proc-macro-srv/src/server_impl/token_id.rs b/src/tools/rust-analyzer/crates/proc-macro-srv/src/server_impl/token_id.rs index 466eb14b55e..409cf3cc781 100644 --- a/src/tools/rust-analyzer/crates/proc-macro-srv/src/server_impl/token_id.rs +++ b/src/tools/rust-analyzer/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 } } |