codemirror-languageserver 1.5.1 → 1.6.0

package/dist/index.d.ts

@@ -1,6 +1,8 @@
+import * as LSP from 'vscode-languageserver-protocol';
 interface LanguageServerOptions {
     serverUri: `ws://${string}` | `wss://${string}`;
-    rootUri: string;
+    rootUri: string | null;
+    workspaceFolders: LSP.WorkspaceFolder[] | null;
     documentUri: string;
     languageId: string;
 }

package/dist/index.js

@@ -12,12 +12,14 @@ const CompletionItemKindMap = Object.fromEntries(Object.entries(CompletionItemKi
 const useLast = (values) => values.reduce((_, v) => v, '');
 const serverUri = Facet.define({ combine: useLast });
 const rootUri = Facet.define({ combine: useLast });
+const workspaceFolders = Facet.define({ combine: useLast });
 const documentUri = Facet.define({ combine: useLast });
 const languageId = Facet.define({ combine: useLast });
 class LanguageServerPlugin {
     constructor(view) {
         this.view = view;
         this.rootUri = this.view.state.facet(rootUri);
+        this.workspaceFolders = this.view.state.facet(workspaceFolders);
         this.documentUri = this.view.state.facet(documentUri);
         this.languageId = this.view.state.facet(languageId);
         this.documentVersion = 0;
@@ -31,6 +33,11 @@ class LanguageServerPlugin {
         this.initialize({
             documentText: this.view.state.doc.toString(),
         });
+        this.transport.connection.addEventListener('message', (message) => {
+            const data = JSON.parse(message.data);
+            if (data.method && data.id)
+                this.processRequest(data);
+        });
     }
     update({ docChanged }) {
         if (!docChanged)
@@ -110,12 +117,7 @@ class LanguageServerPlugin {
             initializationOptions: null,
             processId: null,
             rootUri: this.rootUri,
-            workspaceFolders: [
-                {
-                    name: 'root',
-                    uri: this.rootUri,
-                },
-            ],
+            workspaceFolders: this.workspaceFolders,
         }, timeout * 3);
         this.capabilities = capabilities;
         this.notify('initialized', {});
@@ -231,6 +233,13 @@ class LanguageServerPlugin {
             options,
         };
     }
+    processRequest({ id }) {
+        this.transport.connection.send(JSON.stringify({
+            jsonrpc: '2.0',
+            id,
+            result: null
+        }));
+    }
     processNotification(notification) {
         try {
             switch (notification.method) {
@@ -272,6 +281,7 @@ function languageServer(options) {
     let plugin = null;
     return [
         serverUri.of(options.serverUri),
+        workspaceFolders.of(options.workspaceFolders),
         rootUri.of(options.rootUri),
         documentUri.of(options.documentUri),
         languageId.of(options.languageId),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codemirror-languageserver",
-  "version": "1.5.1",
+  "version": "1.6.0",
   "description": "Language Server Plugin for CodeMirror 6",
   "main": "dist/index.js",
   "scripts": {

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

@@ -1,10 +0,0 @@
-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 };