development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-27 13:00:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't touch fish args as they remain when injected

Browse source
This commit is contained in:
Daniel Imms 2022-12-15 16:00:21 -08:00
parent cc99bb094b
commit 4488b736e4
No known key found for this signature in database
GPG key ID: 7116259D505CA628
1 changed files with 1 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/vs/platform/terminal/node/terminalEnvironment.ts
View file

@ -161,17 +161,10 @@ export function getShellIntegrationInjection(
return { newArgs, envMixin };
}
case 'fish': {
if (!originalArgs || originalArgs.length === 0) {
newArgs = [];
} else if (Array.isArray(originalArgs)) {
newArgs = originalArgs;
} else {
newArgs = [originalArgs];
}
const oldDataDirs = env?.XDG_DATA_DIRS ?? '/usr/local/share:/usr/share';
const newDataDir = path.join(appRoot, 'out/vs/workbench/contrib/xdg_data');
envMixin['XDG_DATA_DIRS'] = `${oldDataDirs}:${newDataDir}`;
return { newArgs, envMixin };
return { newArgs: undefined, envMixin };
}
case 'pwsh': {
if (!originalArgs || arePwshImpliedArgs(originalArgs)) {