Refactor more stuff

Author: Kartik Raj

src/client/terminals/activation.ts

@@ -4,10 +4,10 @@
 'use strict';
 
 import { inject, injectable } from 'inversify';
-import { Terminal, Uri } from 'vscode';
-import { IExtensionSingleActivationService } from '../activation/types';
+import { Terminal } from 'vscode';
+import { IActiveResourceService, IExtensionSingleActivationService } from '../activation/types';
 import {
-    ICommandManager, IDocumentManager, ITerminalManager, IWorkspaceService
+    ICommandManager, ITerminalManager
 } from '../common/application/types';
 import { CODE_RUNNER_EXTENSION_ID } from '../common/constants';
 import { ITerminalActivator } from '../common/terminal/types';
@@ -49,9 +49,8 @@ export class TerminalAutoActivation implements ITerminalAutoActivation {
     constructor(
         @inject(ITerminalManager) private readonly terminalManager: ITerminalManager,
         @inject(IDisposableRegistry) disposableRegistry: IDisposableRegistry,
-        @inject(IDocumentManager) private readonly documentManager: IDocumentManager,
         @inject(ITerminalActivator) private readonly activator: ITerminalActivator,
-        @inject(IWorkspaceService) private readonly workspaceService: IWorkspaceService
+        @inject(IActiveResourceService) private readonly activeResourceService: IActiveResourceService
     ) {
         disposableRegistry.push(this);
     }
@@ -70,14 +69,6 @@ export class TerminalAutoActivation implements ITerminalAutoActivation {
     private async activateTerminal(terminal: Terminal): Promise<void> {
         // 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.
-        await this.activator.activateEnvironmentInTerminal(terminal, this.getActiveResource());
-    }
-
-    private getActiveResource(): Uri | undefined {
-        if (this.documentManager.activeTextEditor && !this.documentManager.activeTextEditor.document.isUntitled) {
-            return this.documentManager.activeTextEditor.document.uri;
-        }
-
-        return Array.isArray(this.workspaceService.workspaceFolders) && this.workspaceService.workspaceFolders.length > 0 ? this.workspaceService.workspaceFolders[0].uri : undefined;
+        await this.activator.activateEnvironmentInTerminal(terminal, this.activeResourceService.getActiveResource());
     }
 }

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

@@ -6,10 +6,10 @@ import { expect } from 'chai';
 import { anything, instance, mock, verify, when } from 'ts-mockito';
 import * as TypeMoq from 'typemoq';
 import { Terminal, Uri } from 'vscode';
-import { DocumentManager } from '../../../client/common/application/documentManager';
+import { ActiveResourceService } from '../../../client/activation/activeResource';
+import { IActiveResourceService } from '../../../client/activation/types';
 import { TerminalManager } from '../../../client/common/application/terminalManager';
-import { IDocumentManager, ITerminalManager, IWorkspaceService } from '../../../client/common/application/types';
-import { WorkspaceService } from '../../../client/common/application/workspace';
+import { ITerminalManager } from '../../../client/common/application/types';
 import { TerminalActivator } from '../../../client/common/terminal/activator';
 import { ITerminalActivator } from '../../../client/common/terminal/types';
 import { IDisposable } from '../../../client/common/types';
@@ -18,23 +18,21 @@ import { ITerminalAutoActivation } from '../../../client/terminals/types';
 
 suite('Terminal Auto Activation', () => {
     let activator: ITerminalActivator;
-    let documentManager: IDocumentManager;
     let terminalManager: ITerminalManager;
     let terminalAutoActivation: ITerminalAutoActivation;
-    let workspaceService: IWorkspaceService;
+    let activeResourceService: IActiveResourceService;
+    const resource = Uri.parse('a');
 
     setup(() => {
         terminalManager = mock(TerminalManager);
-        documentManager = mock(DocumentManager);
         activator = mock(TerminalActivator);
-        workspaceService = mock(WorkspaceService);
+        activeResourceService = mock(ActiveResourceService);
 
         terminalAutoActivation = new TerminalAutoActivation(
             instance(terminalManager),
             [],
-            instance(documentManager),
             instance(activator),
-            instance(workspaceService)
+            instance(activeResourceService)
         );
     });
 
@@ -47,17 +45,17 @@ suite('Terminal Auto Activation', () => {
             handler = cb;
             return handlerDisposable.object;
         };
+        when(activeResourceService.getActiveResource()).thenReturn(resource);
         when(terminalManager.onDidOpenTerminal).thenReturn(onDidOpenTerminal);
         when(activator.activateEnvironmentInTerminal(anything(), anything(), anything())).thenResolve();
-        when(workspaceService.hasWorkspaceFolders).thenReturn(false);
 
         terminalAutoActivation.register();
 
         expect(handler).not.to.be.an('undefined', 'event handler not initialized');
 
         handler!.bind(terminalAutoActivation)(terminal.object);
 
-        verify(activator.activateEnvironmentInTerminal(terminal.object, undefined)).once();
+        verify(activator.activateEnvironmentInTerminal(terminal.object, resource)).once();
     });
     test('New Terminals should be activated with resource of single workspace', async () => {
         type EventHandler = (e: Terminal) => void;
@@ -68,11 +66,9 @@ suite('Terminal Auto Activation', () => {
             handler = cb;
             return handlerDisposable.object;
         };
-        const resource = Uri.file(__filename);
+        when(activeResourceService.getActiveResource()).thenReturn(resource);
         when(terminalManager.onDidOpenTerminal).thenReturn(onDidOpenTerminal);
         when(activator.activateEnvironmentInTerminal(anything(), anything(), anything())).thenResolve();
-        when(workspaceService.hasWorkspaceFolders).thenReturn(true);
-        when(workspaceService.workspaceFolders).thenReturn([{ index: 0, name: '', uri: resource }]);
 
         terminalAutoActivation.register();
 
@@ -91,15 +87,9 @@ suite('Terminal Auto Activation', () => {
             handler = cb;
             return handlerDisposable.object;
         };
-        const resource = Uri.file(__filename);
+        when(activeResourceService.getActiveResource()).thenReturn(resource);
         when(terminalManager.onDidOpenTerminal).thenReturn(onDidOpenTerminal);
         when(activator.activateEnvironmentInTerminal(anything(), anything(), anything())).thenResolve();
-        when(workspaceService.hasWorkspaceFolders).thenReturn(true);
-        when(workspaceService.workspaceFolders).thenReturn([
-            { index: 0, name: '', uri: resource },
-            { index: 2, name: '2', uri: Uri.file('1234') }
-        ]);
-
         terminalAutoActivation.register();
 
         expect(handler).not.to.be.an('undefined', 'event handler not initialized');