codemirror-languageserver 1.4.1 → 1.5.0

package/README.md

@@ -8,6 +8,10 @@ This plugin enables code completion, hover tooltips, and linter functionality by
 
 ## Usage
 
+```
+npm i codemirror-languageserver
+```
+
 ``` js
 import { languageServer } from 'codemirror-languageserver';
 
@@ -22,7 +26,7 @@ var view = new EditorView({
 	state: EditorState.create({
 		extensions: [
 			// ...
-			ls(),
+			ls,
 			// ...
 		]
 	})
@@ -33,6 +37,14 @@ var view = new EditorView({
 
 Contributions are welcome.
 
+## Real World Uses
+
+https://user-images.githubusercontent.com/348107/120141150-c6bb9180-c1fd-11eb-8ada-9b7b7a1e4ade.mp4
+
+| | |
+| --- | --- |
+| [Toph](https://toph.co) | Competitive programming platform |
+
 ## License
 
 The library is available under the BSD (3-Clause) License.

package/dist/index.d.sync-conflict-20210813-102235-QZ53W3J.ts

@@ -0,0 +1,10 @@
+interface LanguageServerOptions {
+    serverUri: `ws://${string}` | `wss://${string}`;
+    rootUri: string;
+    documentUri: string;
+    languageId: string;
+    onConnect(): void;
+    onDisconnect(): void;
+}
+declare function languageServer(options: LanguageServerOptions): import("@codemirror/state").Extension[];
+export { languageServer };

package/dist/index.js

@@ -46,14 +46,14 @@ class LanguageServerPlugin {
     destroy() {
         this.client.close();
     }
-    request(timeout, method, params) {
+    request(method, params, timeout) {
         return this.client.request({ method, params }, timeout);
     }
     notify(method, params) {
         return this.client.notify({ method, params });
     }
     async initialize({ documentText }) {
-        const { capabilities } = await this.request(timeout * 3, 'initialize', {
+        const { capabilities } = await this.request('initialize', {
             capabilities: {
                 textDocument: {
                     hover: {
@@ -116,7 +116,7 @@ class LanguageServerPlugin {
                     uri: this.rootUri,
                 },
             ],
-        });
+        }, timeout * 3);
         this.capabilities = capabilities;
         this.notify('initialized', {});
         this.notify('textDocument/didOpen', {
@@ -152,10 +152,10 @@ class LanguageServerPlugin {
         if (!this.ready || !this.capabilities.hoverProvider)
             return null;
         this.sendChange({ documentText: view.state.doc.toString() });
-        const result = await this.request(timeout, 'textDocument/hover', {
+        const result = await this.request('textDocument/hover', {
             textDocument: { uri: this.documentUri },
             position: { line, character },
-        });
+        }, timeout);
         if (!result)
             return null;
         const { contents, range } = result;
@@ -178,14 +178,14 @@ class LanguageServerPlugin {
         this.sendChange({
             documentText: context.state.doc.toString(),
         });
-        const result = await this.request(timeout, 'textDocument/completion', {
+        const result = await this.request('textDocument/completion', {
             textDocument: { uri: this.documentUri },
             position: { line, character },
             context: {
                 triggerKind,
                 triggerCharacter,
             },
-        });
+        }, timeout);
         if (!result)
             return null;
         const items = 'items' in result ? result.items : result;
@@ -255,7 +255,7 @@ class LanguageServerPlugin {
             }[severity],
             message,
         }))
-            .filter(({ from, to }) => from !== null && to !== null)
+            .filter(({ from, to }) => from !== null && to !== null && from !== undefined && to !== undefined)
             .sort((a, b) => {
             switch (true) {
                 case a.from < b.from:
@@ -312,7 +312,10 @@ function languageServer(options) {
 function posToOffset(doc, pos) {
     if (pos.line >= doc.lines)
         return;
-    return doc.line(pos.line + 1).from + pos.character;
+    const offset = doc.line(pos.line + 1).from + pos.character;
+    if (offset > doc.length)
+        return;
+    return offset;
 }
 function offsetToPos(doc, offset) {
     const line = doc.lineAt(offset);

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "codemirror-languageserver",
-  "version": "1.4.1",
+  "version": "1.5.0",
   "description": "Language Server Plugin for CodeMirror 6",
   "main": "dist/index.js",
   "scripts": {
-    "prepare": "rollup --config"
+    "prepare": "rollup -c rollup.config.js"
   },
   "author": {
     "name": "Mahmud Ridwan",
@@ -30,11 +30,11 @@
     "typescript": "^4.2.4"
   },
   "dependencies": {
-    "@codemirror/autocomplete": "^0.18.5",
-    "@codemirror/lint": "^0.18.2",
-    "@codemirror/state": "^0.18.6",
-    "@codemirror/tooltip": "^0.18.4",
-    "@codemirror/view": "^0.18.10",
+    "@codemirror/autocomplete": "^0.19.8",
+    "@codemirror/lint": "^0.19.3",
+    "@codemirror/state": "^0.19.6",
+    "@codemirror/tooltip": "^0.19.7",
+    "@codemirror/view": "^0.19.19",
     "@open-rpc/client-js": "^1.6.2",
     "vscode-languageserver-protocol": "^3.16.0"
   },