Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-07-17 09:23:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Don't revive URI before sending from ext to main

Browse Source 
Fixes #235331
This commit is contained in:
Daniel Imms
2025-06-12 12:58:58 -07:00
parent 086501e7d7
commit 2f7cd441c0
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extensions/terminal-suggest/src/terminalSuggestMain.ts
+7 -7
View File
@@ -148,13 +148,13 @@ export async function activate(context: vscode.ExtensionContext) {
}
if (terminal.shellIntegration?.cwd && (result.filesRequested || result.foldersRequested)) {
let cwd;
if (vscode.env.remoteName) {
cwd = vscode.Uri.file((result.cwd ?? terminal.shellIntegration.cwd).path).with({ authority: vscode.env.remoteName, scheme: 'vscode-remote' });
} else {
cwd = vscode.Uri.file((result.cwd ?? terminal.shellIntegration.cwd).fsPath);
}
return new vscode.TerminalCompletionList(result.items, { filesRequested: result.filesRequested, foldersRequested: result.foldersRequested, fileExtensions: result.fileExtensions, cwd, env: terminal.shellIntegration?.env?.value, });
return new vscode.TerminalCompletionList(result.items, {
filesRequested: result.filesRequested,
foldersRequested: result.foldersRequested,
fileExtensions: result.fileExtensions,
cwd: result.cwd ?? terminal.shellIntegration.cwd,
env: terminal.shellIntegration?.env?.value,
});
}
return result.items;
}
src/vs/workbench/api/common/extHostTypeConverters.ts
+1 -1
View File
@@ -3205,7 +3205,7 @@ export namespace TerminalResourceRequestConfig {
return {
...resourceRequestConfig,
pathSeparator,
cwd: resourceRequestConfig.cwd ? URI.revive(resourceRequestConfig.cwd) : undefined,
cwd: resourceRequestConfig.cwd,
};
}
}