Skip to content

Attempt to use uri of active text editor document to determine virtual env to use with terminal #7534

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Sep 27, 2019
Merged

Attempt to use uri of active text editor document to determine virtual env to use with terminal #7534

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
652dee4
grab uri from active text editor if available
SteelPhase Sep 21, 2019
7669bd2
add news entry
SteelPhase Sep 21, 2019
516bcb2
Update 6282.md
SteelPhase Sep 27, 2019
e5f4592
Update 6282.md
SteelPhase Sep 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions news/2 Fixes/6282.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix loging for determining python path from workspace of active text editor (thanks [Eric Bajumpaa (@SteelPhase)](https://github.com/SteelPhase))
19 changes: 12 additions & 7 deletions src/client/terminals/activation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
'use strict';

import { inject, injectable } from 'inversify';
import { Terminal } from 'vscode';
import { Terminal, Uri } from 'vscode';
import { IExtensionSingleActivationService } from '../activation/types';
import {
ICommandManager, ITerminalManager, IWorkspaceService
ICommandManager, IDocumentManager, ITerminalManager, IWorkspaceService
} from '../common/application/types';
import { ShowPlayIcon } from '../common/experimentGroups';
import { ITerminalActivator } from '../common/terminal/types';
Expand Down Expand Up @@ -48,6 +48,7 @@ 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
) {
Expand All @@ -68,10 +69,14 @@ 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.
const workspaceFolder =
this.workspaceService.hasWorkspaceFolders && this.workspaceService.workspaceFolders!.length > 0
? this.workspaceService.workspaceFolders![0].uri
: undefined;
await this.activator.activateEnvironmentInTerminal(terminal, workspaceFolder);
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;
}
}
6 changes: 5 additions & 1 deletion src/test/common/terminals/activation.unit.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@ 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 { TerminalManager } from '../../../client/common/application/terminalManager';
import { ITerminalManager, IWorkspaceService } from '../../../client/common/application/types';
import { IDocumentManager, ITerminalManager, IWorkspaceService } from '../../../client/common/application/types';
import { WorkspaceService } from '../../../client/common/application/workspace';
import { TerminalActivator } from '../../../client/common/terminal/activator';
import { ITerminalActivator } from '../../../client/common/terminal/types';
Expand All @@ -17,18 +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;

setup(() => {
terminalManager = mock(TerminalManager);
documentManager = mock(DocumentManager);
activator = mock(TerminalActivator);
workspaceService = mock(WorkspaceService);

terminalAutoActivation = new TerminalAutoActivation(
instance(terminalManager),
[],
instance(documentManager),
instance(activator),
instance(workspaceService)
);
Expand Down