rework handling of uri to contents path in jump

Author: bollwyvl

packages/jupyterlab-lsp/src/features/jump_to.ts

@@ -57,12 +57,12 @@ export class CMJumpToDefinition extends CodeMirrorIntegration {
 
     if ('targetUri' in location_or_link) {
       return {
-        uri: decodeURI(location_or_link.targetUri),
+        uri: location_or_link.targetUri,
         range: location_or_link.targetRange
       };
     } else if ('uri' in location_or_link) {
       return {
-        uri: decodeURI(location_or_link.uri),
+        uri: location_or_link.uri,
         range: location_or_link.range
       };
     }
@@ -105,12 +105,10 @@ export class CMJumpToDefinition extends CodeMirrorIntegration {
       console.log('Jump target (source location):', source_position_ce);
 
       // can it be resolved vs our guessed server root?
-      const contents_path = uri_to_contents_path(uri);
+      let contents_path = uri_to_contents_path(uri);
 
-      if (contents_path) {
-        uri = contents_path;
-      } else if (uri.startsWith('file://')) {
-        uri = uri.slice(7);
+      if (contents_path == null && uri.startsWith('file://')) {
+        contents_path = decodeURI(uri.slice(7));
       }
 
       let jump_data = {
@@ -124,17 +122,20 @@ export class CMJumpToDefinition extends CodeMirrorIntegration {
       //  with different OSes but also with JupyterHub and other platforms.
 
       try {
-        await this.jumper.document_manager.services.contents.get(uri, {
-          content: false
-        });
-        this.jumper.global_jump({ uri, ...jump_data }, false);
+        await this.jumper.document_manager.services.contents.get(
+          contents_path,
+          {
+            content: false
+          }
+        );
+        this.jumper.global_jump({ uri: contents_path, ...jump_data }, false);
         return;
       } catch (err) {
         console.warn(err);
       }
 
       this.jumper.global_jump(
-        { uri: '.lsp_symlink/' + uri, ...jump_data },
+        { uri: '.lsp_symlink/' + contents_path, ...jump_data },
         true
       );
     }

packages/jupyterlab-lsp/src/utils.ts

@@ -136,7 +136,7 @@ export function uri_to_contents_path(child: string, parent?: string) {
     return null;
   }
   if (child.startsWith(parent)) {
-    return child.replace(parent, '');
+    return decodeURI(child.replace(parent, ''));
   }
   return null;
 }

packages/jupyterlab-lsp/src/virtual/document.ts

@@ -735,10 +735,11 @@ export class VirtualDocument {
   }
 
   get uri(): string {
+    const encodedPath = encodeURI(this.path);
     if (!this.parent) {
-      return this.path;
+      return encodedPath;
     }
-    return this.path + '.' + this.id_path + '.' + this.file_extension;
+    return encodedPath + '.' + this.id_path + '.' + this.file_extension;
   }
 
   transform_source_to_editor(pos: ISourcePosition): IEditorPosition {