proc_macro_server: fix 0-based to 1-based num convertion

klensy · klensy · commit a0f38f3414dc · 2022-08-12T15:50:52.000+03:00
diff --git a/compiler/rustc_expand/src/proc_macro_server.rs b/compiler/rustc_expand/src/proc_macro_server.rs
@@ -633,13 +633,13 @@ impl server::Span for Rustc<'_, '_> {
     fn start(&mut self, span: Self::Span) -> LineColumn {
         let loc = self.sess().source_map().lookup_char_pos(span.lo());
         //FIXME: LineColumn.column is 1-based, but loc.col is 0-based
-        LineColumn { line: loc.line.to_usize(), column: loc.col.to_usize() }
+        LineColumn { line: loc.line.to_usize(), column: loc.col.to_usize() + 1 }
     }
 
     fn end(&mut self, span: Self::Span) -> LineColumn {
         let loc = self.sess().source_map().lookup_char_pos(span.hi());
         //FIXME: and here
-        LineColumn { line: loc.line.to_usize(), column: loc.col.to_usize() }
+        LineColumn { line: loc.line.to_usize(), column: loc.col.to_usize() + 1 }
     }
 
     fn before(&mut self, span: Self::Span) -> Self::Span {

Original file line number	Diff line number	Diff line change
`@@ -633,13 +633,13 @@ impl server::Span for Rustc<'_, '_> {`
`633`	`633`	`fn start(&mut self, span: Self::Span) -> LineColumn {`
`634`	`634`	`let loc = self.sess().source_map().lookup_char_pos(span.lo());`
`635`	`635`	`//FIXME: LineColumn.column is 1-based, but loc.col is 0-based`
`636`		`- LineColumn { line: loc.line.to_usize(), column: loc.col.to_usize() }`
	`636`	`+ LineColumn { line: loc.line.to_usize(), column: loc.col.to_usize() + 1 }`
`637`	`637`	`}`
`638`	`638`
`639`	`639`	`fn end(&mut self, span: Self::Span) -> LineColumn {`
`640`	`640`	`let loc = self.sess().source_map().lookup_char_pos(span.hi());`
`641`	`641`	`//FIXME: and here`
`642`		`- LineColumn { line: loc.line.to_usize(), column: loc.col.to_usize() }`
	`642`	`+ LineColumn { line: loc.line.to_usize(), column: loc.col.to_usize() + 1 }`
`643`	`643`	`}`
`644`	`644`
`645`	`645`	`fn before(&mut self, span: Self::Span) -> Self::Span {`