always add Swift path to terminal PATH (#950)

matthewbastien · web-flow · commit bf7c6896b898 · 2024-07-03T14:54:23.000-04:00
diff --git a/src/terminal.ts b/src/terminal.ts
@@ -55,8 +55,7 @@ export class SwiftEnvironmentVariablesManager implements vscode.Disposable {
             return;
         }
 
-        const pathEnv = process.env["PATH"] ?? "";
-        if (!pathEnv.includes(configuration.path)) {
+        if (configuration.path) {
             environment.prepend("PATH", configuration.path + pathSeparator);
         }
         for (const variable in configuration.swiftEnvironmentVariables) {
@@ -75,7 +74,7 @@ export class SwiftTerminalProfileProvider implements vscode.TerminalProfileProvi
             ...configuration.swiftEnvironmentVariables,
         };
         const pathEnv = process.env["PATH"] ?? "";
-        if (!pathEnv.includes(configuration.path)) {
+        if (configuration.path) {
             env["PATH"] = configuration.path + pathSeparator + pathEnv;
         }
         return new vscode.TerminalProfile({

Original file line number	Diff line number	Diff line change
`@@ -55,8 +55,7 @@ export class SwiftEnvironmentVariablesManager implements vscode.Disposable {`
`55`	`55`	`return;`
`56`	`56`	`}`
`57`	`57`
`58`		`- const pathEnv = process.env["PATH"] ?? "";`
`59`		`- if (!pathEnv.includes(configuration.path)) {`
	`58`	`+ if (configuration.path) {`
`60`	`59`	`environment.prepend("PATH", configuration.path + pathSeparator);`
`61`	`60`	`}`
`62`	`61`	`for (const variable in configuration.swiftEnvironmentVariables) {`
`@@ -75,7 +74,7 @@ export class SwiftTerminalProfileProvider implements vscode.TerminalProfileProvi`
`75`	`74`	`...configuration.swiftEnvironmentVariables,`
`76`	`75`	`};`
`77`	`76`	`const pathEnv = process.env["PATH"] ?? "";`
`78`		`- if (!pathEnv.includes(configuration.path)) {`
	`77`	`+ if (configuration.path) {`
`79`	`78`	`env["PATH"] = configuration.path + pathSeparator + pathEnv;`
`80`	`79`	`}`
`81`	`80`	`return new vscode.TerminalProfile({`