Skip to content

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

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
Karthik Nadig (karthiknadig) merged 12 commits into from
Oct 4, 2021
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
6a78fc8
Worked on issue #15522
Vidushi-Gupta Oct 1, 2021
63f9fa9
worked on #15522 issue
Vidushi-Gupta Oct 1, 2021
eb8407b
added #15522 issue fix and contributor name
Vidushi-Gupta Oct 1, 2021
3518b24
Impored Uri from VSCode
Vidushi-Gupta Oct 1, 2021
7a9b5d2
imported Uri correctly
Vidushi-Gupta Oct 2, 2021
fba16c7
imported Uri correctly
Vidushi-Gupta Oct 2, 2021
70feba5
used short hand property on line 61
Vidushi-Gupta Oct 2, 2021
0e4df5d
formatted document using prettier
Vidushi-Gupta Oct 2, 2021
16a0dd3
formatted code using prettier
Vidushi-Gupta Oct 2, 2021
7fa028c
formatted code using prettier
Vidushi-Gupta Oct 2, 2021
6463e98
updated formatting of the document
Vidushi-Gupta Oct 3, 2021
0bbde9b
Fix formatting.
karthiknadig Oct 4, 2021
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/15522.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
19 changes: 13 additions & 6 deletions src/client/terminals/activation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -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);
}
Expand Down Expand Up @@ -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;
Comment thread
karthiknadig marked this conversation as resolved.

await this.activator.activateEnvironmentInTerminal(terminal, {
resource: this.activeResourceService.getActiveResource(),
resource,
});
}
}