mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge #10552

Browse Source 
10552: fix: Fix missing_fields diagnostic fix replacing wrong text ranges r=Veykril a=Veykril

Fixes #5393 by replacing the problematic behaviour there with a new "problem"

It replaces the correct range now, but it potentially discards the whitespace in the macro input. This is the best we can do currently until we get a formatter.

bors r+

Co-authored-by: Lukas Wirth <lukastw97@gmail.com>
This commit is contained in:
bors[bot] 2021-10-15 17:29:03 +00:00 committed by GitHub
commit 6c7526d308
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
crates/ide_diagnostics/src/handlers/missing_fields.rs
View File

@ -54,6 +54,7 @@ fn fixes(ctx: &DiagnosticsContext<'_>, d: &hir::MissingFields) -> Option<Vec<Ass
Either::Right(_) => return None, Either::Right(_) => return None,
}; };
let old_field_list = field_list_parent.record_expr_field_list()?; let old_field_list = field_list_parent.record_expr_field_list()?;
let new_field_list = old_field_list.clone_for_update(); let new_field_list = old_field_list.clone_for_update();
let mut locals = FxHashMap::default(); let mut locals = FxHashMap::default();
ctx.sema.scope(field_list_parent.syntax()).process_all_names(&mut |name, def| { ctx.sema.scope(field_list_parent.syntax()).process_all_names(&mut |name, def| {
@ -80,11 +81,19 @@ fn fixes(ctx: &DiagnosticsContext<'_>, d: &hir::MissingFields) -> Option<Vec<Ass
new_field_list.add_field(field); new_field_list.add_field(field);
} }
let edit = { let mut builder = TextEdit::builder();
let mut builder = TextEdit::builder(); if d.file.is_macro() {
// we can't map the diff up into the macro input unfortunately, as the macro loses all
// whitespace information so the diff wouldn't be applicable no matter what
// This has the downside that the cursor will be moved in macros by doing it without a diff
// but that is a trade off we can make.
// FIXE: this also currently discards a lot of whitespace in the input... we really need a formatter here
let range = ctx.sema.original_range_opt(old_field_list.syntax())?;
builder.replace(range.range, new_field_list.to_string());
} else {
algo::diff(old_field_list.syntax(), new_field_list.syntax()).into_text_edit(&mut builder); algo::diff(old_field_list.syntax(), new_field_list.syntax()).into_text_edit(&mut builder);
builder.finish() }
}; let edit = builder.finish();
Some(vec![fix( Some(vec![fix(
"fill_missing_fields", "fill_missing_fields",
"Fill struct fields", "Fill struct fields",
@ -151,7 +160,6 @@ fn x(a: S) {
#[test] #[test]
fn range_mapping_out_of_macros() { fn range_mapping_out_of_macros() {
// FIXME: this is very wrong, but somewhat tricky to fix.
check_fix( check_fix(
r#" r#"
fn some() {} fn some() {}
@ -167,14 +175,14 @@ fn main() {
pub struct Foo { pub a: i32, pub b: i32 } pub struct Foo { pub a: i32, pub b: i32 }
"#, "#,
r#" r#"
fn some(, b: todo!() ) {} fn some() {}
fn items() {} fn items() {}
fn here() {} fn here() {}
macro_rules! id { ($($tt:tt)*) => { $($tt)*}; } macro_rules! id { ($($tt:tt)*) => { $($tt)*}; }
fn main() { fn main() {
let _x = id![Foo { a: 42 }]; let _x = id![Foo {a:42, b: todo!() }];
} }
pub struct Foo { pub a: i32, pub b: i32 } pub struct Foo { pub a: i32, pub b: i32 }