diff options
Diffstat (limited to 'crates/assists/src/handlers/auto_import.rs')
-rw-r--r-- | crates/assists/src/handlers/auto_import.rs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/crates/assists/src/handlers/auto_import.rs b/crates/assists/src/handlers/auto_import.rs index e49e641b3..37dd61266 100644 --- a/crates/assists/src/handlers/auto_import.rs +++ b/crates/assists/src/handlers/auto_import.rs | |||
@@ -99,7 +99,6 @@ pub(crate) fn auto_import(acc: &mut Assists, ctx: &AssistContext) -> Option<()> | |||
99 | let range = ctx.sema.original_range(import_assets.syntax_under_caret()).range; | 99 | let range = ctx.sema.original_range(import_assets.syntax_under_caret()).range; |
100 | let group = import_group_message(import_assets.import_candidate()); | 100 | let group = import_group_message(import_assets.import_candidate()); |
101 | let scope = ImportScope::find_insert_use_container(import_assets.syntax_under_caret(), ctx)?; | 101 | let scope = ImportScope::find_insert_use_container(import_assets.syntax_under_caret(), ctx)?; |
102 | let syntax = scope.as_syntax_node(); | ||
103 | for (import, _) in proposed_imports { | 102 | for (import, _) in proposed_imports { |
104 | acc.add_group( | 103 | acc.add_group( |
105 | &group, | 104 | &group, |
@@ -107,9 +106,9 @@ pub(crate) fn auto_import(acc: &mut Assists, ctx: &AssistContext) -> Option<()> | |||
107 | format!("Import `{}`", &import), | 106 | format!("Import `{}`", &import), |
108 | range, | 107 | range, |
109 | |builder| { | 108 | |builder| { |
110 | let new_syntax = | 109 | let rewriter = |
111 | insert_use(&scope, mod_path_to_ast(&import), ctx.config.insert_use.merge); | 110 | insert_use(&scope, mod_path_to_ast(&import), ctx.config.insert_use.merge); |
112 | builder.replace(syntax.text_range(), new_syntax.to_string()) | 111 | builder.rewrite(rewriter); |
113 | }, | 112 | }, |
114 | ); | 113 | ); |
115 | } | 114 | } |