src/goEnvironmentStatus.ts: fix terminal shell args setting name
This is a platform specific setting, so it should be
terminal.integrated.shellArgs.osx.
Change-Id: I7cc3009beda2481c77ef02245013b8d0487f4c5a
Reviewed-on: https://go-review.googlesource.com/c/vscode-go/+/245325
Reviewed-by: Rebecca Stambler <rstambler@golang.org>
diff --git a/src/goEnvironmentStatus.ts b/src/goEnvironmentStatus.ts
index f75dae7..c70757e 100644
--- a/src/goEnvironmentStatus.ts
+++ b/src/goEnvironmentStatus.ts
@@ -301,13 +301,14 @@
// environmentVariableCollection.clear();
if (process.platform !== 'darwin') {
environmentVariableCollection?.prepend(pathEnvVar, newGoRuntimeBase + path.delimiter);
- } else if (!terminalCreationListener) {
+ } else if (!terminalCreationListener) { // process.platform === 'darwin'
// We don't use EnvironmentVariableCollection on mac
// because this gets confusing for users. Instead we send the
// shell command to change the PATH env var,
// following the suggestion to workaround described in
// https://github.com/microsoft/vscode/issues/99878#issuecomment-642808852
- const terminalShellArgs = <string[]>(vscode.workspace.getConfiguration('terminal.integrated').get('shellArgs') || []);
+ const terminalShellArgs = <string[]>(
+ vscode.workspace.getConfiguration('terminal.integrated.shellArgs').get('osx') || []);
// User explicitly chose to run the login shell. So, don't mess with their config.
if (!terminalShellArgs.includes('-l') && !terminalShellArgs.includes('--login')) {
for (const term of vscode.window.terminals) {
