reset

Author: eleanorjboyd

.vscode/launch.json

@@ -149,12 +149,14 @@
                 "--ui=tdd",
                 "--recursive",
                 "--colors",
-                //"--grep", "<suite name>",
+                "--grep",
+                "ProcessLogger suite",
                 "--timeout=300000"
             ],
             "outFiles": ["${workspaceFolder}/out/**/*.js", "!${workspaceFolder}/**/node_modules**/*"],
             "preLaunchTask": "Compile",
-            "skipFiles": ["<node_internals>/**"]
+            "skipFiles": ["<node_internals>/**"],
+            "runtimeExecutable": "/Users/eleanorboyd/.nvm/versions/node/v22.17.0/bin/node"
         },
         {
             "name": "Unit Tests (fast, without VS Code and without react/monaco, *.unit.test.ts)",

src/client/common/process/logger.ts

@@ -27,10 +27,10 @@ export class ProcessLogger implements IProcessLogger {
         let command = args
             ? [fileOrCommand, ...args].map((e) => e.trimQuotes().toCommandArgumentForPythonExt()).join(' ')
             : fileOrCommand;
-        const info = [`> ${this.getDisplayCommands(command, false)}`];
+        const info = [`> ${this.getDisplayCommands(command)}`];
         if (options?.cwd) {
             const cwd: string = typeof options?.cwd === 'string' ? options?.cwd : options?.cwd?.toString();
-            info.push(`cwd: ${this.getDisplayCommands(cwd, true)}`);
+            info.push(`cwd: ${this.getDisplayCommands(cwd)}`);
         }
         if (typeof options?.shell === 'string') {
             info.push(`shell: ${identifyShellFromShellPath(options?.shell)}`);
@@ -41,16 +41,16 @@ export class ProcessLogger implements IProcessLogger {
         });
     }
 
-    private getDisplayCommands(command: string, isCwd: boolean = false): string {
+    /**
+     * Formats command strings for display by replacing common paths with symbols.
+     * - Replaces the workspace folder path with '.' if there's exactly one workspace folder
+     * - Replaces the user's home directory path with '~'
+     * @param command The command string to format
+     * @returns The formatted command string with paths replaced by symbols
+     */
+    private getDisplayCommands(command: string): string {
         if (this.workspaceService.workspaceFolders && this.workspaceService.workspaceFolders.length === 1) {
-            const workspacePath = this.workspaceService.workspaceFolders[0].uri.fsPath;
-            if (isCwd) {
-                // For working directory paths, replace workspace path with '.'
-                command = replaceMatchesWithCharacter(command, workspacePath, '.');
-            } else if (command.includes(workspacePath)) {
-                // For command paths, make them relative to workspace by replacing workspace path with './'
-                command = command.replace(workspacePath, '.');
-            }
+            command = replaceMatchesWithCharacter(command, this.workspaceService.workspaceFolders[0].uri.fsPath, '.');
         }
         const home = getUserHomeDir();
         if (home) {

src/test/common/process/logger.unit.test.ts

@@ -111,7 +111,7 @@ suite('ProcessLogger suite', () => {
         const options = { cwd: path.join('debug', 'path') };
         logger.logProcess(path.join('net', untildify('~'), 'test'), ['--foo', '--bar'], options);
 
-        sinon.assert.calledWithExactly(traceLogStub, `> ${path.join('.', 'net', '~', 'test')} --foo --bar`);
+        sinon.assert.calledWithExactly(traceLogStub, `> ${path.join('net', '~', 'test')} --foo --bar`);
         sinon.assert.calledWithExactly(traceLogStub, `cwd: ${options.cwd}`);
     });
 
@@ -125,7 +125,7 @@ suite('ProcessLogger suite', () => {
 
         sinon.assert.calledWithExactly(
             traceLogStub,
-            `> ${path.join('.', 'net', '~', 'test')} --foo ${path.join('~', 'boo')}`,
+            `> ${path.join('net', '~', 'test')} --foo ${path.join('~', 'boo')}`,
         );
         sinon.assert.calledWithExactly(traceLogStub, `cwd: ${options.cwd}`);
     });
@@ -134,7 +134,7 @@ suite('ProcessLogger suite', () => {
         const options = { cwd: path.join('debug', 'path') };
         logger.logProcess(`"${path.join('net', untildify('~'), 'test')}" "--foo" "--bar"`, undefined, options);
 
-        sinon.assert.calledWithExactly(traceLogStub, `> "${path.join('.', 'net', '~', 'test')}" "--foo" "--bar"`);
+        sinon.assert.calledWithExactly(traceLogStub, `> "${path.join('net', '~', 'test')}" "--foo" "--bar"`);
         sinon.assert.calledWithExactly(traceLogStub, `cwd: ${options.cwd}`);
     });
 
@@ -146,39 +146,30 @@ suite('ProcessLogger suite', () => {
         sinon.assert.calledWithExactly(traceLogStub, `cwd: ${options.cwd}`);
     });
 
-    test('Logger only replaces the workspace path with . in the working directory', async () => {
+    test('Logger replaces the path to workspace with . if exactly one workspace folder is opened', async () => {
         const options = { cwd: path.join('path', 'to', 'workspace', 'debug', 'path') };
         logger.logProcess(`"${path.join('path', 'to', 'workspace', 'test')}" "--foo" "--bar"`, undefined, options);
 
-        sinon.assert.calledWithExactly(
-            traceLogStub,
-            `> "${path.join('path', 'to', 'workspace', 'test')}" "--foo" "--bar"`,
-        );
+        sinon.assert.calledWithExactly(traceLogStub, `> ".${path.sep}test" "--foo" "--bar"`);
         sinon.assert.calledWithExactly(traceLogStub, `cwd: .${path.sep + path.join('debug', 'path')}`);
     });
 
-    test('On Windows, logger handles both forward and backward slashes in workspace paths for cwd', async function () {
+    test('On Windows, logger replaces both backwards and forward slash version of path to workspace with . if exactly one workspace folder is opened', async function () {
         if (getOSType() !== OSType.Windows) {
             return this.skip();
         }
         let options = { cwd: path.join('path/to/workspace', 'debug', 'path') };
 
         logger.logProcess(`"${path.join('path', 'to', 'workspace', 'test')}" "--foo" "--bar"`, undefined, options);
 
-        sinon.assert.calledWithExactly(
-            traceLogStub,
-            `> "${path.join('path', 'to', 'workspace', 'test')}" "--foo" "--bar"`,
-        );
+        sinon.assert.calledWithExactly(traceLogStub, `> ".${path.sep}test" "--foo" "--bar"`);
         sinon.assert.calledWithExactly(traceLogStub, `cwd: .${path.sep + path.join('debug', 'path')}`);
         traceLogStub.resetHistory();
 
         options = { cwd: path.join('path\\to\\workspace', 'debug', 'path') };
         logger.logProcess(`"${path.join('path', 'to', 'workspace', 'test')}" "--foo" "--bar"`, undefined, options);
 
-        sinon.assert.calledWithExactly(
-            traceLogStub,
-            `> "${path.join('path', 'to', 'workspace', 'test')}" "--foo" "--bar"`,
-        );
+        sinon.assert.calledWithExactly(traceLogStub, `> ".${path.sep}test" "--foo" "--bar"`);
         sinon.assert.calledWithExactly(traceLogStub, `cwd: .${path.sep + path.join('debug', 'path')}`);
     });