Merge remote-tracking branch 'origin/src' into completions

Author: JasperDeSutter

wasm-demo/src/lib.rs

@@ -1,10 +1,14 @@
 #![cfg(target_arch = "wasm32")]
 #![allow(non_snake_case)]
 
-use ra_ide_api::{Analysis, CompletionItemKind, FileId, FilePosition, LineCol, Severity};
+use ra_ide_api::{
+    Analysis, CompletionItemKind, FileId, FilePosition, InsertTextFormat, LineCol, Severity,
+};
 use ra_syntax::{SyntaxKind, TextRange};
 use wasm_bindgen::prelude::*;
 
+mod conv;
+use conv::*;
 mod return_types;
 use return_types::*;
 
@@ -89,40 +93,33 @@ impl WorldState {
     }
 
     pub fn completions(&self, line_number: u32, column: u32) -> JsValue {
-        let pos = self.file_pos(line_number, column);
         log::warn!("completions");
+        let line_index = self.analysis.file_line_index(self.file_id).unwrap();
+        let pos = Position { line_number, column }.conv_with((&line_index, self.file_id));
+
         let res = match self.analysis.completions(pos).unwrap() {
             Some(items) => items,
             None => return JsValue::NULL,
         };
 
+        log::warn!("{:#?}", res);
+
         let items: Vec<_> = res
             .into_iter()
             .map(|item| CompletionItem {
-                kind: match item.kind() {
-                    Some(CompletionItemKind::Snippet) => 25,
-                    Some(CompletionItemKind::Keyword) => 17,
-                    Some(CompletionItemKind::Module) => 8,
-                    Some(CompletionItemKind::Function) => 1,
-                    Some(CompletionItemKind::BuiltinType) => 6,
-                    Some(CompletionItemKind::Struct) => 6,
-                    Some(CompletionItemKind::Enum) => 15,
-                    Some(CompletionItemKind::EnumVariant) => 16,
-                    Some(CompletionItemKind::Binding) => 4,
-                    Some(CompletionItemKind::Field) => 3,
-                    Some(CompletionItemKind::Static) => 13,
-                    Some(CompletionItemKind::Const) => 14,
-                    Some(CompletionItemKind::Trait) => 7,
-                    Some(CompletionItemKind::TypeAlias) => 6,
-                    Some(CompletionItemKind::Method) => 0,
-                    Some(CompletionItemKind::TypeParam) => 24,
-                    Some(CompletionItemKind::Macro) => 0,
-                    _ => 25,
-                },
+                kind: item.kind().unwrap_or(CompletionItemKind::Struct).conv(),
                 label: item.label().to_string(),
                 range: self.range(item.source_range()),
                 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();
         serde_wasm_bindgen::to_value(&items).unwrap()

wasm-demo/www/index.js

@@ -49,6 +49,13 @@ import 'monaco-editor/esm/vs/editor/standalone/browser/toggleHighContrast/toggle
 import * as monaco from 'monaco-editor/esm/vs/editor/editor.api';
 import * as rustConf from 'monaco-editor/esm/vs/basic-languages/rust/rust';
 import exampleCode from './example-code';
+import encoding from 'text-encoding';
+
+if (typeof TextEncoder === "undefined") {
+    // Edge polyfill, https://rustwasm.github.io/docs/wasm-bindgen/reference/browser-support.html
+    self.TextEncoder = encoding.TextEncoder
+    self.TextDecoder = encoding.TextDecoder
+}
 
 import './index.css';
 
@@ -93,8 +100,8 @@ monaco.languages.onLanguage(modeId, async () => {
     });
     monaco.languages.registerCodeLensProvider(modeId, {
         provideCodeLenses(m) {
-            const lenses = state.code_lenses();
-            return lenses.map(({ range, command }) => {
+            const code_lenses = state.code_lenses();
+            const lenses = code_lenses.map(({ range, command }) => {
                 const position = {
                     column: range.startColumn,
                     lineNumber: range.startLineNumber,
@@ -114,6 +121,8 @@ monaco.languages.onLanguage(modeId, async () => {
                     }
                 };
             });
+
+            return { lenses, dispose() { } };
         },
     });
     monaco.languages.registerReferenceProvider(modeId, {

wasm-demo/www/package-lock.json

@@ -9,7 +9,8 @@
   "author": "rust-analyzer developers",
   "license": "(MIT OR Apache-2.0)",
   "dependencies": {
-    "monaco-editor": "^0.16.2",
+    "monaco-editor": "^0.18.1",
+    "text-encoding": "^0.7.0",
     "wasm_demo": "file:../pkg"
   },
   "devDependencies": {