Use VSCode API appropriately to find out what terminal is being used (#16858)

* Use the appropriate API to find out what terminal is being used

* News entry

Author: Kartik Raj

news/2 Fixes/16577.md

@@ -0,0 +1 @@
+Use the vscode API appropriately to find out what terminal is being used.

src/client/common/terminal/shellDetectors/vscEnvironmentShellDetector.ts

@@ -23,13 +23,17 @@ export class VSCEnvironmentShellDetector extends BaseShellDetector {
     }
     public identify(
         telemetryProperties: ShellIdentificationTelemetry,
-        _terminal?: Terminal,
+        terminal?: Terminal,
     ): TerminalShellType | undefined {
-        if (!this.appEnv.shell) {
+        const shellPath =
+            terminal?.creationOptions && 'shellPath' in terminal.creationOptions && terminal.creationOptions.shellPath
+                ? terminal.creationOptions.shellPath
+                : this.appEnv.shell;
+        if (!shellPath) {
             return;
         }
-        const shell = this.identifyShellFromShellPath(this.appEnv.shell);
-        traceVerbose(`Terminal shell path '${this.appEnv.shell}' identified as shell '${shell}'`);
+        const shell = this.identifyShellFromShellPath(shellPath);
+        traceVerbose(`Terminal shell path '${shellPath}' identified as shell '${shell}'`);
         telemetryProperties.shellIdentificationSource =
             shell === TerminalShellType.other ? telemetryProperties.shellIdentificationSource : 'vscode';
         return shell;

src/test/common/terminals/shellDetectors/shellDetectors.unit.test.ts

@@ -6,6 +6,7 @@
 import { expect } from 'chai';
 import * as sinon from 'sinon';
 import { instance, mock, when } from 'ts-mockito';
+import { Terminal } from 'vscode';
 import { ApplicationEnvironment } from '../../../../client/common/application/applicationEnvironment';
 import { WorkspaceService } from '../../../../client/common/application/workspace';
 import { PlatformService } from '../../../../client/common/platform/platformService';
@@ -91,7 +92,18 @@ suite('Shell Detectors', () => {
             'Should be undefined when there is no temrinal',
         );
     });
-    test('Identify shell based on VSC Environment', async () => {
+    test('Identify shell based on custom VSC shell path', async () => {
+        const shellDetector = new VSCEnvironmentShellDetector(instance(appEnv));
+        shellPathsAndIdentification.forEach((shellType, shellPath) => {
+            when(appEnv.shell).thenReturn('defaultshellPath');
+            expect(
+                shellDetector.identify(telemetryProperties, ({
+                    creationOptions: { shellPath },
+                } as unknown) as Terminal),
+            ).to.equal(shellType, `Incorrect Shell Type from identifyShellByTerminalName, for path '${shellPath}'`);
+        });
+    });
+    test('Identify shell based on VSC API', async () => {
         const shellDetector = new VSCEnvironmentShellDetector(instance(appEnv));
         shellPathsAndIdentification.forEach((shellType, shellPath) => {
             when(appEnv.shell).thenReturn(shellPath);