[VS Code] Fix URI comparison on Windows (#63)

eclipse-oct · Sep 1, 2024 · 93afb98 · 93afb98
1 parent 9b822d1
commit 93afb98
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/open-collaboration-vscode/package.json b/packages/open-collaboration-vscode/package.json
@@ -2,7 +2,7 @@
   "name": "open-collaboration-tools",
   "displayName": "Open Collaboration Tools",
   "description": "Connect with others and live-share your code in real-time collaboration sessions",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "publisher": "typefox",
   "categories": [
     "Other"
@@ -50,6 +50,16 @@
     }
   },
   "contributes": {
+    "resourceLabelFormatters": [
+      {
+        "scheme": "oct",
+        "formatting": {
+          "label": "${path}",
+          "separator": "/",
+          "workspaceSuffix": "Open Collaboration Tools"
+        }
+      }
+    ],
     "configuration": {
       "title": "Open Collaboration Tools",
       "properties": {

diff --git a/packages/open-collaboration-vscode/src/utils/uri.ts b/packages/open-collaboration-vscode/src/utils/uri.ts
@@ -18,10 +18,10 @@ export namespace CollaborationUri {
         if (!uri) {
             return undefined;
         }
-        const path = uri.path.toString();
+        const path = uri.toString();
         const roots = (vscode.workspace.workspaceFolders ?? []);
         for (const root of roots) {
-            const rootUri = root.uri.path + '/';
+            const rootUri = root.uri.toString() + '/';
             if (path.startsWith(rootUri)) {
                 return root.name + '/' + path.substring(rootUri.length);
             }