Fix jumping to dependencies in node modules

jupyter-lsp · Jan 1, 2022 · 14ece08 · 14ece08
1 parent 00f2a4e
commit 14ece08
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
@@ -215,8 +215,12 @@ export class CMJumpToDefinition extends CodeMirrorIntegration {
   private _resolvePath(uri: string): string | null {
     let contentsPath = uri_to_contents_path(uri);
 
-    if (contentsPath == null && uri.startsWith('file://')) {
-      contentsPath = decodeURI(uri.slice(7));
+    if (contentsPath == null) {
+      if (uri.startsWith('file://')) {
+        contentsPath = decodeURIComponent(uri.slice(7));
+      } else {
+        contentsPath = decodeURIComponent(uri);
+      }
     }
     return contentsPath;
   }

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;
 }