1 files changed, 11 insertions, 8 deletions

diff --git a/crates/completion/src/lib.rs b/crates/completion/src/lib.rs
index 3c7d5a46c..ee1b822e7 100644
--- a/crates/completion/src/lib.rs
+++ b/crates/completion/src/lib.rs
@@ -47,8 +47,8 @@ pub use crate::{
 // - `expr.while` -> `while expr {}` or `while let ... {}` for `Option` or `Result`
 // - `expr.ref` -> `&expr`
 // - `expr.refm` -> `&mut expr`
-// - `expr.let` -> `let <|> = expr;`
-// - `expr.letm` -> `let mut <|> = expr;`
+// - `expr.let` -> `let $0 = expr;`
+// - `expr.letm` -> `let mut $0 = expr;`
 // - `expr.not` -> `!expr`
 // - `expr.dbg` -> `dbg!(expr)`
 // - `expr.dbgr` -> `dbg!(&expr)`
@@ -92,7 +92,7 @@ pub use crate::{
 /// ```no_run
 /// fn f() {
 ///     let foo = 92;
-///     let _ = bar<|>
+///     let _ = bar$0
 /// }
 /// ```
 ///
@@ -127,6 +127,7 @@ pub fn completions(
     completions::macro_in_item_position::complete_macro_in_item_position(&mut acc, &ctx);
     completions::trait_impl::complete_trait_impl(&mut acc, &ctx);
     completions::mod_::complete_mod(&mut acc, &ctx);
+    completions::flyimport::import_on_the_fly(&mut acc, &ctx);
 
     Some(acc)
 }
@@ -153,7 +154,9 @@ pub fn resolve_completion_edits(
         })
         .find(|mod_path| mod_path.to_string() == full_import_path)?;
 
-    ImportEdit { import_path, import_scope }.to_text_edit(config.merge).map(|edit| vec![edit])
+    ImportEdit { import_path, import_scope }
+        .to_text_edit(config.insert_use.merge)
+        .map(|edit| vec![edit])
 }
 
 #[cfg(test)]
@@ -220,7 +223,7 @@ mod tests {
 
             fn foo() {
                 let bar = Bar;
-                bar.fo<|>;
+                bar.fo$0;
             }
             "#,
             DetailAndDocumentation { detail: "fn foo(&self)", documentation: "Do the foo" },
@@ -246,7 +249,7 @@ mod tests {
 
             fn foo() {
                 let bar = Bar;
-                bar.fo<|>;
+                bar.fo$0;
             }
             "#,
             DetailAndDocumentation { detail: "fn foo(&self)", documentation: " Do the foo" },
@@ -259,7 +262,7 @@ mod tests {
         check_no_completion(
             r#"
             fn foo() {
-                for i i<|>
+                for i i$0
             }
             "#,
         );
@@ -270,7 +273,7 @@ mod tests {
             fn foo() -> &'static str { "foo" }
 
             fn bar() {
-                for c in fo<|>
+                for c in fo$0
             }
             "#,
             DetailAndDocumentation {