Skip to content

Fix Copy Path separator for git: URIs on Remote SSH #309252

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yogeshwaran-c wants to merge 1 commit into
base: main
Choose a base branch
from
+8 −1
Open

Fix Copy Path separator for git: URIs on Remote SSH #309252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/vs/base/common/labels.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ export function tildify(path: string, userHome: string, os = OS): string {
return `~/${normalizedPath.substr(normalizedUserHome.length)}`;
}

return path;
return normalizedPath;
}

export function untildify(path: string, userHome: string): string {
Expand Down
7 changes: 7 additions & 0 deletions src/vs/base/test/common/labels.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,13 @@ suite('Labels', () => {
assert.strictEqual(labels.getPathLabel(nixUntitledUri, { os: OperatingSystem.Macintosh, tildify: { userHome: remoteUserHome } }), '~/folder/file.txt');
assert.strictEqual(labels.getPathLabel(nixUntitledUri, { os: OperatingSystem.Linux, tildify: { userHome: remoteUserHome } }), '~/folder/file.txt');

// Tildify: path not under user home with cross-scheme URI (e.g., git: URI on a remote SSH session)
const gitSchemeUri = URI.file('/other/folder/file.txt').with({ scheme: 'git' });
const remoteUserHome2 = URI.file('/home/user').with({ scheme: 'vscode-remote', authority: 'ssh-remote+host' });

assert.strictEqual(labels.getPathLabel(gitSchemeUri, { os: OperatingSystem.Linux, tildify: { userHome: remoteUserHome2 } }), '/other/folder/file.txt');
assert.strictEqual(labels.getPathLabel(gitSchemeUri, { os: OperatingSystem.Macintosh, tildify: { userHome: remoteUserHome2 } }), '/other/folder/file.txt');

// Relative

const winFolder = URI.file('c:/some');
Expand Down