Skip to content

PYTHONSTARTUP should be injected regardless of terminalEnv experiment #25037

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 3 commits into from
May 6, 2025
Merged

PYTHONSTARTUP should be injected regardless of terminalEnv experiment #25037

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
80ec95d
PYTHONSTARTUP should be injected regardless of pythonTerminalEnv Expe…
anthonykim1 May 5, 2025
a0b933d
fix test
anthonykim1 May 5, 2025
a5009cd
working
anthonykim1 May 6, 2025
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
2 changes: 2 additions & 0 deletions src/client/terminals/envCollectionActivation/service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ import {
} from '../types';
import { ProgressService } from '../../common/application/progressService';
import { useEnvExtension } from '../../envExt/api.internal';
import { registerPythonStartup } from '../pythonStartup';

@injectable()
export class TerminalEnvVarCollectionService implements IExtensionActivationService, ITerminalEnvVarCollectionService {
Expand Down Expand Up @@ -109,6 +110,7 @@ export class TerminalEnvVarCollectionService implements IExtensionActivationServ
);
this.registeredOnce = true;
}
await registerPythonStartup(this.context);
return;
}
if (!this.registeredOnce) {
Expand Down
5 changes: 5 additions & 0 deletions src/test/interpreters/activation/terminalEnvVarCollectionService.unit.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,14 @@
import * as sinon from 'sinon';
import { assert, expect } from 'chai';
import { mock, instance, when, anything, verify, reset } from 'ts-mockito';
import * as TypeMoq from 'typemoq';
import {
EnvironmentVariableCollection,
EnvironmentVariableMutatorOptions,
GlobalEnvironmentVariableCollection,
ProgressLocation,
Uri,
WorkspaceConfiguration,
WorkspaceFolder,
} from 'vscode';
import {
Expand Down Expand Up @@ -55,6 +57,7 @@ suite('Terminal Environment Variable Collection Service', () => {
let terminalEnvVarCollectionService: TerminalEnvVarCollectionService;
let terminalDeactivateService: ITerminalDeactivateService;
let useEnvExtensionStub: sinon.SinonStub;
let pythonConfig: TypeMoq.IMock<WorkspaceConfiguration>;
const progressOptions = {
location: ProgressLocation.Window,
title: Interpreters.activatingTerminals,
Expand Down Expand Up @@ -122,6 +125,8 @@ suite('Terminal Environment Variable Collection Service', () => {
instance(shellIntegrationService),
instance(envVarProvider),
);
pythonConfig = TypeMoq.Mock.ofType<WorkspaceConfiguration>();
pythonConfig.setup((p) => p.get('terminal.shellIntegration.enabled')).returns(() => false);
});

teardown(() => {
Expand Down