Merge #4552

4552: Transition OnEnter to WorkspaceSnippetEdit r=matklad a=matklad

This also changes our handiling of snippet edits on the client side.
`editor.insertSnippet` unfortunately forces indentation, which we
really don't want to have to deal with. So, let's just implement our
manual hacky way of dealing with a simple subset of snippets we
actually use in rust-analyzer



bors r+
🤖

Co-authored-by: Aleksey Kladov <[email protected]>

Author: bors[bot]

crates/ra_assists/src/tests.rs

@@ -7,8 +7,7 @@ use ra_db::{fixture::WithFixture, FileId, FileRange, SourceDatabaseExt};
 use ra_ide_db::{symbol_index::SymbolsDatabase, RootDatabase};
 use ra_syntax::TextRange;
 use test_utils::{
-    add_cursor, assert_eq_text, extract_offset, extract_range, extract_range_or_offset,
-    RangeOrOffset,
+    assert_eq_text, extract_offset, extract_range, extract_range_or_offset, RangeOrOffset,
 };
 
 use crate::{handlers::Handler, Assist, AssistConfig, AssistContext, Assists};
@@ -103,12 +102,6 @@ fn check(handler: Handler, before: &str, expected: ExpectedResult) {
 
             let mut actual = db.file_text(change.file_id).as_ref().to_owned();
             change.edit.apply(&mut actual);
-
-            if !source_change.is_snippet {
-                if let Some(off) = source_change.cursor_position {
-                    actual = add_cursor(&actual, off.offset)
-                }
-            }
             assert_eq_text!(after, &actual);
         }
         (Some(assist), ExpectedResult::Target(target)) => {

crates/ra_ide/src/diagnostics.rs

@@ -628,7 +628,6 @@ mod tests {
                                 path: "foo.rs",
                             },
                         ],
-                        cursor_position: None,
                         is_snippet: false,
                     },
                 ),
@@ -685,7 +684,6 @@ mod tests {
                             },
                         ],
                         file_system_edits: [],
-                        cursor_position: None,
                         is_snippet: false,
                     },
                 ),

crates/ra_ide/src/lib.rs

@@ -87,7 +87,6 @@ pub use ra_db::{
 pub use ra_ide_db::{
     change::{AnalysisChange, LibraryData},
     line_index::{LineCol, LineIndex},
-    line_index_utils::translate_offset_with_edit,
     search::SearchScope,
     source_change::{FileSystemEdit, SourceChange, SourceFileEdit},
     symbol_index::Query,

crates/ra_ide/src/references/rename.rs

@@ -669,7 +669,6 @@ mod tests {
                             dst_path: "bar/foo2.rs",
                         },
                     ],
-                    cursor_position: None,
                     is_snippet: false,
                 },
             },
@@ -722,7 +721,6 @@ mod tests {
                             dst_path: "foo2/mod.rs",
                         },
                     ],
-                    cursor_position: None,
                     is_snippet: false,
                 },
             },
@@ -819,7 +817,6 @@ mod tests {
                             dst_path: "bar/foo2.rs",
                         },
                     ],
-                    cursor_position: None,
                     is_snippet: false,
                 },
             },

crates/ra_ide/src/typing/on_enter.rs

@@ -38,17 +38,15 @@ pub(crate) fn on_enter(db: &RootDatabase, position: FilePosition) -> Option<Sour
     }
 
     let indent = node_indent(&file, comment.syntax())?;
-    let inserted = format!("\n{}{} ", indent, prefix);
-    let cursor_position = position.offset + TextSize::of(&inserted);
+    let inserted = format!("\n{}{} $0", indent, prefix);
     let edit = TextEdit::insert(position.offset, inserted);
 
-    Some(
-        SourceChange::source_file_edit(
-            "On enter",
-            SourceFileEdit { edit, file_id: position.file_id },
-        )
-        .with_cursor(FilePosition { offset: cursor_position, file_id: position.file_id }),
-    )
+    let mut res = SourceChange::source_file_edit(
+        "On enter",
+        SourceFileEdit { edit, file_id: position.file_id },
+    );
+    res.is_snippet = true;
+    Some(res)
 }
 
 fn followed_by_comment(comment: &ast::Comment) -> bool {
@@ -84,7 +82,7 @@ fn node_indent(file: &SourceFile, token: &SyntaxToken) -> Option<SmolStr> {
 
 #[cfg(test)]
 mod tests {
-    use test_utils::{add_cursor, assert_eq_text, extract_offset};
+    use test_utils::{assert_eq_text, extract_offset};
 
     use crate::mock_analysis::single_file;
 
@@ -98,7 +96,6 @@ mod tests {
         assert_eq!(result.source_file_edits.len(), 1);
         let mut actual = before.to_string();
         result.source_file_edits[0].edit.apply(&mut actual);
-        let actual = add_cursor(&actual, result.cursor_position.unwrap().offset);
         Some(actual)
     }
 
@@ -121,7 +118,7 @@ fn foo() {
 ",
             r"
 /// Some docs
-/// <|>
+/// $0
 fn foo() {
 }
 ",
@@ -137,7 +134,7 @@ impl S {
             r"
 impl S {
     /// Some
-    /// <|> docs.
+    /// $0 docs.
     fn foo() {}
 }
 ",
@@ -151,7 +148,7 @@ fn foo() {
 ",
             r"
 ///
-/// <|> Some docs
+/// $0 Some docs
 fn foo() {
 }
 ",
@@ -175,7 +172,7 @@ fn main() {
             r"
 fn main() {
     // Fix
-    // <|> me
+    // $0 me
     let x = 1 + 1;
 }
 ",
@@ -195,7 +192,7 @@ fn main() {
             r"
 fn main() {
     // Fix
-    // <|>
+    // $0
     // me
     let x = 1 + 1;
 }

crates/ra_ide_db/src/lib.rs

@@ -3,7 +3,6 @@
 //! It is mainly a `HirDatabase` for semantic analysis, plus a `SymbolsDatabase`, for fuzzy search.
 
 pub mod line_index;
-pub mod line_index_utils;
 pub mod symbol_index;
 pub mod change;
 pub mod defs;