rust-analyzer

Unnamed repository; edit this file 'description' to name the repository.

Clone

HTTPS

SSH

Diffstat (limited to 'crates/ide-diagnostics/src/handlers/trait_impl_redundant_assoc_item.rs')

-rw-r--r--

1 files changed, 6 insertions, 3 deletions

diff --git a/crates/ide-diagnostics/src/handlers/trait_impl_redundant_assoc_item.rs b/crates/ide-diagnostics/src/handlers/trait_impl_redundant_assoc_item.rs
index 4327b12dce..fc2648efb4 100644
--- a/crates/ide-diagnostics/src/handlers/trait_impl_redundant_assoc_item.rs
+++ b/crates/ide-diagnostics/src/handlers/trait_impl_redundant_assoc_item.rs

@@ -77,6 +77,7 @@ fn quickfix_for_redundant_assoc_item(

redundant_item_def: String,

range: TextRange,

) -> Option<Vec<Assist>> {

+ let file_id = d.file_id.file_id()?;

let add_assoc_item_def = |builder: &mut SourceChangeBuilder| -> Option<()> {

let db = ctx.sema.db;

let root = db.parse_or_expand(d.file_id);

@@ -90,12 +91,14 @@ fn quickfix_for_redundant_assoc_item(

let trait_def = d.trait_.source(db)?.value;

let l_curly = trait_def.assoc_item_list()?.l_curly_token()?.text_range();

let where_to_insert =

- hir::InFile::new(d.file_id, l_curly).original_node_file_range_rooted(db).range;

+ hir::InFile::new(d.file_id, l_curly).original_node_file_range_rooted_opt(db)?;

+ if where_to_insert.file_id != file_id {

+ return None;

+ }

- builder.insert(where_to_insert.end(), redundant_item_def);

+ builder.insert(where_to_insert.range.end(), redundant_item_def);

Some(())

};

- let file_id = d.file_id.file_id()?;

let mut source_change_builder = SourceChangeBuilder::new(file_id.file_id(ctx.sema.db));

add_assoc_item_def(&mut source_change_builder)?;