bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Use correct span for structured suggestion

Browse source 
On structured suggestion for `let` -> `const`  and `const` -> `let`, use
a proper `Span` and update tests to check the correct application.

Follow up to #80012.
This commit is contained in:
Esteban Küber 2021-01-07 16:44:08 -08:00
parent c8915eebea
commit 9a5dcaab67
27 changed files with 146 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/rustc_span/src/source_map.rs
View file

@ -671,7 +671,9 @@ impl SourceMap {
let pat = pat.to_owned() + ws;
if let Ok(prev_source) = self.span_to_prev_source(sp) {
let prev_source = prev_source.rsplit(&pat).next().unwrap_or("").trim_start();
if !prev_source.is_empty() && (!prev_source.contains('\n') || accept_newlines) {
if prev_source.is_empty() && sp.lo().0 != 0 {
return sp.with_lo(BytePos(sp.lo().0 - 1));
} else if !prev_source.contains('\n') || accept_newlines {
return sp.with_lo(BytePos(sp.lo().0 - prev_source.len() as u32));
}
}