Fix path failure preventing trace from opening

When doing some testing on an internal extension relying, I noticed that we could no longer use the Open With TraceViewer command on Windows due to an invalid path failing (worked on Linux). I was able to trace the cause of this it to some code that uses .path instead of .fsPath, which is intended for use with the filesystem and scrubs out improper path values (which is what caused our error!) This fixes a critical issue which prevents users from opening traces in some cases. Signed-off-by: Dylan Leclair <[email protected]>
eclipse-cdt-cloud · Oct 25, 2023 · cb950a6 · cb950a6
1 parent b2c8f77
commit cb950a6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/vscode-trace-extension/src/trace-explorer/trace-tree.ts b/vscode-trace-extension/src/trace-explorer/trace-tree.ts
@@ -166,7 +166,7 @@ export const fileHandler =
                     return;
                 }
 
-                const uri: string = resolvedTraceURI.path;
+                const uri: string = resolvedTraceURI.fsPath;
                 if (!uri) {
                     traceLogger.addLogMessage(
                         'Cannot open trace: could not retrieve path from URI for trace ' + resolvedTraceURI,
@@ -311,8 +311,8 @@ const isCtf = async (directory: string): Promise<boolean> => {
 };
 
 function getProgressBarTitle(traceUri: vscode.Uri | undefined): string {
-    if (!traceUri || !traceUri.path) {
+    if (!traceUri || !traceUri.fsPath) {
         return 'undefined';
     }
-    return traceUri.path.substring(traceUri.path.lastIndexOf('/') + 1);
+    return traceUri.fsPath.substring(traceUri.fsPath.lastIndexOf('/') + 1);
 }
diff --git a/vscode-trace-extension/src/trace-viewer-panel/trace-viewer-webview-panel.ts b/vscode-trace-extension/src/trace-viewer-panel/trace-viewer-webview-panel.ts
@@ -115,7 +115,7 @@ export class TraceViewerPanel {
     private static async saveTraceCsv(csvData: string, defaultFileName: string) {
         const saveDialogOptions = {
             defaultUri: vscode.workspace.workspaceFolders
-                ? vscode.Uri.file(vscode.workspace.workspaceFolders[0].uri.path + '/' + defaultFileName)
+                ? vscode.Uri.file(vscode.workspace.workspaceFolders[0].uri.fsPath + '/' + defaultFileName)
                 : undefined,
             saveLabel: 'Save as CSV',
             filters: {