From 10fb86137659f5374a1feb1a8085632e615c8d04 Mon Sep 17 00:00:00 2001 From: Mark Sujew Date: Fri, 16 Dec 2022 13:25:39 +0100 Subject: [PATCH 1/2] Use file system path for `COPY_PATH` command --- packages/core/src/browser/common-frontend-contribution.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core/src/browser/common-frontend-contribution.ts b/packages/core/src/browser/common-frontend-contribution.ts index 0f0bbc85228c2..d95502c1e2fe9 100644 --- a/packages/core/src/browser/common-frontend-contribution.ts +++ b/packages/core/src/browser/common-frontend-contribution.ts @@ -737,7 +737,7 @@ export class CommonFrontendContribution implements FrontendApplicationContributi execute: async uris => { if (uris.length) { const lineDelimiter = isWindows ? '\r\n' : '\n'; - const text = uris.map(resource => resource.path).join(lineDelimiter); + const text = uris.map(resource => resource.path.fsPath()).join(lineDelimiter); await this.clipboardService.writeText(text); } else { await this.messageService.info('Open a file first to copy its path'); From 812c7c9e8698308552594d295e7e2cc55b7d961b Mon Sep 17 00:00:00 2001 From: Mark Sujew Date: Fri, 16 Dec 2022 13:27:51 +0100 Subject: [PATCH 2/2] Update for `COPY_RELATIVE_FILE_PATH` --- packages/workspace/src/browser/workspace-commands.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/workspace/src/browser/workspace-commands.ts b/packages/workspace/src/browser/workspace-commands.ts index 38e720fda7cc1..1bc8f5046ba1e 100644 --- a/packages/workspace/src/browser/workspace-commands.ts +++ b/packages/workspace/src/browser/workspace-commands.ts @@ -316,9 +316,9 @@ export class WorkspaceCommandContribution implements CommandContribution { const text = uris.map((uri: URI) => { const workspaceRoot = this.workspaceService.getWorkspaceRootUri(uri); if (workspaceRoot) { - return workspaceRoot.relative(uri); + return workspaceRoot.relative(uri)?.fsPath(); } else { - return uri.path; + return uri.path.fsPath(); } }).join(lineDelimiter); await this.clipboardService.writeText(text); @@ -425,7 +425,7 @@ export class WorkspaceCommandContribution implements CommandContribution { protected trimFileName(name: string): string { if (name && name.length > 30) { - return `${name.substr(0, 30)}...`; + return `${name.substring(0, 30)}...`; } return name; }