Skip to content

Only activate discovery component when in experiment #14985

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
karrtikr merged 1 commit into from
Dec 15, 2020
Merged

Only activate discovery component when in experiment #14985

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
12 changes: 9 additions & 3 deletions src/client/extensionActivation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,15 +69,15 @@ import { ITestCodeNavigatorCommandHandler, ITestExplorerCommandHandler } from '.
import { registerTypes as unitTestsRegisterTypes } from './testing/serviceRegistry';

// components
import * as pythonEnvironments from './pythonEnvironments';
// import * as pythonEnvironments from './pythonEnvironments';

import { ActivationResult, ExtensionState } from './components';
import { Components } from './extensionInit';

export async function activateComponents(
// `ext` is passed to any extra activation funcs.
ext: ExtensionState,
components: Components
_components: Components
): Promise<ActivationResult[]> {
// Note that each activation returns a promise that resolves
// when that activation completes. However, it might have started
Expand All @@ -89,7 +89,13 @@ export async function activateComponents(
// activation resolves `ActivationResult`, which can safely wrap
// the "inner" promise.
const promises: Promise<ActivationResult>[] = [
pythonEnvironments.activate(components.pythonEnvs),
// tslint:disable-next-line:no-suspicious-comment
// TODO: For now the extension should only interact with the component via the component adapter,
// which takes care of putting the component behind the experiment flag. It already activates the
// component among other things, hence the following is not needed.
// pythonEnvironments.activate(components.pythonEnvs),
// If we need to activate, we need to use the adapter:
// https://github.com/microsoft/vscode-python/issues/14984
// These will go away eventually.
activateLegacy(ext)
];
Expand Down
2 changes: 1 addition & 1 deletion src/client/pythonEnvironments/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ export function initialize(ext: ExtensionState): PythonEnvironments {
ext.legacyIOC.serviceManager,
api,
environmentsSecurity,
ext.disposables
ext.disposables,
);

return api;
Expand Down