Move the workaround to the root of the issue

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,18 @@ export namespace DocumentConnectionManager {
       throw `No language server installed for language ${language}`;
     }
 
+    // workaround url-parse bug (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:///');
+    }
+
     return {
       base: baseUri,
-      document: URLExt.join(baseUri, virtual_document.uri),
+      document: documentUri,
       server: URLExt.join('ws://jupyter-lsp', language),
       socket: URLExt.join(
         wsBase,

python_packages/jupyter_lsp/jupyter_lsp/tests/test_virtual_documents_shadow.py

@@ -6,7 +6,6 @@
 from ..virtual_documents_shadow import (
     EditableFile,
     ShadowFilesystemError,
-    _strip_file_protocol_prefix,
     extract_or_none,
     setup_shadow_filesystem,
 )
@@ -112,12 +111,6 @@ async def test_shadow(shadow_path, message_func, content, expected_content):
         assert f.read() == expected_content
 
 
-def test_strip_file_prefix():
-    assert _strip_file_protocol_prefix("file:///test") == "test"
-    assert _strip_file_protocol_prefix("file://test") == "test"
-    assert _strip_file_protocol_prefix("http://test") == "http://test"
-
-
 @pytest.mark.asyncio
 async def test_shadow_failures(shadow_path):
 

python_packages/jupyter_lsp/jupyter_lsp/virtual_documents_shadow.py

@@ -101,15 +101,6 @@ class ShadowFilesystemError(ValueError):
     """Error in the shadow file system."""
 
 
-# TODO: remove once https://github.com/unshiftio/url-parse/pull/204 gets merged and released
-def _strip_file_protocol_prefix(uri):
-    if uri.startswith("file:///"):
-        return uri[8:]
-    if uri.startswith("file://"):
-        return uri[7:]
-    return uri
-
-
 def setup_shadow_filesystem(virtual_documents_uri):
 
     if not virtual_documents_uri.startswith("file:/"):
@@ -126,8 +117,6 @@ def setup_shadow_filesystem(virtual_documents_uri):
     # create again
     shadow_filesystem.mkdir(parents=True, exist_ok=True)
 
-    stripped_virtual_documents_uri = _strip_file_protocol_prefix(virtual_documents_uri)
-
     @lsp_message_listener("client")
     async def shadow_virtual_documents(scope, message, language_server, manager):
         """Intercept a message with document contents creating a shadow file for it.
@@ -149,9 +138,7 @@ async def shadow_virtual_documents(scope, message, language_server, manager):
         if not uri:
             raise ShadowFilesystemError("Could not get URI from: {}".format(message))
 
-        if not _strip_file_protocol_prefix(uri).startswith(
-            stripped_virtual_documents_uri
-        ):
+        if not uri.startswith(virtual_documents_uri):
             return
 
         path = file_uri_to_path(uri)