Merge pull request #599 from krassowski/fix-ci

Workaround file URI matching issue for now

Author: krassowski

CHANGELOG.md

@@ -3,6 +3,9 @@
 ### (unreleased)
 
 - Add ability to deactivate Kernel completions or LSP completion through the settings.
+- workaround url-parse issue causing problems when using JupyterLab 3.0.15 [#599]
+
+[#599]: https://github.com/krassowski/jupyterlab-lsp/pull/599
 
 ### `jupyter-lsp 1.2.0` (2021-04-26)
 

packages/jupyterlab-lsp/src/connection_manager.ts

@@ -359,9 +359,24 @@ export namespace DocumentConnectionManager {
       throw `No language server installed for language ${language}`;
     }
 
+    // workaround url-parse bug(s) (see https://github.com/krassowski/jupyterlab-lsp/issues/595)
+    let documentUri = URLExt.join(baseUri, virtual_document.uri);
+    if (
+      !documentUri.startsWith('file:///') &&
+      documentUri.startsWith('file://')
+    ) {
+      documentUri = documentUri.replace('file://', 'file:///');
+      if (
+        documentUri.startsWith('file:///users/') &&
+        baseUri.startsWith('file:///Users/')
+      ) {
+        documentUri = documentUri.replace('file:///users/', 'file:///Users/');
+      }
+    }
+
     return {
       base: baseUri,
-      document: URLExt.join(baseUri, virtual_document.uri),
+      document: documentUri,
       server: URLExt.join('ws://jupyter-lsp', language),
       socket: URLExt.join(
         wsBase,