Skip to content

Commit bbf9ff6

Browse files
Merge pull request rust-lang#19033 from ChayimFriedman2/span-1
fix: Make proc_macro span's line & column 1-indexed, as documented
2 parents 2d94c69 + 3149e0f commit bbf9ff6

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/tools/rust-analyzer/crates/proc-macro-srv/src/server_impl/rust_analyzer_span.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -392,12 +392,12 @@ impl server::Span for RaSpanServer {
392392

393393
fn line(&mut self, _span: Self::Span) -> usize {
394394
// FIXME requires db to resolve line index, THIS IS NOT INCREMENTAL
395-
0
395+
1
396396
}
397397

398398
fn column(&mut self, _span: Self::Span) -> usize {
399399
// FIXME requires db to resolve line index, THIS IS NOT INCREMENTAL
400-
0
400+
1
401401
}
402402
}
403403

src/tools/rust-analyzer/crates/proc-macro-srv/src/server_impl/token_id.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -291,11 +291,11 @@ impl server::Span for TokenIdServer {
291291
}
292292

293293
fn line(&mut self, _span: Self::Span) -> usize {
294-
0
294+
1
295295
}
296296

297297
fn column(&mut self, _span: Self::Span) -> usize {
298-
0
298+
1
299299
}
300300
}
301301

0 commit comments

Comments
 (0)