Skip to content
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

Jump to bottom

build: enable suggestions when 'shellIntegration.suggestEnabled' is true #199821

Merged
merged 2 commits into from
Dec 3, 2023
Merged

build: enable suggestions when 'shellIntegration.suggestEnabled' is true #199821

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
613142b
build: enable suggestions when 'shellIntegration.suggestEnabled' is true
cpendery Dec 1, 2023
1341061
Merge branch 'main' into build/enable-suggestions
cpendery Dec 1, 2023
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
14 changes: 6 additions & 8 deletions src/vs/platform/terminal/node/terminalEnvironment.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,10 +146,9 @@ 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, '');
// TODO: Uncomment when suggestEnabled is ready for use
// if (options.shellIntegration.suggestEnabled) {
// envMixin['VSCODE_SUGGEST'] = '1';
// }
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 @@ -191,10 +190,9 @@ export function getShellIntegrationInjection(
if (!newArgs) {
return undefined;
}
// TODO: Uncomment when suggestEnabled is ready for use
// if (options.shellIntegration.suggestEnabled) {
// envMixin['VSCODE_SUGGEST'] = '1';
// }
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
Loading