Apply changes to PATH after terminal creation (#952)

* set applyAtShellIntegration when changing terminal environment

* apply Swift terminal PATH environment variable after shell startup

Author: matthewbastien

src/terminal.ts

@@ -56,10 +56,14 @@ export class SwiftEnvironmentVariablesManager implements vscode.Disposable {
         }
 
         if (configuration.path) {
-            environment.prepend("PATH", configuration.path + pathSeparator);
+            environment.prepend("PATH", configuration.path + pathSeparator, {
+                applyAtShellIntegration: true,
+            });
         }
         for (const variable in configuration.swiftEnvironmentVariables) {
-            environment.replace(variable, configuration.swiftEnvironmentVariables[variable]);
+            environment.replace(variable, configuration.swiftEnvironmentVariables[variable], {
+                applyAtShellIntegration: true,
+            });
         }
     }
 }
@@ -73,13 +77,18 @@ export class SwiftTerminalProfileProvider implements vscode.TerminalProfileProvi
         const env: vscode.TerminalOptions["env"] = {
             ...configuration.swiftEnvironmentVariables,
         };
-        const pathEnv = process.env["PATH"] ?? "";
-        if (configuration.path) {
-            env["PATH"] = configuration.path + pathSeparator + pathEnv;
+        if (!configuration.enableTerminalEnvironment) {
+            const disposable = vscode.window.onDidOpenTerminal(terminal => {
+                if (configuration.path) {
+                    terminal.sendText(`export PATH=${configuration.path + pathSeparator}$PATH`);
+                }
+                disposable.dispose();
+            });
         }
         return new vscode.TerminalProfile({
             name: "Swift Terminal",
             iconPath: new vscode.ThemeIcon("swift-icon"),
+            shellArgs: [],
             env,
         });
     }