Creating new Integrated Terminal doesn't take selected workspace into account when activating environment (#17595)

* Worked on issue #15522

* worked on #15522 issue

* added #15522 issue fix and contributor name

* Impored Uri from VSCode

* imported Uri correctly

* imported Uri correctly

* used short hand property on line 61

* formatted document using prettier

* formatted code using prettier

* formatted code using prettier

* updated formatting of the document

used 4 tab spaces in prettier

* Fix formatting.

Co-authored-by: Karthik Nadig <[email protected]>

Author: Vidushi-Gupta

news/2 Fixes/15522.md

@@ -0,0 +1 @@
+When activating environment, creating new Integrated Terminal doesn't take selected workspace into account. (Thanks [Vidushi Gupta](https://github.com/Vidushi-Gupta) for the contribution)

src/client/terminals/activation.ts

@@ -4,7 +4,7 @@
 'use strict';
 
 import { inject, injectable } from 'inversify';
-import { Terminal } from 'vscode';
+import { Terminal, Uri } from 'vscode';
 import { IActiveResourceService, ITerminalManager } from '../common/application/types';
 import { ITerminalActivator } from '../common/terminal/types';
 import { IDisposable, IDisposableRegistry } from '../common/types';
@@ -17,10 +17,12 @@ export class TerminalAutoActivation implements ITerminalAutoActivation {
     private readonly terminalsNotToAutoActivate = new WeakSet<Terminal>();
 
     constructor(
-        @inject(ITerminalManager) private readonly terminalManager: ITerminalManager,
+        @inject(ITerminalManager)
+        private readonly terminalManager: ITerminalManager,
         @inject(IDisposableRegistry) disposableRegistry: IDisposableRegistry,
         @inject(ITerminalActivator) private readonly activator: ITerminalActivator,
-        @inject(IActiveResourceService) private readonly activeResourceService: IActiveResourceService,
+        @inject(IActiveResourceService)
+        private readonly activeResourceService: IActiveResourceService,
     ) {
         disposableRegistry.push(this);
     }
@@ -50,10 +52,15 @@ export class TerminalAutoActivation implements ITerminalAutoActivation {
         if ('hideFromUser' in terminal.creationOptions && terminal.creationOptions.hideFromUser) {
             return;
         }
-        // If we have just one workspace, then pass that as the resource.
-        // Until upstream VSC issue is resolved https://github.com/Microsoft/vscode/issues/63052.
+
+        const cwd =
+            'cwd' in terminal.creationOptions
+                ? terminal.creationOptions.cwd
+                : this.activeResourceService.getActiveResource();
+        const resource = typeof cwd === 'string' ? Uri.file(cwd) : cwd;
+
         await this.activator.activateEnvironmentInTerminal(terminal, {
-            resource: this.activeResourceService.getActiveResource(),
+            resource,
         });
     }
 }