codemirror-languageserver 1.10.0 → 1.12.0

package/README.md

@@ -51,9 +51,7 @@ Contributions are welcome.
 
 https://user-images.githubusercontent.com/348107/120141150-c6bb9180-c1fd-11eb-8ada-9b7b7a1e4ade.mp4
 
-| | |
-| --- | --- |
-| [Toph](https://toph.co) | Competitive programming platform |
+- [Toph](https://toph.co): Competitive programming platform. Toph uses Language Server Plugin for CodeMirror 6 with its integrated code editor.
 
 ## License
 

package/dist/index.d.ts

@@ -40,12 +40,13 @@ declare class LanguageServerClient {
 }
 declare class LanguageServerPlugin implements PluginValue {
     private view;
+    private allowHTMLContent;
     client: LanguageServerClient;
     private documentUri;
     private languageId;
     private documentVersion;
     private changesTimeout;
-    constructor(view: EditorView);
+    constructor(view: EditorView, allowHTMLContent: boolean);
     update({ docChanged }: ViewUpdate): void;
     destroy(): void;
     initialize({ documentText }: {
@@ -81,10 +82,15 @@ interface LanguageServerClientOptions extends LanguageServerBaseOptions {
 }
 interface LanguageServerOptions extends LanguageServerClientOptions {
     client?: LanguageServerClient;
+    allowHTMLContent?: boolean;
 }
 interface LanguageServerWebsocketOptions extends LanguageServerBaseOptions {
     serverUri: `ws://${string}` | `wss://${string}`;
 }
-declare function languageServer(options: LanguageServerWebsocketOptions): import("@codemirror/state").Extension[];
-declare function languageServerWithTransport(options: LanguageServerOptions): import("@codemirror/state").Extension[];
+declare function languageServer(options: LanguageServerWebsocketOptions): ({
+    extension: import("@codemirror/state").Extension;
+} | readonly import("@codemirror/state").Extension[])[];
+declare function languageServerWithTransport(options: LanguageServerOptions): ({
+    extension: import("@codemirror/state").Extension;
+} | readonly import("@codemirror/state").Extension[])[];
 export { LanguageServerClient, languageServer, languageServerWithTransport };

package/dist/index.js

@@ -1,7 +1,7 @@
-import { autocompletion } from '@codemirror/autocomplete';
+import { autocompletion, insertCompletionText } from '@codemirror/autocomplete';
 import { setDiagnostics } from '@codemirror/lint';
 import { Facet } from '@codemirror/state';
-import { EditorView, ViewPlugin, hoverTooltip } from '@codemirror/view';
+import { ViewPlugin, hoverTooltip } from '@codemirror/view';
 import { RequestManager, Client, WebSocketTransport } from '@open-rpc/client-js';
 import { CompletionItemKind, CompletionTriggerKind, DiagnosticSeverity } from 'vscode-languageserver-protocol';
 
@@ -143,8 +143,9 @@ class LanguageServerClient {
     }
 }
 class LanguageServerPlugin {
-    constructor(view) {
+    constructor(view, allowHTMLContent) {
         this.view = view;
+        this.allowHTMLContent = allowHTMLContent;
         this.client = this.view.state.facet(client);
         this.documentUri = this.view.state.facet(documentUri);
         this.languageId = this.view.state.facet(languageId);
@@ -222,7 +223,10 @@ class LanguageServerPlugin {
             return null;
         const dom = document.createElement('div');
         dom.classList.add('documentation');
-        dom.textContent = formatContents(contents);
+        if (this.allowHTMLContent)
+            dom.innerHTML = formatContents(contents);
+        else
+            dom.textContent = formatContents(contents);
         return { pos, end, create: (view) => ({ dom }), above: true };
     }
     async requestCompletion(context, { line, character }, { triggerKind, triggerCharacter, }) {
@@ -241,47 +245,77 @@ class LanguageServerPlugin {
         });
         if (!result)
             return null;
-        const items = 'items' in result ? result.items : result;
-        let options = items.map(({ detail, label, kind, textEdit, documentation, sortText, filterText, }) => {
-            var _a;
-            const completion = {
-                label,
-                detail,
-                apply: (_a = textEdit === null || textEdit === void 0 ? void 0 : textEdit.newText) !== null && _a !== void 0 ? _a : label,
-                type: kind && CompletionItemKindMap[kind].toLowerCase(),
-                sortText: sortText !== null && sortText !== void 0 ? sortText : label,
-                filterText: filterText !== null && filterText !== void 0 ? filterText : label,
-            };
-            if (documentation) {
-                completion.info = formatContents(documentation);
-            }
-            return completion;
-        });
-        const [span, match] = prefixMatch(options);
+        let items = 'items' in result ? result.items : result;
+        const [span, match] = prefixMatch(items);
         const token = context.matchBefore(match);
         let { pos } = context;
         if (token) {
             pos = token.from;
             const word = token.text.toLowerCase();
             if (/^\w+$/.test(word)) {
-                options = options
-                    .filter(({ filterText }) => filterText.toLowerCase().startsWith(word))
-                    .sort(({ apply: a }, { apply: b }) => {
+                items = items
+                    .filter(({ label, filterText }) => {
+                    const text = filterText !== null && filterText !== void 0 ? filterText : label;
+                    return text.toLowerCase().startsWith(word);
+                })
+                    .sort((a, b) => {
+                    var _a, _b;
+                    const aText = (_a = a.sortText) !== null && _a !== void 0 ? _a : a.label;
+                    const bText = (_b = b.sortText) !== null && _b !== void 0 ? _b : b.label;
                     switch (true) {
-                        case a.startsWith(token.text) &&
-                            !b.startsWith(token.text):
+                        case aText.startsWith(token.text) &&
+                            !bText.startsWith(token.text):
                             return -1;
-                        case !a.startsWith(token.text) &&
-                            b.startsWith(token.text):
+                        case !aText.startsWith(token.text) &&
+                            bText.startsWith(token.text):
                             return 1;
                     }
                     return 0;
                 });
             }
         }
+        const options = items.map(({ detail, label, kind, textEdit, documentation, additionalTextEdits, }) => {
+            const completion = {
+                label,
+                detail,
+                apply: function (view, completion, from, to) {
+                    var _a;
+                    const text = (_a = textEdit === null || textEdit === void 0 ? void 0 : textEdit.newText) !== null && _a !== void 0 ? _a : label;
+                    view.dispatch(insertCompletionText(view.state, text, from, to));
+                    if (!additionalTextEdits) {
+                        return;
+                    }
+                    additionalTextEdits
+                        .sort(({ range: { end: a } }, { range: { end: b } }) => {
+                        if (posToOffset(view.state.doc, a) < posToOffset(view.state.doc, b)) {
+                            return 1;
+                        }
+                        else if (posToOffset(view.state.doc, a) > posToOffset(view.state.doc, b)) {
+                            return -1;
+                        }
+                        return 0;
+                    })
+                        .forEach((textEdit) => {
+                        view.dispatch(view.state.update({
+                            changes: {
+                                from: posToOffset(view.state.doc, textEdit.range.start),
+                                to: posToOffset(view.state.doc, textEdit.range.end),
+                                insert: textEdit.newText
+                            }
+                        }));
+                    });
+                },
+                type: kind && CompletionItemKindMap[kind].toLowerCase()
+            };
+            if (documentation) {
+                completion.info = formatContents(documentation);
+            }
+            return completion;
+        });
         return {
             from: pos,
             options,
+            filter: false
         };
     }
     processNotification(notification) {
@@ -337,7 +371,7 @@ function languageServerWithTransport(options) {
         client.of(options.client || new LanguageServerClient({ ...options, autoClose: true })),
         documentUri.of(options.documentUri),
         languageId.of(options.languageId),
-        ViewPlugin.define((view) => (plugin = new LanguageServerPlugin(view))),
+        ViewPlugin.define((view) => (plugin = new LanguageServerPlugin(view, options.allowHTMLContent))),
         hoverTooltip((view, pos) => {
             var _a;
             return (_a = plugin === null || plugin === void 0 ? void 0 : plugin.requestHoverTooltip(view, offsetToPos(view.state.doc, pos))) !== null && _a !== void 0 ? _a : null;
@@ -368,7 +402,6 @@ function languageServerWithTransport(options) {
                 },
             ],
         }),
-        baseTheme,
     ];
 }
 function posToOffset(doc, pos) {
@@ -407,11 +440,12 @@ function toSet(chars) {
     }
     return `[${preamble}${flat.replace(/[^\w\s]/g, '\\$&')}]`;
 }
-function prefixMatch(options) {
+function prefixMatch(items) {
+    var _a;
     const first = new Set();
     const rest = new Set();
-    for (const { apply } of options) {
-        const [initial, ...restStr] = apply;
+    for (const item of items) {
+        const [initial, ...restStr] = ((_a = item.textEdit) === null || _a === void 0 ? void 0 : _a.newText) || item.label;
         first.add(initial);
         for (const char of restStr) {
             rest.add(char);
@@ -420,17 +454,5 @@ function prefixMatch(options) {
     const source = toSet(first) + toSet(rest) + '*$';
     return [new RegExp('^' + source), new RegExp(source)];
 }
-const baseTheme = EditorView.baseTheme({
-    '.cm-tooltip.documentation': {
-        display: 'block',
-        marginLeft: '0',
-        padding: '3px 6px 3px 8px',
-        borderLeft: '5px solid #999',
-        whiteSpace: 'pre',
-    },
-    '.cm-tooltip.lint': {
-        whiteSpace: 'pre',
-    },
-});
 
 export { LanguageServerClient, languageServer, languageServerWithTransport };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codemirror-languageserver",
-  "version": "1.10.0",
+  "version": "1.12.0",
   "description": "Language Server Plugin for CodeMirror 6",
   "main": "dist/index.js",
   "scripts": {
@@ -30,12 +30,12 @@
     "typescript": "^4.7.4"
   },
   "dependencies": {
-    "@codemirror/autocomplete": "^6.0.2",
-    "@codemirror/lint": "^6.0.0",
-    "@codemirror/state": "^6.1.0",
-    "@codemirror/view": "^6.0.2",
-    "@open-rpc/client-js": "^1.7.1",
-    "vscode-languageserver-protocol": "^3.16.0"
+    "@codemirror/autocomplete": "^6.18.4",
+    "@codemirror/lint": "^6.8.4",
+    "@codemirror/state": "^6.5.1",
+    "@codemirror/view": "^6.36.2",
+    "@open-rpc/client-js": "^1.8.1",
+    "vscode-languageserver-protocol": "^3.17.5"
   },
   "prettier": {
     "tabWidth": 4,