additionalTextEdits handling

Author: JasperDeSutter

wasm-demo/Cargo.lock

@@ -18,3 +18,4 @@ serde-wasm-bindgen = "0.1"
 
 ra_ide_api = { git = "https://github.com/rust-analyzer/rust-analyzer", features = ["wasm"] }
 ra_syntax =  { git = "https://github.com/rust-analyzer/rust-analyzer" }
+ra_text_edit =  { git = "https://github.com/rust-analyzer/rust-analyzer" }

wasm-demo/Cargo.toml

@@ -1,6 +1,9 @@
 use super::return_types;
-use ra_ide_api::{CompletionItemKind, FileId, FilePosition, LineCol, LineIndex};
+use ra_ide_api::{
+    CompletionItem, CompletionItemKind, FileId, FilePosition, InsertTextFormat, LineCol, LineIndex,
+};
 use ra_syntax::TextRange;
+use ra_text_edit::AtomTextEdit;
 
 pub trait Conv {
     type Output;
@@ -70,3 +73,62 @@ impl Conv for CompletionItemKind {
         }
     }
 }
+
+impl ConvWith<&LineIndex> for &AtomTextEdit {
+    type Output = return_types::TextEdit;
+
+    fn conv_with(self, line_index: &LineIndex) -> Self::Output {
+        let text = self.insert.clone();
+        return_types::TextEdit { range: self.delete.conv_with(line_index), text }
+    }
+}
+
+impl ConvWith<&LineIndex> for CompletionItem {
+    type Output = return_types::CompletionItem;
+
+    fn conv_with(self, line_index: &LineIndex) -> Self::Output {
+        let mut additional_text_edits = Vec::new();
+        let mut text_edit = None;
+        // LSP does not allow arbitrary edits in completion, so we have to do a
+        // non-trivial mapping here.
+        for atom_edit in self.text_edit().as_atoms() {
+            if self.source_range().is_subrange(&atom_edit.delete) {
+                text_edit = Some(if atom_edit.delete == self.source_range() {
+                    atom_edit.conv_with(line_index)
+                } else {
+                    assert!(self.source_range().end() == atom_edit.delete.end());
+                    let range1 =
+                        TextRange::from_to(atom_edit.delete.start(), self.source_range().start());
+                    let range2 = self.source_range();
+                    let edit1 = AtomTextEdit::replace(range1, String::new());
+                    let edit2 = AtomTextEdit::replace(range2, atom_edit.insert.clone());
+                    additional_text_edits.push(edit1.conv_with(line_index));
+                    edit2.conv_with(line_index)
+                })
+            } else {
+                assert!(self.source_range().intersection(&atom_edit.delete).is_none());
+                additional_text_edits.push(atom_edit.conv_with(line_index));
+            }
+        }
+        let return_types::TextEdit { range, text } = text_edit.unwrap();
+
+        return_types::CompletionItem {
+            kind: self.kind().unwrap_or(CompletionItemKind::Struct).conv(),
+            label: self.label().to_string(),
+            range,
+            detail: self.detail().map(|it| it.to_string()),
+            insertText: text,
+            insertTextRules: match self.insert_text_format() {
+                InsertTextFormat::PlainText => return_types::CompletionItemInsertTextRule::None,
+                InsertTextFormat::Snippet => {
+                    return_types::CompletionItemInsertTextRule::InsertAsSnippet
+                }
+            },
+            documentation: self
+                .documentation()
+                .map(|doc| return_types::MarkdownString { value: doc.as_str().to_string() }),
+            filterText: self.lookup().to_string(),
+            additionalTextEdits: additional_text_edits,
+        }
+    }
+}

wasm-demo/src/conv.rs

@@ -1,7 +1,7 @@
 #![cfg(target_arch = "wasm32")]
 #![allow(non_snake_case)]
 
-use ra_ide_api::{Analysis, CompletionItemKind, FileId, FilePosition, InsertTextFormat, Severity};
+use ra_ide_api::{Analysis, FileId, FilePosition, Severity};
 use ra_syntax::SyntaxKind;
 use wasm_bindgen::prelude::*;
 
@@ -82,26 +82,7 @@ impl WorldState {
             None => return JsValue::NULL,
         };
 
-        log::warn!("{:#?}", res);
-
-        let items: Vec<_> = res
-            .into_iter()
-            .map(|item| CompletionItem {
-                kind: item.kind().unwrap_or(CompletionItemKind::Struct).conv(),
-                label: item.label().to_string(),
-                range: item.source_range().conv_with(&line_index),
-                detail: item.detail().map(|it| it.to_string()),
-                insertText: item.text_edit().as_atoms()[0].insert.clone(),
-                insertTextRules: match item.insert_text_format() {
-                    InsertTextFormat::PlainText => CompletionItemInsertTextRule::None,
-                    InsertTextFormat::Snippet => CompletionItemInsertTextRule::InsertAsSnippet,
-                },
-                documentation: item
-                    .documentation()
-                    .map(|doc| MarkdownString { value: doc.as_str().to_string() }),
-                filterText: item.lookup().to_string(),
-            })
-            .collect();
+        let items: Vec<_> = res.into_iter().map(|item| item.conv_with(&line_index)).collect();
         serde_wasm_bindgen::to_value(&items).unwrap()
     }
 

wasm-demo/src/lib.rs

@@ -77,6 +77,7 @@ pub struct CompletionItem {
     pub insertTextRules: CompletionItemInsertTextRule,
     pub documentation: Option<MarkdownString>,
     pub filterText: String,
+    pub additionalTextEdits: Vec<TextEdit>,
 }
 
 #[allow(dead_code)]
@@ -108,7 +109,7 @@ pub enum CompletionItemKind {
     Customcolor = 22,
     Folder = 23,
     TypeParameter = 24,
-    Snippet = 25
+    Snippet = 25,
 }
 
 #[allow(dead_code)]
@@ -117,12 +118,12 @@ pub enum CompletionItemKind {
 pub enum CompletionItemInsertTextRule {
     None = 0,
     /**
-      * Adjust whitespace/indentation of multiline insert texts to
-      * match the current line indentation.
-      */
+     * Adjust whitespace/indentation of multiline insert texts to
+     * match the current line indentation.
+     */
     KeepWhitespace = 1,
     /**
-      * `insertText` is a snippet.
-      */
+     * `insertText` is a snippet.
+     */
     InsertAsSnippet = 4,
 }

wasm-demo/src/return_types.rs

@@ -146,10 +146,8 @@ monaco.languages.onLanguage(modeId, async () => {
     });
     monaco.languages.registerCompletionItemProvider(modeId, {
         triggerCharacters: [".", ":", "="],
-        provideCompletionItems(m, pos, ctx) {
-            console.warn(ctx)
+        provideCompletionItems(m, pos) {
             const suggestions = state.completions(pos.lineNumber, pos.column)
-            console.warn(suggestions)
             return { suggestions }
         },
     });