Skip to content

Commit

Permalink
Merge pull request #181824 from microsoft/tyriar/181812
Browse files Browse the repository at this point in the history
Disable suggestEnabled setting usages for now
  • Loading branch information
Tyriar authored May 8, 2023
2 parents cf1abc4 + 3f8f062 commit d1aa00a
Showing 1 changed file with 8 additions and 6 deletions.
14 changes: 8 additions & 6 deletions src/vs/platform/terminal/node/terminalEnvironment.ts
Original file line number Diff line number Diff line change
Expand Up @@ -146,9 +146,10 @@ export function getShellIntegrationInjection(
}
newArgs = [...newArgs]; // Shallow clone the array to avoid setting the default array
newArgs[newArgs.length - 1] = format(newArgs[newArgs.length - 1], appRoot, '');
if (options.shellIntegration.suggestEnabled) {
envMixin['VSCODE_SUGGEST'] = '1';
}
// TODO: Uncomment when suggestEnabled is ready for use
// if (options.shellIntegration.suggestEnabled) {
// envMixin['VSCODE_SUGGEST'] = '1';
// }
return { newArgs, envMixin };
}
logService.warn(`Shell integration cannot be enabled for executable "${shellLaunchConfig.executable}" and args`, shellLaunchConfig.args);
Expand Down Expand Up @@ -190,9 +191,10 @@ export function getShellIntegrationInjection(
if (!newArgs) {
return undefined;
}
if (options.shellIntegration.suggestEnabled) {
envMixin['VSCODE_SUGGEST'] = '1';
}
// TODO: Uncomment when suggestEnabled is ready for use
// if (options.shellIntegration.suggestEnabled) {
// envMixin['VSCODE_SUGGEST'] = '1';
// }
newArgs = [...newArgs]; // Shallow clone the array to avoid setting the default array
newArgs[newArgs.length - 1] = format(newArgs[newArgs.length - 1], appRoot, '');
return { newArgs, envMixin };
Expand Down

0 comments on commit d1aa00a

Please sign in to comment.