Skip to content

Do not deprecate python.terminal.activateEnvironmentInTerminal setting along with terminal env var experiment #20952

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 1 commit into from
Mar 30, 2023
Merged

Do not deprecate python.terminal.activateEnvironmentInTerminal setting along with terminal env var experiment #20952

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 2 additions & 5 deletions src/client/common/terminal/activator/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@

import { inject, injectable, multiInject } from 'inversify';
import { Terminal } from 'vscode';
import { inTerminalEnvVarExperiment } from '../../experiments/helpers';
import { IConfigurationService, IExperimentService } from '../../types';
import { IConfigurationService } from '../../types';
import { ITerminalActivationHandler, ITerminalActivator, ITerminalHelper, TerminalActivationOptions } from '../types';
import { BaseTerminalActivator } from './base';

Expand All @@ -18,7 +17,6 @@ export class TerminalActivator implements ITerminalActivator {
@inject(ITerminalHelper) readonly helper: ITerminalHelper,
@multiInject(ITerminalActivationHandler) private readonly handlers: ITerminalActivationHandler[],
@inject(IConfigurationService) private readonly configurationService: IConfigurationService,
@inject(IExperimentService) private readonly experimentService: IExperimentService,
) {
this.initialize();
}
Expand All @@ -39,8 +37,7 @@ export class TerminalActivator implements ITerminalActivator {
options?: TerminalActivationOptions,
): Promise<boolean> {
const settings = this.configurationService.getSettings(options?.resource);
const activateEnvironment =
settings.terminal.activateEnvironment && !inTerminalEnvVarExperiment(this.experimentService);
const activateEnvironment = settings.terminal.activateEnvironment;
if (!activateEnvironment || options?.hideFromUser) {
return false;
}
Expand Down
17 changes: 2 additions & 15 deletions src/test/common/terminals/activator/index.unit.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,45 +12,32 @@ import {
ITerminalActivator,
ITerminalHelper,
} from '../../../../client/common/terminal/types';
import {
IConfigurationService,
IExperimentService,
IPythonSettings,
ITerminalSettings,
} from '../../../../client/common/types';
import { IConfigurationService, IPythonSettings, ITerminalSettings } from '../../../../client/common/types';

suite('Terminal Activator', () => {
let activator: TerminalActivator;
let baseActivator: TypeMoq.IMock<ITerminalActivator>;
let handler1: TypeMoq.IMock<ITerminalActivationHandler>;
let handler2: TypeMoq.IMock<ITerminalActivationHandler>;
let terminalSettings: TypeMoq.IMock<ITerminalSettings>;
let experimentService: TypeMoq.IMock<IExperimentService>;
setup(() => {
baseActivator = TypeMoq.Mock.ofType<ITerminalActivator>();
terminalSettings = TypeMoq.Mock.ofType<ITerminalSettings>();
handler1 = TypeMoq.Mock.ofType<ITerminalActivationHandler>();
handler2 = TypeMoq.Mock.ofType<ITerminalActivationHandler>();
const configService = TypeMoq.Mock.ofType<IConfigurationService>();
experimentService = TypeMoq.Mock.ofType<IExperimentService>();
configService
.setup((c) => c.getSettings(TypeMoq.It.isAny()))
.returns(() => {
return ({
terminal: terminalSettings.object,
} as unknown) as IPythonSettings;
});
experimentService.setup((e) => e.inExperimentSync(TypeMoq.It.isAny())).returns(() => false);
activator = new (class extends TerminalActivator {
protected initialize() {
this.baseActivator = baseActivator.object;
}
})(
TypeMoq.Mock.ofType<ITerminalHelper>().object,
[handler1.object, handler2.object],
configService.object,
experimentService.object,
);
})(TypeMoq.Mock.ofType<ITerminalHelper>().object, [handler1.object, handler2.object], configService.object);
});
async function testActivationAndHandlers(
activationSuccessful: boolean,
Expand Down