Merge pull request #758 from jupyter-lsp/fix-jumping-with-at

Backport "Fix jumping to dependencies in node modules" on 3.x
jupyter-lsp · Mar 20, 2022 · 30c5932 · 30c5932
2 parents 162b397 + 2de4d9e
commit 30c5932
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/packages/jupyterlab-lsp/src/features/jump_to.ts b/packages/jupyterlab-lsp/src/features/jump_to.ts
@@ -192,8 +192,12 @@ export class CMJumpToDefinition extends CodeMirrorIntegration {
       // can it be resolved vs our guessed server root?
       let contents_path = uri_to_contents_path(uri);
 
-      if (contents_path == null && uri.startsWith('file://')) {
-        contents_path = decodeURI(uri.slice(7));
+      if (contents_path == null) {
+        if (uri.startsWith('file://')) {
+          contents_path = decodeURIComponent(uri.slice(7));
+        } else {
+          contents_path = decodeURIComponent(uri);
+        }
       }
 
       if (contents_path === null) {

diff --git a/packages/jupyterlab-lsp/src/utils.ts b/packages/jupyterlab-lsp/src/utils.ts
@@ -155,7 +155,8 @@ export function uri_to_contents_path(child: string, parent?: string) {
     return null;
   }
   if (child.startsWith(parent)) {
-    return decodeURI(child.replace(parent, ''));
+    // 'decodeURIComponent' is needed over 'decodeURI' for '@' in TS/JS paths
+    return decodeURIComponent(child.replace(parent, ''));
   }
   return null;
 }