Run fish activation scripts with source instead of `. (#7541)

* Revert "Fixes to sourcing of fish scripts in terminal (#7387)" This reverts commit 40a1d04.
* News entry
* Remove news entry

Author: DonJayamanne

news/2 Fixes/7343.md

@@ -27,11 +27,7 @@ export class Bash extends BaseActivationCommandProvider {
         if (!scriptFile) {
             return;
         }
-        if (targetShell === TerminalShellType.fish) {
-            return [`. ${scriptFile.fileToCommandArgument()}`];
-        } else {
-            return [`source ${scriptFile.fileToCommandArgument()}`];
-        }
+        return [`source ${scriptFile.fileToCommandArgument()}`];
     }
 
     private getScriptsInOrderOfPreference(targetShell: TerminalShellType): string[] {

src/client/common/terminal/environmentActivationProviders/bash.ts

@@ -89,13 +89,12 @@ suite('Terminal Environment Activation (bash)', () => {
                             const command = await bash.getActivationCommands(undefined, shellType.value);
 
                             if (isScriptFileSupported) {
-                                const sourceCmd = shellType.value === TerminalShellType.fish ? '.' : 'source';
                                 // Ensure the script file is of the following form:
                                 // source "<path to script file>" <environment name>
                                 // Ensure the path is quoted if it contains any spaces.
                                 // Ensure it contains the name of the environment as an argument to the script file.
 
-                                expect(command).to.be.deep.equal([`${sourceCmd} ${pathToScriptFile.fileToCommandArgument()}`.trim()], 'Invalid command');
+                                expect(command).to.be.deep.equal([`source ${pathToScriptFile.fileToCommandArgument()}`.trim()], 'Invalid command');
                             } else {
                                 expect(command).to.be.equal(undefined, 'Command should be undefined');
                             }