Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/ide-assists/src/handlers/inline_local_variable.rs')
-rw-r--r--crates/ide-assists/src/handlers/inline_local_variable.rs12
1 files changed, 6 insertions, 6 deletions
diff --git a/crates/ide-assists/src/handlers/inline_local_variable.rs b/crates/ide-assists/src/handlers/inline_local_variable.rs
index 36eed290dc..5d4bdc6ec7 100644
--- a/crates/ide-assists/src/handlers/inline_local_variable.rs
+++ b/crates/ide-assists/src/handlers/inline_local_variable.rs
@@ -1,17 +1,17 @@
use hir::{PathResolution, Semantics};
use ide_db::{
+ EditionedFileId, RootDatabase,
defs::Definition,
search::{FileReference, FileReferenceNode, UsageSearchResult},
- EditionedFileId, RootDatabase,
};
use syntax::{
- ast::{self, syntax_factory::SyntaxFactory, AstNode, AstToken, HasName},
SyntaxElement, TextRange,
+ ast::{self, AstNode, AstToken, HasName, syntax_factory::SyntaxFactory},
};
use crate::{
+ AssistId,
assist_context::{AssistContext, Assists},
- AssistId, AssistKind,
};
// Assist: inline_local_variable
@@ -74,7 +74,7 @@ pub(crate) fn inline_local_variable(acc: &mut Assists, ctx: &AssistContext<'_>)
};
acc.add(
- AssistId("inline_local_variable", AssistKind::RefactorInline),
+ AssistId::refactor_inline("inline_local_variable"),
"Inline variable",
target.text_range(),
move |builder| {
@@ -91,7 +91,7 @@ pub(crate) fn inline_local_variable(acc: &mut Assists, ctx: &AssistContext<'_>)
}
}
- let make = SyntaxFactory::new();
+ let make = SyntaxFactory::with_mappings();
for (name, should_wrap) in wrap_in_parens {
let replacement = if should_wrap {
@@ -110,7 +110,7 @@ pub(crate) fn inline_local_variable(acc: &mut Assists, ctx: &AssistContext<'_>)
}
editor.add_mappings(make.finish_with_mappings());
- builder.add_file_edits(ctx.file_id(), editor);
+ builder.add_file_edits(ctx.vfs_file_id(), editor);
},
)
}