Skip to content

Commit a8e719e

Browse files
authored
Merge pull request microsoft#184363 from microsoft/merogge/fish-auto
don't automatically inject fish shell integration
2 parents 666396d + 17739f8 commit a8e719e

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

src/vs/platform/terminal/node/terminalEnvironment.ts

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -176,11 +176,12 @@ export function getShellIntegrationInjection(
176176
case 'fish': {
177177
// The injection mechanism used for fish is to add a custom dir to $XDG_DATA_DIRS which
178178
// is similar to $ZDOTDIR in zsh but contains a list of directories to run from.
179-
const oldDataDirs = env?.XDG_DATA_DIRS ?? '/usr/local/share:/usr/share';
180-
const newDataDir = path.join(appRoot, 'out/vs/workbench/contrib/terminal/browser/media/fish_xdg_data');
181-
envMixin['XDG_DATA_DIRS'] = `${oldDataDirs}:${newDataDir}`;
182-
addEnvMixinPathPrefix(options, envMixin);
183-
return { newArgs: undefined, envMixin };
179+
// const oldDataDirs = env?.XDG_DATA_DIRS ?? '/usr/local/share:/usr/share';
180+
// const newDataDir = path.join(appRoot, 'out/vs/workbench/contrib/terminal/browser/media/fish_xdg_data');
181+
// envMixin['XDG_DATA_DIRS'] = `${oldDataDirs}:${newDataDir}`;
182+
// addEnvMixinPathPrefix(options, envMixin);
183+
// return { newArgs: undefined, envMixin };
184+
return undefined;
184185
}
185186
case 'pwsh': {
186187
if (!originalArgs || arePwshImpliedArgs(originalArgs)) {

0 commit comments

Comments
 (0)