From 7d80ddc663d03e38073552777be458868fb291b7 Mon Sep 17 00:00:00 2001 From: Kim-Adeline Miguel Date: Mon, 25 May 2020 09:22:30 -0700 Subject: [PATCH 1/5] experiments.ts -> experiments/manager.ts --- .../manager.ts} | 28 ++++++++++--------- src/client/common/serviceRegistry.ts | 2 +- .../activation/activationManager.unit.test.ts | 2 +- .../languageServer/manager.unit.test.ts | 2 +- src/test/api.functional.test.ts | 2 +- src/test/common/experiments.unit.test.ts | 2 +- src/test/common/installer.test.ts | 2 +- src/test/common/moduleInstaller.test.ts | 2 +- src/test/common/serviceRegistry.unit.test.ts | 2 +- .../datascience/dataScienceIocContainer.ts | 2 +- .../extension/adapter/factory.unit.test.ts | 2 +- .../outdatedDebuggerPrompt.unit.test.ts | 2 +- .../launchConfigExperiments.unit.test.ts | 2 +- ...rEnvironmentActivationService.unit.test.ts | 2 +- .../autoSelection/rules/settings.unit.test.ts | 2 +- .../rules/workspaceEnv.unit.test.ts | 2 +- src/test/testing/main.unit.test.ts | 2 +- 17 files changed, 31 insertions(+), 29 deletions(-) rename src/client/common/{experiments.ts => experiments/manager.ts} (95%) diff --git a/src/client/common/experiments.ts b/src/client/common/experiments/manager.ts similarity index 95% rename from src/client/common/experiments.ts rename to src/client/common/experiments/manager.ts index 0525ef115eff..a37441d209f5 100644 --- a/src/client/common/experiments.ts +++ b/src/client/common/experiments/manager.ts @@ -8,25 +8,27 @@ import { inject, injectable, named, optional } from 'inversify'; import { parse } from 'jsonc-parser'; import * as path from 'path'; -import { IConfigurationService, IHttpClient, IPythonSettings } from '../common/types'; -import { sendTelemetryEvent } from '../telemetry'; -import { EventName } from '../telemetry/constants'; -import { IApplicationEnvironment } from './application/types'; -import { EXTENSION_ROOT_DIR, STANDARD_OUTPUT_CHANNEL } from './constants'; -import { NativeNotebook } from './experimentGroups'; -import { traceDecorators, traceError } from './logger'; -import { IFileSystem } from './platform/types'; +import { sendTelemetryEvent } from '../../telemetry'; +import { EventName } from '../../telemetry/constants'; +import { IApplicationEnvironment } from '../application/types'; +import { EXTENSION_ROOT_DIR, STANDARD_OUTPUT_CHANNEL } from '../constants'; +import { NativeNotebook } from '../experimentGroups'; +import { traceDecorators, traceError } from '../logger'; +import { IFileSystem } from '../platform/types'; import { ABExperiments, + IConfigurationService, ICryptoUtils, IExperimentsManager, + IHttpClient, IOutputChannel, IPersistentState, - IPersistentStateFactory -} from './types'; -import { sleep } from './utils/async'; -import { swallowExceptions } from './utils/decorators'; -import { Experiments } from './utils/localize'; + IPersistentStateFactory, + IPythonSettings +} from '../types'; +import { sleep } from '../utils/async'; +import { swallowExceptions } from '../utils/decorators'; +import { Experiments } from '../utils/localize'; const EXPIRY_DURATION_MS = 30 * 60 * 1000; export const isDownloadedStorageValidKey = 'IS_EXPERIMENTS_STORAGE_VALID_KEY'; diff --git a/src/client/common/serviceRegistry.ts b/src/client/common/serviceRegistry.ts index ed2211de034a..87ac23f8229a 100644 --- a/src/client/common/serviceRegistry.ts +++ b/src/client/common/serviceRegistry.ts @@ -41,7 +41,7 @@ import { AsyncDisposableRegistry } from './asyncDisposableRegistry'; import { ConfigurationService } from './configuration/service'; import { CryptoUtils } from './crypto'; import { EditorUtils } from './editor'; -import { ExperimentsManager } from './experiments'; +import { ExperimentsManager } from './experiments/manager'; import { FeatureDeprecationManager } from './featureDeprecationManager'; import { ExtensionInsidersDailyChannelRule, diff --git a/src/test/activation/activationManager.unit.test.ts b/src/test/activation/activationManager.unit.test.ts index 43a14e4978c0..388d4780fde6 100644 --- a/src/test/activation/activationManager.unit.test.ts +++ b/src/test/activation/activationManager.unit.test.ts @@ -17,7 +17,7 @@ import { IActiveResourceService, IDocumentManager, IWorkspaceService } from '../ import { WorkspaceService } from '../../client/common/application/workspace'; import { PYTHON_LANGUAGE } from '../../client/common/constants'; import { DeprecatePythonPath } from '../../client/common/experimentGroups'; -import { ExperimentsManager } from '../../client/common/experiments'; +import { ExperimentsManager } from '../../client/common/experiments/manager'; import { InterpreterPathService } from '../../client/common/interpreterPathService'; import { FileSystem } from '../../client/common/platform/fileSystem'; import { IFileSystem } from '../../client/common/platform/types'; diff --git a/src/test/activation/languageServer/manager.unit.test.ts b/src/test/activation/languageServer/manager.unit.test.ts index 143a754a2dab..4e0b359c686c 100644 --- a/src/test/activation/languageServer/manager.unit.test.ts +++ b/src/test/activation/languageServer/manager.unit.test.ts @@ -17,7 +17,7 @@ import { ILanguageServerProxy } from '../../../client/activation/types'; import { ConfigurationService } from '../../../client/common/configuration/service'; -import { ExperimentsManager } from '../../../client/common/experiments'; +import { ExperimentsManager } from '../../../client/common/experiments/manager'; import { IConfigurationService, IExperimentsManager, IPythonExtensionBanner } from '../../../client/common/types'; import { ServiceContainer } from '../../../client/ioc/container'; import { IServiceContainer } from '../../../client/ioc/types'; diff --git a/src/test/api.functional.test.ts b/src/test/api.functional.test.ts index 2d9bf970ca24..e70a8236a202 100644 --- a/src/test/api.functional.test.ts +++ b/src/test/api.functional.test.ts @@ -12,7 +12,7 @@ import { Uri } from 'vscode'; import { buildApi } from '../client/api'; import { ConfigurationService } from '../client/common/configuration/service'; import { EXTENSION_ROOT_DIR } from '../client/common/constants'; -import { ExperimentsManager } from '../client/common/experiments'; +import { ExperimentsManager } from '../client/common/experiments/manager'; import { IConfigurationService, IExperimentsManager } from '../client/common/types'; import { ServiceContainer } from '../client/ioc/container'; import { ServiceManager } from '../client/ioc/serviceManager'; diff --git a/src/test/common/experiments.unit.test.ts b/src/test/common/experiments.unit.test.ts index fb43b343c2bb..e74f3e535913 100644 --- a/src/test/common/experiments.unit.test.ts +++ b/src/test/common/experiments.unit.test.ts @@ -22,7 +22,7 @@ import { experimentStorageKey, isDownloadedStorageValidKey, oldExperimentSalts -} from '../../client/common/experiments'; +} from '../../client/common/experiments/manager'; import { HttpClient } from '../../client/common/net/httpClient'; import { PersistentStateFactory } from '../../client/common/persistentState'; import { FileSystem } from '../../client/common/platform/fileSystem'; diff --git a/src/test/common/installer.test.ts b/src/test/common/installer.test.ts index 0f7756d933ee..2bd92b8bba5e 100644 --- a/src/test/common/installer.test.ts +++ b/src/test/common/installer.test.ts @@ -29,7 +29,7 @@ import { AsyncDisposableRegistry } from '../../client/common/asyncDisposableRegi import { ConfigurationService } from '../../client/common/configuration/service'; import { CryptoUtils } from '../../client/common/crypto'; import { EditorUtils } from '../../client/common/editor'; -import { ExperimentsManager } from '../../client/common/experiments'; +import { ExperimentsManager } from '../../client/common/experiments/manager'; import { FeatureDeprecationManager } from '../../client/common/featureDeprecationManager'; import { ExtensionInsidersDailyChannelRule, diff --git a/src/test/common/moduleInstaller.test.ts b/src/test/common/moduleInstaller.test.ts index 8e13feb05e7b..9a84713e3e89 100644 --- a/src/test/common/moduleInstaller.test.ts +++ b/src/test/common/moduleInstaller.test.ts @@ -36,7 +36,7 @@ import { AsyncDisposableRegistry } from '../../client/common/asyncDisposableRegi import { ConfigurationService } from '../../client/common/configuration/service'; import { CryptoUtils } from '../../client/common/crypto'; import { EditorUtils } from '../../client/common/editor'; -import { ExperimentsManager } from '../../client/common/experiments'; +import { ExperimentsManager } from '../../client/common/experiments/manager'; import { FeatureDeprecationManager } from '../../client/common/featureDeprecationManager'; import { ExtensionInsidersDailyChannelRule, diff --git a/src/test/common/serviceRegistry.unit.test.ts b/src/test/common/serviceRegistry.unit.test.ts index 62bab1a4a092..d40edb5e5378 100644 --- a/src/test/common/serviceRegistry.unit.test.ts +++ b/src/test/common/serviceRegistry.unit.test.ts @@ -34,7 +34,7 @@ import { AsyncDisposableRegistry } from '../../client/common/asyncDisposableRegi import { ConfigurationService } from '../../client/common/configuration/service'; import { CryptoUtils } from '../../client/common/crypto'; import { EditorUtils } from '../../client/common/editor'; -import { ExperimentsManager } from '../../client/common/experiments'; +import { ExperimentsManager } from '../../client/common/experiments/manager'; import { FeatureDeprecationManager } from '../../client/common/featureDeprecationManager'; import { ExtensionInsidersDailyChannelRule, diff --git a/src/test/datascience/dataScienceIocContainer.ts b/src/test/datascience/dataScienceIocContainer.ts index 521dc9e1fff2..88c2d3862ce1 100644 --- a/src/test/datascience/dataScienceIocContainer.ts +++ b/src/test/datascience/dataScienceIocContainer.ts @@ -97,7 +97,7 @@ import { CryptoUtils } from '../../client/common/crypto'; import { DotNetCompatibilityService } from '../../client/common/dotnet/compatibilityService'; import { IDotNetCompatibilityService } from '../../client/common/dotnet/types'; import { LocalZMQKernel } from '../../client/common/experimentGroups'; -import { ExperimentsManager } from '../../client/common/experiments'; +import { ExperimentsManager } from '../../client/common/experiments/manager'; import { InstallationChannelManager } from '../../client/common/installer/channelManager'; import { ProductInstaller } from '../../client/common/installer/productInstaller'; import { diff --git a/src/test/debugger/extension/adapter/factory.unit.test.ts b/src/test/debugger/extension/adapter/factory.unit.test.ts index f3a05d97b9fd..e9e394db4c7d 100644 --- a/src/test/debugger/extension/adapter/factory.unit.test.ts +++ b/src/test/debugger/extension/adapter/factory.unit.test.ts @@ -18,7 +18,7 @@ import { IApplicationShell } from '../../../../client/common/application/types'; import { ConfigurationService } from '../../../../client/common/configuration/service'; import { CryptoUtils } from '../../../../client/common/crypto'; import { DebugAdapterNewPtvsd } from '../../../../client/common/experimentGroups'; -import { ExperimentsManager } from '../../../../client/common/experiments'; +import { ExperimentsManager } from '../../../../client/common/experiments/manager'; import { HttpClient } from '../../../../client/common/net/httpClient'; import { PersistentStateFactory } from '../../../../client/common/persistentState'; import { FileSystem } from '../../../../client/common/platform/fileSystem'; diff --git a/src/test/debugger/extension/adapter/outdatedDebuggerPrompt.unit.test.ts b/src/test/debugger/extension/adapter/outdatedDebuggerPrompt.unit.test.ts index a924be25a2db..0fe67c70b12d 100644 --- a/src/test/debugger/extension/adapter/outdatedDebuggerPrompt.unit.test.ts +++ b/src/test/debugger/extension/adapter/outdatedDebuggerPrompt.unit.test.ts @@ -13,7 +13,7 @@ import { IApplicationShell } from '../../../../client/common/application/types'; import { ConfigurationService } from '../../../../client/common/configuration/service'; import { CryptoUtils } from '../../../../client/common/crypto'; import { DebugAdapterNewPtvsd } from '../../../../client/common/experimentGroups'; -import { ExperimentsManager } from '../../../../client/common/experiments'; +import { ExperimentsManager } from '../../../../client/common/experiments/manager'; import { BrowserService } from '../../../../client/common/net/browser'; import { HttpClient } from '../../../../client/common/net/httpClient'; import { PersistentStateFactory } from '../../../../client/common/persistentState'; diff --git a/src/test/debugger/extension/configuration/resolvers/launchConfigExperiments.unit.test.ts b/src/test/debugger/extension/configuration/resolvers/launchConfigExperiments.unit.test.ts index 339f3bd68ba1..568b80822a97 100644 --- a/src/test/debugger/extension/configuration/resolvers/launchConfigExperiments.unit.test.ts +++ b/src/test/debugger/extension/configuration/resolvers/launchConfigExperiments.unit.test.ts @@ -11,7 +11,7 @@ import { ApplicationEnvironment } from '../../../../../client/common/application import { ConfigurationService } from '../../../../../client/common/configuration/service'; import { CryptoUtils } from '../../../../../client/common/crypto'; import { DebugAdapterNewPtvsd, WebAppReload } from '../../../../../client/common/experimentGroups'; -import { ExperimentsManager } from '../../../../../client/common/experiments'; +import { ExperimentsManager } from '../../../../../client/common/experiments/manager'; import { HttpClient } from '../../../../../client/common/net/httpClient'; import { PersistentStateFactory } from '../../../../../client/common/persistentState'; import { FileSystem } from '../../../../../client/common/platform/fileSystem'; diff --git a/src/test/interpreters/activation/wrapperEnvironmentActivationService.unit.test.ts b/src/test/interpreters/activation/wrapperEnvironmentActivationService.unit.test.ts index d09858a4412b..1d9677dbd4f0 100644 --- a/src/test/interpreters/activation/wrapperEnvironmentActivationService.unit.test.ts +++ b/src/test/interpreters/activation/wrapperEnvironmentActivationService.unit.test.ts @@ -8,7 +8,7 @@ import { EventEmitter, Uri } from 'vscode'; import { IWorkspaceService } from '../../../client/common/application/types'; import { WorkspaceService } from '../../../client/common/application/workspace'; import { CryptoUtils } from '../../../client/common/crypto'; -import { ExperimentsManager } from '../../../client/common/experiments'; +import { ExperimentsManager } from '../../../client/common/experiments/manager'; import { FileSystem } from '../../../client/common/platform/fileSystem'; import { IFileSystem } from '../../../client/common/platform/types'; import { ICryptoUtils, IExperimentsManager, IExtensionContext, Resource } from '../../../client/common/types'; diff --git a/src/test/interpreters/autoSelection/rules/settings.unit.test.ts b/src/test/interpreters/autoSelection/rules/settings.unit.test.ts index 73b9d647c5d7..21d877c14330 100644 --- a/src/test/interpreters/autoSelection/rules/settings.unit.test.ts +++ b/src/test/interpreters/autoSelection/rules/settings.unit.test.ts @@ -10,7 +10,7 @@ import { anything, instance, mock, when } from 'ts-mockito'; import { IWorkspaceService } from '../../../../client/common/application/types'; import { WorkspaceService } from '../../../../client/common/application/workspace'; import { DeprecatePythonPath } from '../../../../client/common/experimentGroups'; -import { ExperimentsManager } from '../../../../client/common/experiments'; +import { ExperimentsManager } from '../../../../client/common/experiments/manager'; import { InterpreterPathService } from '../../../../client/common/interpreterPathService'; import { PersistentState, PersistentStateFactory } from '../../../../client/common/persistentState'; import { FileSystem } from '../../../../client/common/platform/fileSystem'; diff --git a/src/test/interpreters/autoSelection/rules/workspaceEnv.unit.test.ts b/src/test/interpreters/autoSelection/rules/workspaceEnv.unit.test.ts index 91add8e2b24e..87786ddda735 100644 --- a/src/test/interpreters/autoSelection/rules/workspaceEnv.unit.test.ts +++ b/src/test/interpreters/autoSelection/rules/workspaceEnv.unit.test.ts @@ -14,7 +14,7 @@ import { Uri, WorkspaceFolder } from 'vscode'; import { IWorkspaceService } from '../../../../client/common/application/types'; import { WorkspaceService } from '../../../../client/common/application/workspace'; import { DeprecatePythonPath } from '../../../../client/common/experimentGroups'; -import { ExperimentsManager } from '../../../../client/common/experiments'; +import { ExperimentsManager } from '../../../../client/common/experiments/manager'; import { InterpreterPathService } from '../../../../client/common/interpreterPathService'; import { PersistentState, PersistentStateFactory } from '../../../../client/common/persistentState'; import { FileSystem } from '../../../../client/common/platform/fileSystem'; diff --git a/src/test/testing/main.unit.test.ts b/src/test/testing/main.unit.test.ts index 7f38e6ad6b72..1cbea4fddcb2 100644 --- a/src/test/testing/main.unit.test.ts +++ b/src/test/testing/main.unit.test.ts @@ -9,7 +9,7 @@ import { Disposable } from 'vscode'; import { CommandManager } from '../../client/common/application/commandManager'; import { ICommandManager } from '../../client/common/application/types'; import { AlwaysDisplayTestExplorerGroups } from '../../client/common/experimentGroups'; -import { ExperimentsManager } from '../../client/common/experiments'; +import { ExperimentsManager } from '../../client/common/experiments/manager'; import { IDisposableRegistry, IExperimentsManager } from '../../client/common/types'; import { ServiceContainer } from '../../client/ioc/container'; import { IServiceContainer } from '../../client/ioc/types'; From 218d4e69bfb979be8ca8397dd4d6737fcc68daca Mon Sep 17 00:00:00 2001 From: Kim-Adeline Miguel Date: Mon, 25 May 2020 09:33:03 -0700 Subject: [PATCH 2/5] eexperimentGroups -> experiments/experimentGroups --- src/client/activation/aaTesting.ts | 2 +- src/client/activation/activationManager.ts | 2 +- src/client/activation/activationService.ts | 2 +- src/client/activation/extensionSurvey.ts | 2 +- src/client/activation/languageClientMiddleware.ts | 2 +- src/client/api.ts | 2 +- .../application/diagnostics/checks/macPythonInterpreter.ts | 2 +- .../application/diagnostics/checks/pythonPathDeprecated.ts | 2 +- src/client/application/diagnostics/checks/upgradeCodeRunner.ts | 2 +- src/client/common/configSettings.ts | 2 +- src/client/common/configuration/service.ts | 2 +- src/client/common/{ => experiments}/experimentGroups.ts | 0 src/client/common/experiments/manager.ts | 2 +- src/client/common/utils/cacheUtils.ts | 2 +- src/client/datascience/context/activeEditorContext.ts | 2 +- src/client/datascience/data-viewing/dataViewer.ts | 2 +- src/client/datascience/editor-integration/hoverProvider.ts | 2 +- src/client/datascience/interactive-common/interactiveBase.ts | 2 +- src/client/datascience/ipywidgets/ipywidgetHandler.ts | 2 +- src/client/datascience/jupyter/jupyterDebugger.ts | 2 +- src/client/datascience/jupyter/jupyterVariables.ts | 2 +- src/client/datascience/kernel-launcher/kernelDaemonPreWarmer.ts | 2 +- src/client/datascience/notebook/integration.ts | 2 +- src/client/datascience/plotting/plotViewer.ts | 2 +- src/client/datascience/raw-kernel/rawNotebookProvider.ts | 2 +- src/client/datascience/serviceRegistry.ts | 2 +- src/client/debugger/extension/adapter/factory.ts | 2 +- src/client/debugger/extension/adapter/outdatedDebuggerPrompt.ts | 2 +- src/client/debugger/extension/configuration/resolvers/attach.ts | 2 +- .../extension/configuration/resolvers/launchConfigExperiment.ts | 2 +- .../activation/wrapperEnvironmentActivationService.ts | 2 +- src/client/interpreter/autoSelection/rules/settings.ts | 2 +- src/client/interpreter/autoSelection/rules/workspaceEnv.ts | 2 +- .../configuration/interpreterSelector/interpreterSelector.ts | 2 +- .../configuration/pythonPathUpdaterServiceFactory.ts | 2 +- src/client/interpreter/interpreterService.ts | 2 +- src/client/startupTelemetry.ts | 2 +- src/client/testing/main.ts | 2 +- src/test/activation/aaTesting.unit.test.ts | 2 +- src/test/activation/activationManager.unit.test.ts | 2 +- src/test/activation/activationService.unit.test.ts | 2 +- src/test/activation/extensionSurvey.unit.test.ts | 2 +- .../diagnostics/checks/macPythonInterpreter.unit.test.ts | 2 +- .../diagnostics/checks/pythonPathDeprecated.unit.test.ts | 2 +- .../diagnostics/checks/upgradeCodeRunner.unit.test.ts | 2 +- .../configSettings/configSettings.pythonPath.unit.test.ts | 2 +- src/test/common/configuration/service.unit.test.ts | 2 +- src/test/common/experiments.unit.test.ts | 2 +- .../terminalActivation.testvirtualenvs.ts | 2 +- .../interpreterSelector/interpreterSelector.unit.test.ts | 2 +- src/test/datascience/dataScienceIocContainer.ts | 2 +- src/test/datascience/debugger.functional.test.tsx | 2 +- src/test/datascience/notebook.functional.test.ts | 2 +- src/test/datascience/uiTests/ipywidget.ui.functional.test.ts | 2 +- src/test/datascience/variableexplorer.functional.test.tsx | 2 +- src/test/debugger/attach.ptvsd.test.ts | 2 +- src/test/debugger/extension/adapter/factory.unit.test.ts | 2 +- .../extension/adapter/outdatedDebuggerPrompt.unit.test.ts | 2 +- .../extension/configuration/resolvers/attach.unit.test.ts | 2 +- .../resolvers/launchConfigExperiments.unit.test.ts | 2 +- src/test/interpreters/autoSelection/rules/settings.unit.test.ts | 2 +- .../interpreters/autoSelection/rules/workspaceEnv.unit.test.ts | 2 +- src/test/interpreters/interpreterService.unit.test.ts | 2 +- src/test/interpreters/pythonPathUpdaterFactory.unit.test.ts | 2 +- src/test/startupTelemetry.unit.test.ts | 2 +- src/test/testing/main.unit.test.ts | 2 +- 66 files changed, 65 insertions(+), 65 deletions(-) rename src/client/common/{ => experiments}/experimentGroups.ts (100%) diff --git a/src/client/activation/aaTesting.ts b/src/client/activation/aaTesting.ts index e37ddb31e4d0..7a0bad49065a 100644 --- a/src/client/activation/aaTesting.ts +++ b/src/client/activation/aaTesting.ts @@ -4,7 +4,7 @@ 'use strict'; import { inject, injectable } from 'inversify'; -import { ValidateABTesting } from '../common/experimentGroups'; +import { ValidateABTesting } from '../common/experiments/experimentGroups'; import { IExperimentsManager } from '../common/types'; import { IExtensionSingleActivationService } from './types'; diff --git a/src/client/activation/activationManager.ts b/src/client/activation/activationManager.ts index f570eb05aa3a..cda28ba0d9a1 100644 --- a/src/client/activation/activationManager.ts +++ b/src/client/activation/activationManager.ts @@ -8,7 +8,7 @@ import { TextDocument } from 'vscode'; import { IApplicationDiagnostics } from '../application/types'; import { IActiveResourceService, IDocumentManager, IWorkspaceService } from '../common/application/types'; import { DEFAULT_INTERPRETER_SETTING, PYTHON_LANGUAGE } from '../common/constants'; -import { DeprecatePythonPath } from '../common/experimentGroups'; +import { DeprecatePythonPath } from '../common/experiments/experimentGroups'; import { traceDecorators } from '../common/logger'; import { IFileSystem } from '../common/platform/types'; import { IDisposable, IExperimentsManager, IInterpreterPathService, Resource } from '../common/types'; diff --git a/src/client/activation/activationService.ts b/src/client/activation/activationService.ts index 3cc2d7f18b80..bd7f73481e63 100644 --- a/src/client/activation/activationService.ts +++ b/src/client/activation/activationService.ts @@ -9,7 +9,7 @@ import { LSNotSupportedDiagnosticServiceId } from '../application/diagnostics/ch import { IDiagnosticsService } from '../application/diagnostics/types'; import { IApplicationShell, ICommandManager, IWorkspaceService } from '../common/application/types'; import { STANDARD_OUTPUT_CHANNEL } from '../common/constants'; -import { LSControl, LSEnabled } from '../common/experimentGroups'; +import { LSControl, LSEnabled } from '../common/experiments/experimentGroups'; import { traceError } from '../common/logger'; import { IConfigurationService, diff --git a/src/client/activation/extensionSurvey.ts b/src/client/activation/extensionSurvey.ts index d502591390b8..9b0642b71190 100644 --- a/src/client/activation/extensionSurvey.ts +++ b/src/client/activation/extensionSurvey.ts @@ -6,7 +6,7 @@ import { inject, injectable, optional } from 'inversify'; import * as querystring from 'querystring'; import { IApplicationEnvironment, IApplicationShell } from '../common/application/types'; -import { ShowExtensionSurveyPrompt } from '../common/experimentGroups'; +import { ShowExtensionSurveyPrompt } from '../common/experiments/experimentGroups'; import '../common/extensions'; import { traceDecorators } from '../common/logger'; import { IPlatformService } from '../common/platform/types'; diff --git a/src/client/activation/languageClientMiddleware.ts b/src/client/activation/languageClientMiddleware.ts index 07418180c674..12d8aca5418f 100644 --- a/src/client/activation/languageClientMiddleware.ts +++ b/src/client/activation/languageClientMiddleware.ts @@ -60,7 +60,7 @@ import { import { ProvideDeclarationSignature } from 'vscode-languageclient/lib/declaration'; import { HiddenFilePrefix } from '../common/constants'; -import { CollectLSRequestTiming, CollectNodeLSRequestTiming } from '../common/experimentGroups'; +import { CollectLSRequestTiming, CollectNodeLSRequestTiming } from '../common/experiments/experimentGroups'; import { IConfigurationService, IExperimentsManager, IPythonExtensionBanner } from '../common/types'; import { StopWatch } from '../common/utils/stopWatch'; import { sendTelemetryEvent } from '../telemetry'; diff --git a/src/client/api.ts b/src/client/api.ts index 61328de72ae6..c9e7532e8e74 100644 --- a/src/client/api.ts +++ b/src/client/api.ts @@ -4,7 +4,7 @@ 'use strict'; import { isTestExecution } from './common/constants'; -import { DebugAdapterNewPtvsd } from './common/experimentGroups'; +import { DebugAdapterNewPtvsd } from './common/experiments/experimentGroups'; import { traceError } from './common/logger'; import { IConfigurationService, IExperimentsManager, Resource } from './common/types'; import { diff --git a/src/client/application/diagnostics/checks/macPythonInterpreter.ts b/src/client/application/diagnostics/checks/macPythonInterpreter.ts index 26344f41a607..1f14bec6be4e 100644 --- a/src/client/application/diagnostics/checks/macPythonInterpreter.ts +++ b/src/client/application/diagnostics/checks/macPythonInterpreter.ts @@ -6,7 +6,7 @@ import { inject, injectable } from 'inversify'; import { ConfigurationChangeEvent, DiagnosticSeverity, Uri } from 'vscode'; import { IWorkspaceService } from '../../../common/application/types'; -import { DeprecatePythonPath } from '../../../common/experimentGroups'; +import { DeprecatePythonPath } from '../../../common/experiments/experimentGroups'; import '../../../common/extensions'; import { IPlatformService } from '../../../common/platform/types'; import { diff --git a/src/client/application/diagnostics/checks/pythonPathDeprecated.ts b/src/client/application/diagnostics/checks/pythonPathDeprecated.ts index 80dd0d5b0cbc..0dd88786d6fe 100644 --- a/src/client/application/diagnostics/checks/pythonPathDeprecated.ts +++ b/src/client/application/diagnostics/checks/pythonPathDeprecated.ts @@ -6,7 +6,7 @@ import { inject, named } from 'inversify'; import { ConfigurationTarget, DiagnosticSeverity } from 'vscode'; import { IWorkspaceService } from '../../../common/application/types'; -import { DeprecatePythonPath } from '../../../common/experimentGroups'; +import { DeprecatePythonPath } from '../../../common/experiments/experimentGroups'; import { IDisposableRegistry, IExperimentsManager, Resource } from '../../../common/types'; import { Common, Diagnostics } from '../../../common/utils/localize'; import { IServiceContainer } from '../../../ioc/types'; diff --git a/src/client/application/diagnostics/checks/upgradeCodeRunner.ts b/src/client/application/diagnostics/checks/upgradeCodeRunner.ts index c2f43939ce6e..da7e11b4268d 100644 --- a/src/client/application/diagnostics/checks/upgradeCodeRunner.ts +++ b/src/client/application/diagnostics/checks/upgradeCodeRunner.ts @@ -7,7 +7,7 @@ import { inject, named } from 'inversify'; import { DiagnosticSeverity } from 'vscode'; import { IWorkspaceService } from '../../../common/application/types'; import { CODE_RUNNER_EXTENSION_ID } from '../../../common/constants'; -import { DeprecatePythonPath } from '../../../common/experimentGroups'; +import { DeprecatePythonPath } from '../../../common/experiments/experimentGroups'; import { IDisposableRegistry, IExperimentsManager, IExtensions, Resource } from '../../../common/types'; import { Common, Diagnostics } from '../../../common/utils/localize'; import { IServiceContainer } from '../../../ioc/types'; diff --git a/src/client/common/configSettings.ts b/src/client/common/configSettings.ts index 89aa79e5f7eb..5ae5f0165e77 100644 --- a/src/client/common/configSettings.ts +++ b/src/client/common/configSettings.ts @@ -21,7 +21,7 @@ import { sendSettingTelemetry } from '../telemetry/envFileTelemetry'; import { IWorkspaceService } from './application/types'; import { WorkspaceService } from './application/workspace'; import { DEFAULT_INTERPRETER_SETTING, isTestExecution } from './constants'; -import { DeprecatePythonPath } from './experimentGroups'; +import { DeprecatePythonPath } from './experiments/experimentGroups'; import { ExtensionChannels } from './insidersBuild/types'; import { IS_WINDOWS } from './platform/constants'; import * as internalPython from './process/internal/python'; diff --git a/src/client/common/configuration/service.ts b/src/client/common/configuration/service.ts index 00a8c789f204..658e3f2cba23 100644 --- a/src/client/common/configuration/service.ts +++ b/src/client/common/configuration/service.ts @@ -11,7 +11,7 @@ import { IServiceContainer } from '../../ioc/types'; import { IWorkspaceService } from '../application/types'; import { PythonSettings } from '../configSettings'; import { isUnitTestExecution } from '../constants'; -import { DeprecatePythonPath } from '../experimentGroups'; +import { DeprecatePythonPath } from '../experiments/experimentGroups'; import { IConfigurationService, IExperimentsManager, IInterpreterPathService, IPythonSettings } from '../types'; @injectable() diff --git a/src/client/common/experimentGroups.ts b/src/client/common/experiments/experimentGroups.ts similarity index 100% rename from src/client/common/experimentGroups.ts rename to src/client/common/experiments/experimentGroups.ts diff --git a/src/client/common/experiments/manager.ts b/src/client/common/experiments/manager.ts index a37441d209f5..40b5e1d64067 100644 --- a/src/client/common/experiments/manager.ts +++ b/src/client/common/experiments/manager.ts @@ -12,7 +12,6 @@ import { sendTelemetryEvent } from '../../telemetry'; import { EventName } from '../../telemetry/constants'; import { IApplicationEnvironment } from '../application/types'; import { EXTENSION_ROOT_DIR, STANDARD_OUTPUT_CHANNEL } from '../constants'; -import { NativeNotebook } from '../experimentGroups'; import { traceDecorators, traceError } from '../logger'; import { IFileSystem } from '../platform/types'; import { @@ -29,6 +28,7 @@ import { import { sleep } from '../utils/async'; import { swallowExceptions } from '../utils/decorators'; import { Experiments } from '../utils/localize'; +import { NativeNotebook } from './experimentGroups'; const EXPIRY_DURATION_MS = 30 * 60 * 1000; export const isDownloadedStorageValidKey = 'IS_EXPERIMENTS_STORAGE_VALID_KEY'; diff --git a/src/client/common/utils/cacheUtils.ts b/src/client/common/utils/cacheUtils.ts index 66fe0c35f626..51ccd1741fc6 100644 --- a/src/client/common/utils/cacheUtils.ts +++ b/src/client/common/utils/cacheUtils.ts @@ -9,7 +9,7 @@ import { Uri } from 'vscode'; import '../../common/extensions'; import { IServiceContainer } from '../../ioc/types'; import { DEFAULT_INTERPRETER_SETTING } from '../constants'; -import { DeprecatePythonPath } from '../experimentGroups'; +import { DeprecatePythonPath } from '../experiments/experimentGroups'; import { IExperimentsManager, IInterpreterPathService, Resource } from '../types'; type VSCodeType = typeof import('vscode'); diff --git a/src/client/datascience/context/activeEditorContext.ts b/src/client/datascience/context/activeEditorContext.ts index 0872109b3621..f7b490ce14b8 100644 --- a/src/client/datascience/context/activeEditorContext.ts +++ b/src/client/datascience/context/activeEditorContext.ts @@ -9,7 +9,7 @@ import { IExtensionSingleActivationService } from '../../activation/types'; import { ICommandManager, IDocumentManager, IVSCodeNotebook } from '../../common/application/types'; import { PYTHON_LANGUAGE } from '../../common/constants'; import { ContextKey } from '../../common/contextKey'; -import { NativeNotebook } from '../../common/experimentGroups'; +import { NativeNotebook } from '../../common/experiments/experimentGroups'; import { IDisposable, IDisposableRegistry, IExperimentsManager } from '../../common/types'; import { EditorContexts } from '../constants'; import { IInteractiveWindow, IInteractiveWindowProvider, INotebookEditor, INotebookEditorProvider } from '../types'; diff --git a/src/client/datascience/data-viewing/dataViewer.ts b/src/client/datascience/data-viewing/dataViewer.ts index 25a3538c08dc..f46e6a4ea091 100644 --- a/src/client/datascience/data-viewing/dataViewer.ts +++ b/src/client/datascience/data-viewing/dataViewer.ts @@ -9,7 +9,7 @@ import { ViewColumn } from 'vscode'; import { IApplicationShell, IWebPanelProvider, IWorkspaceService } from '../../common/application/types'; import { EXTENSION_ROOT_DIR, UseCustomEditorApi } from '../../common/constants'; -import { WebHostNotebook } from '../../common/experimentGroups'; +import { WebHostNotebook } from '../../common/experiments/experimentGroups'; import { traceError } from '../../common/logger'; import { IConfigurationService, IDisposable, IExperimentsManager, Resource } from '../../common/types'; import * as localize from '../../common/utils/localize'; diff --git a/src/client/datascience/editor-integration/hoverProvider.ts b/src/client/datascience/editor-integration/hoverProvider.ts index 51198033355b..c25be9da85f1 100644 --- a/src/client/datascience/editor-integration/hoverProvider.ts +++ b/src/client/datascience/editor-integration/hoverProvider.ts @@ -6,7 +6,7 @@ import { inject, injectable, named } from 'inversify'; import * as vscode from 'vscode'; import { Cancellation } from '../../common/cancellation'; import { PYTHON } from '../../common/constants'; -import { RunByLine } from '../../common/experimentGroups'; +import { RunByLine } from '../../common/experiments/experimentGroups'; import { traceError } from '../../common/logger'; import { IExperimentsManager } from '../../common/types'; import { sleep } from '../../common/utils/async'; diff --git a/src/client/datascience/interactive-common/interactiveBase.ts b/src/client/datascience/interactive-common/interactiveBase.ts index 3dd45fb02ecd..1d45baddb77d 100644 --- a/src/client/datascience/interactive-common/interactiveBase.ts +++ b/src/client/datascience/interactive-common/interactiveBase.ts @@ -35,7 +35,7 @@ import { } from '../../common/application/types'; import { CancellationError } from '../../common/cancellation'; import { EXTENSION_ROOT_DIR, isTestExecution, PYTHON_LANGUAGE } from '../../common/constants'; -import { RunByLine, WebHostNotebook } from '../../common/experimentGroups'; +import { RunByLine, WebHostNotebook } from '../../common/experiments/experimentGroups'; import { traceError, traceInfo, traceWarning } from '../../common/logger'; import { IFileSystem } from '../../common/platform/types'; import { IConfigurationService, IDisposableRegistry, IExperimentsManager } from '../../common/types'; diff --git a/src/client/datascience/ipywidgets/ipywidgetHandler.ts b/src/client/datascience/ipywidgets/ipywidgetHandler.ts index 3a22f0a79462..7d29232156c1 100644 --- a/src/client/datascience/ipywidgets/ipywidgetHandler.ts +++ b/src/client/datascience/ipywidgets/ipywidgetHandler.ts @@ -12,7 +12,7 @@ import { LoadIPyWidgetClassLoadAction, NotifyIPyWidgeWidgetVersionNotSupportedAction } from '../../../datascience-ui/interactive-common/redux/reducers/types'; -import { EnableIPyWidgets } from '../../common/experimentGroups'; +import { EnableIPyWidgets } from '../../common/experiments/experimentGroups'; import { traceError, traceInfo } from '../../common/logger'; import { IDisposableRegistry, IExperimentsManager, IOutputChannel } from '../../common/types'; import * as localize from '../../common/utils/localize'; diff --git a/src/client/datascience/jupyter/jupyterDebugger.ts b/src/client/datascience/jupyter/jupyterDebugger.ts index 3649e3dcecb4..34ce21652832 100644 --- a/src/client/datascience/jupyter/jupyterDebugger.ts +++ b/src/client/datascience/jupyter/jupyterDebugger.ts @@ -10,7 +10,7 @@ import * as vsls from 'vsls/vscode'; import { concatMultilineStringOutput } from '../../../datascience-ui/common'; import { ServerStatus } from '../../../datascience-ui/interactive-common/mainState'; import { IApplicationShell } from '../../common/application/types'; -import { DebugAdapterNewPtvsd } from '../../common/experimentGroups'; +import { DebugAdapterNewPtvsd } from '../../common/experiments/experimentGroups'; import { traceError, traceInfo, traceWarning } from '../../common/logger'; import { IPlatformService } from '../../common/platform/types'; import { IConfigurationService, IExperimentsManager, Version } from '../../common/types'; diff --git a/src/client/datascience/jupyter/jupyterVariables.ts b/src/client/datascience/jupyter/jupyterVariables.ts index 539e6690e88f..8fff0747a771 100644 --- a/src/client/datascience/jupyter/jupyterVariables.ts +++ b/src/client/datascience/jupyter/jupyterVariables.ts @@ -5,7 +5,7 @@ import type { JSONObject } from '@phosphor/coreutils'; import { inject, injectable, named } from 'inversify'; import { Event, EventEmitter } from 'vscode'; -import { RunByLine } from '../../common/experimentGroups'; +import { RunByLine } from '../../common/experiments/experimentGroups'; import { IDisposableRegistry, IExperimentsManager } from '../../common/types'; import { captureTelemetry } from '../../telemetry'; import { Identifiers, Telemetry } from '../constants'; diff --git a/src/client/datascience/kernel-launcher/kernelDaemonPreWarmer.ts b/src/client/datascience/kernel-launcher/kernelDaemonPreWarmer.ts index 1259e15c1a64..f4a21c8231a9 100644 --- a/src/client/datascience/kernel-launcher/kernelDaemonPreWarmer.ts +++ b/src/client/datascience/kernel-launcher/kernelDaemonPreWarmer.ts @@ -5,7 +5,7 @@ import { inject, injectable } from 'inversify'; import { IExtensionActivationService } from '../../activation/types'; -import { LocalZMQKernel } from '../../common/experimentGroups'; +import { LocalZMQKernel } from '../../common/experiments/experimentGroups'; import '../../common/extensions'; import { IDisposableRegistry, IExperimentsManager, Resource } from '../../common/types'; import { swallowExceptions } from '../../common/utils/decorators'; diff --git a/src/client/datascience/notebook/integration.ts b/src/client/datascience/notebook/integration.ts index 48af9307b55d..fa1d2750c9d4 100644 --- a/src/client/datascience/notebook/integration.ts +++ b/src/client/datascience/notebook/integration.ts @@ -5,7 +5,7 @@ import { inject, injectable } from 'inversify'; import * as path from 'path'; import { IExtensionSingleActivationService } from '../../activation/types'; import { ICommandManager, IVSCodeNotebook } from '../../common/application/types'; -import { NativeNotebook } from '../../common/experimentGroups'; +import { NativeNotebook } from '../../common/experiments/experimentGroups'; import { IFileSystem } from '../../common/platform/types'; import { IDisposableRegistry, IExperimentsManager, IExtensionContext } from '../../common/types'; import { noop } from '../../common/utils/misc'; diff --git a/src/client/datascience/plotting/plotViewer.ts b/src/client/datascience/plotting/plotViewer.ts index 6f17e0d9bf91..9b4917a21735 100644 --- a/src/client/datascience/plotting/plotViewer.ts +++ b/src/client/datascience/plotting/plotViewer.ts @@ -11,7 +11,7 @@ import { traceInfo } from '../../../client/common/logger'; import { createDeferred } from '../../../client/common/utils/async'; import { IApplicationShell, IWebPanelProvider, IWorkspaceService } from '../../common/application/types'; import { EXTENSION_ROOT_DIR, UseCustomEditorApi } from '../../common/constants'; -import { WebHostNotebook } from '../../common/experimentGroups'; +import { WebHostNotebook } from '../../common/experiments/experimentGroups'; import { traceError } from '../../common/logger'; import { IFileSystem } from '../../common/platform/types'; import { IConfigurationService, IDisposable, IExperimentsManager, Resource } from '../../common/types'; diff --git a/src/client/datascience/raw-kernel/rawNotebookProvider.ts b/src/client/datascience/raw-kernel/rawNotebookProvider.ts index a8fae10c20b0..1cc06161ba2e 100644 --- a/src/client/datascience/raw-kernel/rawNotebookProvider.ts +++ b/src/client/datascience/raw-kernel/rawNotebookProvider.ts @@ -6,7 +6,7 @@ import * as uuid from 'uuid/v4'; import { Event, EventEmitter, Uri } from 'vscode'; import { CancellationToken } from 'vscode-jsonrpc'; import { ILiveShareApi } from '../../common/application/types'; -import { LocalZMQKernel } from '../../common/experimentGroups'; +import { LocalZMQKernel } from '../../common/experiments/experimentGroups'; import '../../common/extensions'; import { traceError, traceInfo } from '../../common/logger'; import { IAsyncDisposableRegistry, IConfigurationService, IExperimentsManager, Resource } from '../../common/types'; diff --git a/src/client/datascience/serviceRegistry.ts b/src/client/datascience/serviceRegistry.ts index aa33e7914e6c..e242c26b8dfa 100644 --- a/src/client/datascience/serviceRegistry.ts +++ b/src/client/datascience/serviceRegistry.ts @@ -4,7 +4,7 @@ import { IExtensionSingleActivationService } from '../activation/types'; import { IApplicationEnvironment } from '../common/application/types'; import { UseCustomEditorApi } from '../common/constants'; -import { NativeNotebook } from '../common/experimentGroups'; +import { NativeNotebook } from '../common/experiments/experimentGroups'; import { IExperimentsManager } from '../common/types'; import { ProtocolParser } from '../debugger/debugAdapter/Common/protocolParser'; import { IProtocolParser } from '../debugger/debugAdapter/types'; diff --git a/src/client/debugger/extension/adapter/factory.ts b/src/client/debugger/extension/adapter/factory.ts index cb4a34b13e9c..968e7c013003 100644 --- a/src/client/debugger/extension/adapter/factory.ts +++ b/src/client/debugger/extension/adapter/factory.ts @@ -13,7 +13,7 @@ import { WorkspaceFolder } from 'vscode'; import { IApplicationShell } from '../../../common/application/types'; -import { DebugAdapterNewPtvsd } from '../../../common/experimentGroups'; +import { DebugAdapterNewPtvsd } from '../../../common/experiments/experimentGroups'; import { traceVerbose } from '../../../common/logger'; import { IExperimentsManager } from '../../../common/types'; import { EXTENSION_ROOT_DIR } from '../../../constants'; diff --git a/src/client/debugger/extension/adapter/outdatedDebuggerPrompt.ts b/src/client/debugger/extension/adapter/outdatedDebuggerPrompt.ts index f149e0958dbd..b5ff671369aa 100644 --- a/src/client/debugger/extension/adapter/outdatedDebuggerPrompt.ts +++ b/src/client/debugger/extension/adapter/outdatedDebuggerPrompt.ts @@ -7,7 +7,7 @@ import { inject, injectable } from 'inversify'; import { DebugAdapterTracker, DebugAdapterTrackerFactory, DebugSession, ProviderResult } from 'vscode'; import { DebugProtocol } from 'vscode-debugprotocol'; import { IApplicationShell } from '../../../common/application/types'; -import { DebugAdapterNewPtvsd } from '../../../common/experimentGroups'; +import { DebugAdapterNewPtvsd } from '../../../common/experiments/experimentGroups'; import { IBrowserService, IExperimentsManager } from '../../../common/types'; import { Common, OutdatedDebugger } from '../../../common/utils/localize'; import { IPromptShowState } from './types'; diff --git a/src/client/debugger/extension/configuration/resolvers/attach.ts b/src/client/debugger/extension/configuration/resolvers/attach.ts index bcfdd4734e79..fc18fd614d8b 100644 --- a/src/client/debugger/extension/configuration/resolvers/attach.ts +++ b/src/client/debugger/extension/configuration/resolvers/attach.ts @@ -6,7 +6,7 @@ import { inject, injectable } from 'inversify'; import { CancellationToken, Uri, WorkspaceFolder } from 'vscode'; import { IDocumentManager, IWorkspaceService } from '../../../../common/application/types'; -import { DebugAdapterNewPtvsd } from '../../../../common/experimentGroups'; +import { DebugAdapterNewPtvsd } from '../../../../common/experiments/experimentGroups'; import { IPlatformService } from '../../../../common/platform/types'; import { IConfigurationService, IExperimentsManager } from '../../../../common/types'; import { Diagnostics } from '../../../../common/utils/localize'; diff --git a/src/client/debugger/extension/configuration/resolvers/launchConfigExperiment.ts b/src/client/debugger/extension/configuration/resolvers/launchConfigExperiment.ts index d6416950adf0..6c7d32184a5e 100644 --- a/src/client/debugger/extension/configuration/resolvers/launchConfigExperiment.ts +++ b/src/client/debugger/extension/configuration/resolvers/launchConfigExperiment.ts @@ -4,7 +4,7 @@ 'use strict'; import { inject, injectable } from 'inversify'; -import { DebugAdapterNewPtvsd, WebAppReload } from '../../../../common/experimentGroups'; +import { DebugAdapterNewPtvsd, WebAppReload } from '../../../../common/experiments/experimentGroups'; import { traceInfo } from '../../../../common/logger'; import { IExperimentsManager } from '../../../../common/types'; import { sendTelemetryEvent } from '../../../../telemetry'; diff --git a/src/client/interpreter/activation/wrapperEnvironmentActivationService.ts b/src/client/interpreter/activation/wrapperEnvironmentActivationService.ts index b8fc7317caeb..7dcf0e41b93b 100644 --- a/src/client/interpreter/activation/wrapperEnvironmentActivationService.ts +++ b/src/client/interpreter/activation/wrapperEnvironmentActivationService.ts @@ -5,7 +5,7 @@ import { inject, injectable } from 'inversify'; import * as path from 'path'; -import { UseTerminalToGetActivatedEnvVars } from '../../common/experimentGroups'; +import { UseTerminalToGetActivatedEnvVars } from '../../common/experiments/experimentGroups'; import '../../common/extensions'; import { traceError } from '../../common/logger'; import { IFileSystem } from '../../common/platform/types'; diff --git a/src/client/interpreter/autoSelection/rules/settings.ts b/src/client/interpreter/autoSelection/rules/settings.ts index bbd79abe6f0c..a2139a5a480f 100644 --- a/src/client/interpreter/autoSelection/rules/settings.ts +++ b/src/client/interpreter/autoSelection/rules/settings.ts @@ -5,7 +5,7 @@ import { inject, injectable } from 'inversify'; import { IWorkspaceService } from '../../../common/application/types'; -import { DeprecatePythonPath } from '../../../common/experimentGroups'; +import { DeprecatePythonPath } from '../../../common/experiments/experimentGroups'; import { IFileSystem } from '../../../common/platform/types'; import { IExperimentsManager, IInterpreterPathService, IPersistentStateFactory, Resource } from '../../../common/types'; import { AutoSelectionRule, IInterpreterAutoSelectionService } from '../types'; diff --git a/src/client/interpreter/autoSelection/rules/workspaceEnv.ts b/src/client/interpreter/autoSelection/rules/workspaceEnv.ts index d033b087c451..95e625a3a44d 100644 --- a/src/client/interpreter/autoSelection/rules/workspaceEnv.ts +++ b/src/client/interpreter/autoSelection/rules/workspaceEnv.ts @@ -6,7 +6,7 @@ import { inject, injectable, named } from 'inversify'; import { Uri } from 'vscode'; import { IWorkspaceService } from '../../../common/application/types'; -import { DeprecatePythonPath } from '../../../common/experimentGroups'; +import { DeprecatePythonPath } from '../../../common/experiments/experimentGroups'; import { traceVerbose } from '../../../common/logger'; import { IFileSystem, IPlatformService } from '../../../common/platform/types'; import { IExperimentsManager, IInterpreterPathService, IPersistentStateFactory, Resource } from '../../../common/types'; diff --git a/src/client/interpreter/configuration/interpreterSelector/interpreterSelector.ts b/src/client/interpreter/configuration/interpreterSelector/interpreterSelector.ts index f7c95fb7e0e1..4d449b782d95 100644 --- a/src/client/interpreter/configuration/interpreterSelector/interpreterSelector.ts +++ b/src/client/interpreter/configuration/interpreterSelector/interpreterSelector.ts @@ -5,7 +5,7 @@ import { inject, injectable } from 'inversify'; import { Disposable, Uri } from 'vscode'; -import { DeprecatePythonPath } from '../../../common/experimentGroups'; +import { DeprecatePythonPath } from '../../../common/experiments/experimentGroups'; import { IExperimentsManager, IPathUtils, Resource } from '../../../common/types'; import { IInterpreterSecurityService } from '../../autoSelection/types'; import { IInterpreterService, PythonInterpreter } from '../../contracts'; diff --git a/src/client/interpreter/configuration/pythonPathUpdaterServiceFactory.ts b/src/client/interpreter/configuration/pythonPathUpdaterServiceFactory.ts index b1e70235c4b8..66a0ea85d923 100644 --- a/src/client/interpreter/configuration/pythonPathUpdaterServiceFactory.ts +++ b/src/client/interpreter/configuration/pythonPathUpdaterServiceFactory.ts @@ -1,7 +1,7 @@ import { inject, injectable } from 'inversify'; import { Uri } from 'vscode'; import { IWorkspaceService } from '../../common/application/types'; -import { DeprecatePythonPath } from '../../common/experimentGroups'; +import { DeprecatePythonPath } from '../../common/experiments/experimentGroups'; import { IExperimentsManager, IInterpreterPathService } from '../../common/types'; import { IServiceContainer } from '../../ioc/types'; import { GlobalPythonPathUpdaterService } from './services/globalUpdaterService'; diff --git a/src/client/interpreter/interpreterService.ts b/src/client/interpreter/interpreterService.ts index 6eef287fe8e4..6d9a0496f752 100644 --- a/src/client/interpreter/interpreterService.ts +++ b/src/client/interpreter/interpreterService.ts @@ -4,7 +4,7 @@ import * as path from 'path'; import { Disposable, Event, EventEmitter, Uri } from 'vscode'; import '../../client/common/extensions'; import { IDocumentManager, IWorkspaceService } from '../common/application/types'; -import { DeprecatePythonPath } from '../common/experimentGroups'; +import { DeprecatePythonPath } from '../common/experiments/experimentGroups'; import { traceError } from '../common/logger'; import { getArchitectureDisplayName } from '../common/platform/registry'; import { IFileSystem } from '../common/platform/types'; diff --git a/src/client/startupTelemetry.ts b/src/client/startupTelemetry.ts index c84e78c10837..cbc48b7553df 100644 --- a/src/client/startupTelemetry.ts +++ b/src/client/startupTelemetry.ts @@ -3,7 +3,7 @@ import { IWorkspaceService } from './common/application/types'; import { isTestExecution } from './common/constants'; -import { DeprecatePythonPath } from './common/experimentGroups'; +import { DeprecatePythonPath } from './common/experiments/experimentGroups'; import { traceError } from './common/logger'; import { ITerminalHelper } from './common/terminal/types'; import { diff --git a/src/client/testing/main.ts b/src/client/testing/main.ts index f7e84b4b1ff0..c242014ee51a 100644 --- a/src/client/testing/main.ts +++ b/src/client/testing/main.ts @@ -15,7 +15,7 @@ import { } from 'vscode'; import { IApplicationShell, ICommandManager, IDocumentManager, IWorkspaceService } from '../common/application/types'; import * as constants from '../common/constants'; -import { AlwaysDisplayTestExplorerGroups } from '../common/experimentGroups'; +import { AlwaysDisplayTestExplorerGroups } from '../common/experiments/experimentGroups'; import '../common/extensions'; import { traceError } from '../common/logger'; import { diff --git a/src/test/activation/aaTesting.unit.test.ts b/src/test/activation/aaTesting.unit.test.ts index 78e1af84a2c9..5b2d7340fb92 100644 --- a/src/test/activation/aaTesting.unit.test.ts +++ b/src/test/activation/aaTesting.unit.test.ts @@ -5,7 +5,7 @@ import * as TypeMoq from 'typemoq'; import { AATesting } from '../../client/activation/aaTesting'; -import { ValidateABTesting } from '../../client/common/experimentGroups'; +import { ValidateABTesting } from '../../client/common/experiments/experimentGroups'; import { IExperimentsManager } from '../../client/common/types'; suite('A/A Testing', () => { diff --git a/src/test/activation/activationManager.unit.test.ts b/src/test/activation/activationManager.unit.test.ts index 388d4780fde6..8fd5bd519c79 100644 --- a/src/test/activation/activationManager.unit.test.ts +++ b/src/test/activation/activationManager.unit.test.ts @@ -16,7 +16,7 @@ import { ActiveResourceService } from '../../client/common/application/activeRes import { IActiveResourceService, IDocumentManager, IWorkspaceService } from '../../client/common/application/types'; import { WorkspaceService } from '../../client/common/application/workspace'; import { PYTHON_LANGUAGE } from '../../client/common/constants'; -import { DeprecatePythonPath } from '../../client/common/experimentGroups'; +import { DeprecatePythonPath } from '../../client/common/experiments/experimentGroups'; import { ExperimentsManager } from '../../client/common/experiments/manager'; import { InterpreterPathService } from '../../client/common/interpreterPathService'; import { FileSystem } from '../../client/common/platform/fileSystem'; diff --git a/src/test/activation/activationService.unit.test.ts b/src/test/activation/activationService.unit.test.ts index 4dccd02b03f3..6dc12f75ae90 100644 --- a/src/test/activation/activationService.unit.test.ts +++ b/src/test/activation/activationService.unit.test.ts @@ -16,7 +16,7 @@ import { import { LSNotSupportedDiagnosticServiceId } from '../../client/application/diagnostics/checks/lsNotSupported'; import { IDiagnostic, IDiagnosticsService } from '../../client/application/diagnostics/types'; import { IApplicationShell, ICommandManager, IWorkspaceService } from '../../client/common/application/types'; -import { LSControl, LSEnabled } from '../../client/common/experimentGroups'; +import { LSControl, LSEnabled } from '../../client/common/experiments/experimentGroups'; import { IPlatformService } from '../../client/common/platform/types'; import { IConfigurationService, diff --git a/src/test/activation/extensionSurvey.unit.test.ts b/src/test/activation/extensionSurvey.unit.test.ts index d482d8466e54..09bba07a6fc8 100644 --- a/src/test/activation/extensionSurvey.unit.test.ts +++ b/src/test/activation/extensionSurvey.unit.test.ts @@ -9,7 +9,7 @@ import { anything, instance, mock, verify, when } from 'ts-mockito'; import * as TypeMoq from 'typemoq'; import { ExtensionSurveyPrompt, extensionSurveyStateKeys } from '../../client/activation/extensionSurvey'; import { IApplicationEnvironment, IApplicationShell } from '../../client/common/application/types'; -import { ShowExtensionSurveyPrompt } from '../../client/common/experimentGroups'; +import { ShowExtensionSurveyPrompt } from '../../client/common/experiments/experimentGroups'; import { PersistentStateFactory } from '../../client/common/persistentState'; import { IPlatformService } from '../../client/common/platform/types'; import { diff --git a/src/test/application/diagnostics/checks/macPythonInterpreter.unit.test.ts b/src/test/application/diagnostics/checks/macPythonInterpreter.unit.test.ts index eaa9315341d3..6ff415893eef 100644 --- a/src/test/application/diagnostics/checks/macPythonInterpreter.unit.test.ts +++ b/src/test/application/diagnostics/checks/macPythonInterpreter.unit.test.ts @@ -29,7 +29,7 @@ import { } from '../../../../client/application/diagnostics/types'; import { CommandsWithoutArgs } from '../../../../client/common/application/commands'; import { IWorkspaceService } from '../../../../client/common/application/types'; -import { DeprecatePythonPath } from '../../../../client/common/experimentGroups'; +import { DeprecatePythonPath } from '../../../../client/common/experiments/experimentGroups'; import { IPlatformService } from '../../../../client/common/platform/types'; import { IConfigurationService, diff --git a/src/test/application/diagnostics/checks/pythonPathDeprecated.unit.test.ts b/src/test/application/diagnostics/checks/pythonPathDeprecated.unit.test.ts index 014bf92eff1e..c530d16d0220 100644 --- a/src/test/application/diagnostics/checks/pythonPathDeprecated.unit.test.ts +++ b/src/test/application/diagnostics/checks/pythonPathDeprecated.unit.test.ts @@ -28,7 +28,7 @@ import { IDiagnosticHandlerService } from '../../../../client/application/diagnostics/types'; import { IWorkspaceService } from '../../../../client/common/application/types'; -import { DeprecatePythonPath } from '../../../../client/common/experimentGroups'; +import { DeprecatePythonPath } from '../../../../client/common/experiments/experimentGroups'; import { IDisposableRegistry, IExperimentsManager, Resource } from '../../../../client/common/types'; import { Common, Diagnostics } from '../../../../client/common/utils/localize'; import { IServiceContainer } from '../../../../client/ioc/types'; diff --git a/src/test/application/diagnostics/checks/upgradeCodeRunner.unit.test.ts b/src/test/application/diagnostics/checks/upgradeCodeRunner.unit.test.ts index 64b4f9f35ee5..7bb493668761 100644 --- a/src/test/application/diagnostics/checks/upgradeCodeRunner.unit.test.ts +++ b/src/test/application/diagnostics/checks/upgradeCodeRunner.unit.test.ts @@ -28,7 +28,7 @@ import { } from '../../../../client/application/diagnostics/types'; import { IWorkspaceService } from '../../../../client/common/application/types'; import { CODE_RUNNER_EXTENSION_ID } from '../../../../client/common/constants'; -import { DeprecatePythonPath } from '../../../../client/common/experimentGroups'; +import { DeprecatePythonPath } from '../../../../client/common/experiments/experimentGroups'; import { IDisposableRegistry, IExperimentsManager, IExtensions, Resource } from '../../../../client/common/types'; import { Common, Diagnostics } from '../../../../client/common/utils/localize'; import { IServiceContainer } from '../../../../client/ioc/types'; diff --git a/src/test/common/configSettings/configSettings.pythonPath.unit.test.ts b/src/test/common/configSettings/configSettings.pythonPath.unit.test.ts index b15ebfff705e..ab3fdd57439f 100644 --- a/src/test/common/configSettings/configSettings.pythonPath.unit.test.ts +++ b/src/test/common/configSettings/configSettings.pythonPath.unit.test.ts @@ -13,7 +13,7 @@ import * as typemoq from 'typemoq'; import { Uri, WorkspaceConfiguration } from 'vscode'; import { IWorkspaceService } from '../../../client/common/application/types'; import { PythonSettings } from '../../../client/common/configSettings'; -import { DeprecatePythonPath } from '../../../client/common/experimentGroups'; +import { DeprecatePythonPath } from '../../../client/common/experiments/experimentGroups'; import { IExperimentsManager, IInterpreterPathService } from '../../../client/common/types'; import { noop } from '../../../client/common/utils/misc'; import { IInterpreterSecurityService } from '../../../client/interpreter/autoSelection/types'; diff --git a/src/test/common/configuration/service.unit.test.ts b/src/test/common/configuration/service.unit.test.ts index 87fceaad4a7c..0beb2f7d2b06 100644 --- a/src/test/common/configuration/service.unit.test.ts +++ b/src/test/common/configuration/service.unit.test.ts @@ -9,7 +9,7 @@ import { ConfigurationTarget, Uri, WorkspaceConfiguration } from 'vscode'; import { IWorkspaceService } from '../../../client/common/application/types'; import { PythonSettings } from '../../../client/common/configSettings'; import { ConfigurationService } from '../../../client/common/configuration/service'; -import { DeprecatePythonPath } from '../../../client/common/experimentGroups'; +import { DeprecatePythonPath } from '../../../client/common/experiments/experimentGroups'; import { IExperimentsManager, IInterpreterPathService } from '../../../client/common/types'; import { IInterpreterAutoSeletionProxyService, diff --git a/src/test/common/experiments.unit.test.ts b/src/test/common/experiments.unit.test.ts index e74f3e535913..14b03b08fb70 100644 --- a/src/test/common/experiments.unit.test.ts +++ b/src/test/common/experiments.unit.test.ts @@ -14,7 +14,7 @@ import { IApplicationEnvironment } from '../../client/common/application/types'; import { PythonSettings } from '../../client/common/configSettings'; import { ConfigurationService } from '../../client/common/configuration/service'; import { CryptoUtils } from '../../client/common/crypto'; -import { NativeNotebook } from '../../client/common/experimentGroups'; +import { NativeNotebook } from '../../client/common/experiments/experimentGroups'; import { configUri, downloadedExperimentStorageKey, diff --git a/src/test/common/terminals/environmentActivationProviders/terminalActivation.testvirtualenvs.ts b/src/test/common/terminals/environmentActivationProviders/terminalActivation.testvirtualenvs.ts index 180b790eb774..8203dd709e7c 100644 --- a/src/test/common/terminals/environmentActivationProviders/terminalActivation.testvirtualenvs.ts +++ b/src/test/common/terminals/environmentActivationProviders/terminalActivation.testvirtualenvs.ts @@ -7,7 +7,7 @@ import { expect } from 'chai'; import * as fs from 'fs-extra'; import * as path from 'path'; import * as vscode from 'vscode'; -import { DeprecatePythonPath } from '../../../../client/common/experimentGroups'; +import { DeprecatePythonPath } from '../../../../client/common/experiments/experimentGroups'; import { FileSystem } from '../../../../client/common/platform/fileSystem'; import { IExperimentsManager } from '../../../../client/common/types'; import { PYTHON_VIRTUAL_ENVS_LOCATION } from '../../../ciConstants'; diff --git a/src/test/configuration/interpreterSelector/interpreterSelector.unit.test.ts b/src/test/configuration/interpreterSelector/interpreterSelector.unit.test.ts index 0410a29dac78..61396c503138 100644 --- a/src/test/configuration/interpreterSelector/interpreterSelector.unit.test.ts +++ b/src/test/configuration/interpreterSelector/interpreterSelector.unit.test.ts @@ -5,7 +5,7 @@ import * as assert from 'assert'; import { SemVer } from 'semver'; import * as TypeMoq from 'typemoq'; import { Uri } from 'vscode'; -import { DeprecatePythonPath } from '../../../client/common/experimentGroups'; +import { DeprecatePythonPath } from '../../../client/common/experiments/experimentGroups'; import { PathUtils } from '../../../client/common/platform/pathUtils'; import { IFileSystem } from '../../../client/common/platform/types'; import { IExperimentsManager } from '../../../client/common/types'; diff --git a/src/test/datascience/dataScienceIocContainer.ts b/src/test/datascience/dataScienceIocContainer.ts index 88c2d3862ce1..6a19f5ffd26f 100644 --- a/src/test/datascience/dataScienceIocContainer.ts +++ b/src/test/datascience/dataScienceIocContainer.ts @@ -96,7 +96,7 @@ import { EXTENSION_ROOT_DIR, UseCustomEditorApi, UseProposedApi } from '../../cl import { CryptoUtils } from '../../client/common/crypto'; import { DotNetCompatibilityService } from '../../client/common/dotnet/compatibilityService'; import { IDotNetCompatibilityService } from '../../client/common/dotnet/types'; -import { LocalZMQKernel } from '../../client/common/experimentGroups'; +import { LocalZMQKernel } from '../../client/common/experiments/experimentGroups'; import { ExperimentsManager } from '../../client/common/experiments/manager'; import { InstallationChannelManager } from '../../client/common/installer/channelManager'; import { ProductInstaller } from '../../client/common/installer/productInstaller'; diff --git a/src/test/datascience/debugger.functional.test.tsx b/src/test/datascience/debugger.functional.test.tsx index 5be60c8da38b..6ec94dfb04a4 100644 --- a/src/test/datascience/debugger.functional.test.tsx +++ b/src/test/datascience/debugger.functional.test.tsx @@ -9,7 +9,7 @@ import { CodeLens, Disposable, Position, Range, SourceBreakpoint, Uri } from 'vs import { CancellationToken } from 'vscode-jsonrpc'; import { IApplicationShell, IDocumentManager } from '../../client/common/application/types'; -import { RunByLine } from '../../client/common/experimentGroups'; +import { RunByLine } from '../../client/common/experiments/experimentGroups'; import { createDeferred, waitForPromise } from '../../client/common/utils/async'; import { noop } from '../../client/common/utils/misc'; import { EXTENSION_ROOT_DIR } from '../../client/constants'; diff --git a/src/test/datascience/notebook.functional.test.ts b/src/test/datascience/notebook.functional.test.ts index 1459ed863feb..2d5a3cc0d7fe 100644 --- a/src/test/datascience/notebook.functional.test.ts +++ b/src/test/datascience/notebook.functional.test.ts @@ -19,7 +19,7 @@ import { ApplicationShell } from '../../client/common/application/applicationShe import { IApplicationShell } from '../../client/common/application/types'; import { Cancellation, CancellationError } from '../../client/common/cancellation'; import { EXTENSION_ROOT_DIR } from '../../client/common/constants'; -import { LocalZMQKernel } from '../../client/common/experimentGroups'; +import { LocalZMQKernel } from '../../client/common/experiments/experimentGroups'; import { traceError, traceInfo } from '../../client/common/logger'; import { IFileSystem } from '../../client/common/platform/types'; import { IPythonExecutionFactory, IPythonExecutionService, Output } from '../../client/common/process/types'; diff --git a/src/test/datascience/uiTests/ipywidget.ui.functional.test.ts b/src/test/datascience/uiTests/ipywidget.ui.functional.test.ts index 0c7bee367f83..969e89668236 100644 --- a/src/test/datascience/uiTests/ipywidget.ui.functional.test.ts +++ b/src/test/datascience/uiTests/ipywidget.ui.functional.test.ts @@ -13,7 +13,7 @@ import * as os from 'os'; import * as path from 'path'; import * as sinon from 'sinon'; import { Disposable } from 'vscode'; -import { LocalZMQKernel } from '../../../client/common/experimentGroups'; +import { LocalZMQKernel } from '../../../client/common/experiments/experimentGroups'; import { EXTENSION_ROOT_DIR } from '../../../client/constants'; import { retryIfFail as retryIfFailOriginal } from '../../common'; import { mockedVSCodeNamespaces } from '../../vscode-mock'; diff --git a/src/test/datascience/variableexplorer.functional.test.tsx b/src/test/datascience/variableexplorer.functional.test.tsx index ebb38f1123d3..bb5fdc0e9856 100644 --- a/src/test/datascience/variableexplorer.functional.test.tsx +++ b/src/test/datascience/variableexplorer.functional.test.tsx @@ -6,7 +6,7 @@ import * as React from 'react'; import * as AdazzleReactDataGrid from 'react-data-grid'; import { Disposable } from 'vscode'; -import { RunByLine } from '../../client/common/experimentGroups'; +import { RunByLine } from '../../client/common/experiments/experimentGroups'; import { InteractiveWindowMessages } from '../../client/datascience/interactive-common/interactiveWindowTypes'; import { IJupyterVariable } from '../../client/datascience/types'; import { DataScienceIocContainer } from './dataScienceIocContainer'; diff --git a/src/test/debugger/attach.ptvsd.test.ts b/src/test/debugger/attach.ptvsd.test.ts index 0be2a3801c87..7c79de45c230 100644 --- a/src/test/debugger/attach.ptvsd.test.ts +++ b/src/test/debugger/attach.ptvsd.test.ts @@ -13,7 +13,7 @@ import { DebugClient } from 'vscode-debugadapter-testsupport'; import { IDocumentManager, IWorkspaceService } from '../../client/common/application/types'; import { EXTENSION_ROOT_DIR } from '../../client/common/constants'; -import { DebugAdapterNewPtvsd } from '../../client/common/experimentGroups'; +import { DebugAdapterNewPtvsd } from '../../client/common/experiments/experimentGroups'; import { IS_WINDOWS } from '../../client/common/platform/constants'; import { IPlatformService } from '../../client/common/platform/types'; import { IConfigurationService, IExperimentsManager } from '../../client/common/types'; diff --git a/src/test/debugger/extension/adapter/factory.unit.test.ts b/src/test/debugger/extension/adapter/factory.unit.test.ts index e9e394db4c7d..7254bc211252 100644 --- a/src/test/debugger/extension/adapter/factory.unit.test.ts +++ b/src/test/debugger/extension/adapter/factory.unit.test.ts @@ -17,7 +17,7 @@ import { ApplicationShell } from '../../../../client/common/application/applicat import { IApplicationShell } from '../../../../client/common/application/types'; import { ConfigurationService } from '../../../../client/common/configuration/service'; import { CryptoUtils } from '../../../../client/common/crypto'; -import { DebugAdapterNewPtvsd } from '../../../../client/common/experimentGroups'; +import { DebugAdapterNewPtvsd } from '../../../../client/common/experiments/experimentGroups'; import { ExperimentsManager } from '../../../../client/common/experiments/manager'; import { HttpClient } from '../../../../client/common/net/httpClient'; import { PersistentStateFactory } from '../../../../client/common/persistentState'; diff --git a/src/test/debugger/extension/adapter/outdatedDebuggerPrompt.unit.test.ts b/src/test/debugger/extension/adapter/outdatedDebuggerPrompt.unit.test.ts index 0fe67c70b12d..33e3b7f49a01 100644 --- a/src/test/debugger/extension/adapter/outdatedDebuggerPrompt.unit.test.ts +++ b/src/test/debugger/extension/adapter/outdatedDebuggerPrompt.unit.test.ts @@ -12,7 +12,7 @@ import { ApplicationShell } from '../../../../client/common/application/applicat import { IApplicationShell } from '../../../../client/common/application/types'; import { ConfigurationService } from '../../../../client/common/configuration/service'; import { CryptoUtils } from '../../../../client/common/crypto'; -import { DebugAdapterNewPtvsd } from '../../../../client/common/experimentGroups'; +import { DebugAdapterNewPtvsd } from '../../../../client/common/experiments/experimentGroups'; import { ExperimentsManager } from '../../../../client/common/experiments/manager'; import { BrowserService } from '../../../../client/common/net/browser'; import { HttpClient } from '../../../../client/common/net/httpClient'; diff --git a/src/test/debugger/extension/configuration/resolvers/attach.unit.test.ts b/src/test/debugger/extension/configuration/resolvers/attach.unit.test.ts index a36aaf374a25..de7c21c5cef1 100644 --- a/src/test/debugger/extension/configuration/resolvers/attach.unit.test.ts +++ b/src/test/debugger/extension/configuration/resolvers/attach.unit.test.ts @@ -10,7 +10,7 @@ import * as TypeMoq from 'typemoq'; import { DebugConfiguration, DebugConfigurationProvider, TextDocument, TextEditor, Uri, WorkspaceFolder } from 'vscode'; import { IDocumentManager, IWorkspaceService } from '../../../../../client/common/application/types'; import { PYTHON_LANGUAGE } from '../../../../../client/common/constants'; -import { DebugAdapterNewPtvsd } from '../../../../../client/common/experimentGroups'; +import { DebugAdapterNewPtvsd } from '../../../../../client/common/experiments/experimentGroups'; import { IFileSystem, IPlatformService } from '../../../../../client/common/platform/types'; import { IConfigurationService, IExperimentsManager } from '../../../../../client/common/types'; import { Diagnostics } from '../../../../../client/common/utils/localize'; diff --git a/src/test/debugger/extension/configuration/resolvers/launchConfigExperiments.unit.test.ts b/src/test/debugger/extension/configuration/resolvers/launchConfigExperiments.unit.test.ts index 568b80822a97..f50f807c732a 100644 --- a/src/test/debugger/extension/configuration/resolvers/launchConfigExperiments.unit.test.ts +++ b/src/test/debugger/extension/configuration/resolvers/launchConfigExperiments.unit.test.ts @@ -10,7 +10,7 @@ import { instance, mock, spy, when } from 'ts-mockito'; import { ApplicationEnvironment } from '../../../../../client/common/application/applicationEnvironment'; import { ConfigurationService } from '../../../../../client/common/configuration/service'; import { CryptoUtils } from '../../../../../client/common/crypto'; -import { DebugAdapterNewPtvsd, WebAppReload } from '../../../../../client/common/experimentGroups'; +import { DebugAdapterNewPtvsd, WebAppReload } from '../../../../../client/common/experiments/experimentGroups'; import { ExperimentsManager } from '../../../../../client/common/experiments/manager'; import { HttpClient } from '../../../../../client/common/net/httpClient'; import { PersistentStateFactory } from '../../../../../client/common/persistentState'; diff --git a/src/test/interpreters/autoSelection/rules/settings.unit.test.ts b/src/test/interpreters/autoSelection/rules/settings.unit.test.ts index 21d877c14330..6b9bb5af5190 100644 --- a/src/test/interpreters/autoSelection/rules/settings.unit.test.ts +++ b/src/test/interpreters/autoSelection/rules/settings.unit.test.ts @@ -9,7 +9,7 @@ import { expect } from 'chai'; import { anything, instance, mock, when } from 'ts-mockito'; import { IWorkspaceService } from '../../../../client/common/application/types'; import { WorkspaceService } from '../../../../client/common/application/workspace'; -import { DeprecatePythonPath } from '../../../../client/common/experimentGroups'; +import { DeprecatePythonPath } from '../../../../client/common/experiments/experimentGroups'; import { ExperimentsManager } from '../../../../client/common/experiments/manager'; import { InterpreterPathService } from '../../../../client/common/interpreterPathService'; import { PersistentState, PersistentStateFactory } from '../../../../client/common/persistentState'; diff --git a/src/test/interpreters/autoSelection/rules/workspaceEnv.unit.test.ts b/src/test/interpreters/autoSelection/rules/workspaceEnv.unit.test.ts index 87786ddda735..97d809fbc47e 100644 --- a/src/test/interpreters/autoSelection/rules/workspaceEnv.unit.test.ts +++ b/src/test/interpreters/autoSelection/rules/workspaceEnv.unit.test.ts @@ -13,7 +13,7 @@ import * as typemoq from 'typemoq'; import { Uri, WorkspaceFolder } from 'vscode'; import { IWorkspaceService } from '../../../../client/common/application/types'; import { WorkspaceService } from '../../../../client/common/application/workspace'; -import { DeprecatePythonPath } from '../../../../client/common/experimentGroups'; +import { DeprecatePythonPath } from '../../../../client/common/experiments/experimentGroups'; import { ExperimentsManager } from '../../../../client/common/experiments/manager'; import { InterpreterPathService } from '../../../../client/common/interpreterPathService'; import { PersistentState, PersistentStateFactory } from '../../../../client/common/persistentState'; diff --git a/src/test/interpreters/interpreterService.unit.test.ts b/src/test/interpreters/interpreterService.unit.test.ts index 48b224666585..8cad13c1ef54 100644 --- a/src/test/interpreters/interpreterService.unit.test.ts +++ b/src/test/interpreters/interpreterService.unit.test.ts @@ -14,7 +14,7 @@ import { SemVer } from 'semver'; import * as TypeMoq from 'typemoq'; import { ConfigurationTarget, Disposable, TextDocument, TextEditor, Uri, WorkspaceConfiguration } from 'vscode'; import { IDocumentManager, IWorkspaceService } from '../../client/common/application/types'; -import { DeprecatePythonPath } from '../../client/common/experimentGroups'; +import { DeprecatePythonPath } from '../../client/common/experiments/experimentGroups'; import { getArchitectureDisplayName } from '../../client/common/platform/registry'; import { IFileSystem } from '../../client/common/platform/types'; import { IPythonExecutionFactory, IPythonExecutionService } from '../../client/common/process/types'; diff --git a/src/test/interpreters/pythonPathUpdaterFactory.unit.test.ts b/src/test/interpreters/pythonPathUpdaterFactory.unit.test.ts index e59e379cbc34..91e511b4d09b 100644 --- a/src/test/interpreters/pythonPathUpdaterFactory.unit.test.ts +++ b/src/test/interpreters/pythonPathUpdaterFactory.unit.test.ts @@ -2,7 +2,7 @@ import * as path from 'path'; import * as TypeMoq from 'typemoq'; import { ConfigurationTarget, Uri, WorkspaceConfiguration } from 'vscode'; import { IWorkspaceService } from '../../client/common/application/types'; -import { DeprecatePythonPath } from '../../client/common/experimentGroups'; +import { DeprecatePythonPath } from '../../client/common/experiments/experimentGroups'; import { IExperimentsManager, IInterpreterPathService } from '../../client/common/types'; import { PythonPathUpdaterServiceFactory } from '../../client/interpreter/configuration/pythonPathUpdaterServiceFactory'; import { IPythonPathUpdaterServiceFactory } from '../../client/interpreter/configuration/types'; diff --git a/src/test/startupTelemetry.unit.test.ts b/src/test/startupTelemetry.unit.test.ts index 828a85a000ff..2dfdbec2ecc2 100644 --- a/src/test/startupTelemetry.unit.test.ts +++ b/src/test/startupTelemetry.unit.test.ts @@ -7,7 +7,7 @@ import { expect } from 'chai'; import * as TypeMoq from 'typemoq'; import { Uri, WorkspaceConfiguration } from 'vscode'; import { IWorkspaceService } from '../client/common/application/types'; -import { DeprecatePythonPath } from '../client/common/experimentGroups'; +import { DeprecatePythonPath } from '../client/common/experiments/experimentGroups'; import { IExperimentsManager, IInterpreterPathService } from '../client/common/types'; import { IServiceContainer } from '../client/ioc/types'; import { hasUserDefinedPythonPath } from '../client/startupTelemetry'; diff --git a/src/test/testing/main.unit.test.ts b/src/test/testing/main.unit.test.ts index 1cbea4fddcb2..b9b5ceb6deae 100644 --- a/src/test/testing/main.unit.test.ts +++ b/src/test/testing/main.unit.test.ts @@ -8,7 +8,7 @@ import { anything, instance, mock, verify, when } from 'ts-mockito'; import { Disposable } from 'vscode'; import { CommandManager } from '../../client/common/application/commandManager'; import { ICommandManager } from '../../client/common/application/types'; -import { AlwaysDisplayTestExplorerGroups } from '../../client/common/experimentGroups'; +import { AlwaysDisplayTestExplorerGroups } from '../../client/common/experiments/experimentGroups'; import { ExperimentsManager } from '../../client/common/experiments/manager'; import { IDisposableRegistry, IExperimentsManager } from '../../client/common/types'; import { ServiceContainer } from '../../client/ioc/container'; From 0657c139f522efc1a791ec0793d33dcaf9a857ed Mon Sep 17 00:00:00 2001 From: Kim-Adeline Miguel Date: Mon, 25 May 2020 10:36:53 -0700 Subject: [PATCH 3/5] test/experiments.u.t -> test/experiments/manager.u.t --- .../manager.unit.test.ts} | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) rename src/test/common/{experiments.unit.test.ts => experiments/manager.unit.test.ts} (97%) diff --git a/src/test/common/experiments.unit.test.ts b/src/test/common/experiments/manager.unit.test.ts similarity index 97% rename from src/test/common/experiments.unit.test.ts rename to src/test/common/experiments/manager.unit.test.ts index 14b03b08fb70..0243a12b991b 100644 --- a/src/test/common/experiments.unit.test.ts +++ b/src/test/common/experiments/manager.unit.test.ts @@ -9,12 +9,12 @@ import { assert, expect } from 'chai'; import * as sinon from 'sinon'; import { anything, instance, mock, verify, when } from 'ts-mockito'; import * as TypeMoq from 'typemoq'; -import { ApplicationEnvironment } from '../../client/common/application/applicationEnvironment'; -import { IApplicationEnvironment } from '../../client/common/application/types'; -import { PythonSettings } from '../../client/common/configSettings'; -import { ConfigurationService } from '../../client/common/configuration/service'; -import { CryptoUtils } from '../../client/common/crypto'; -import { NativeNotebook } from '../../client/common/experiments/experimentGroups'; +import { ApplicationEnvironment } from '../../../client/common/application/applicationEnvironment'; +import { IApplicationEnvironment } from '../../../client/common/application/types'; +import { PythonSettings } from '../../../client/common/configSettings'; +import { ConfigurationService } from '../../../client/common/configuration/service'; +import { CryptoUtils } from '../../../client/common/crypto'; +import { NativeNotebook } from '../../../client/common/experiments/experimentGroups'; import { configUri, downloadedExperimentStorageKey, @@ -22,11 +22,11 @@ import { experimentStorageKey, isDownloadedStorageValidKey, oldExperimentSalts -} from '../../client/common/experiments/manager'; -import { HttpClient } from '../../client/common/net/httpClient'; -import { PersistentStateFactory } from '../../client/common/persistentState'; -import { FileSystem } from '../../client/common/platform/fileSystem'; -import { IFileSystem } from '../../client/common/platform/types'; +} from '../../../client/common/experiments/manager'; +import { HttpClient } from '../../../client/common/net/httpClient'; +import { PersistentStateFactory } from '../../../client/common/persistentState'; +import { FileSystem } from '../../../client/common/platform/fileSystem'; +import { IFileSystem } from '../../../client/common/platform/types'; import { ICryptoUtils, IExperiments, @@ -34,10 +34,10 @@ import { IOutputChannel, IPersistentState, IPersistentStateFactory -} from '../../client/common/types'; -import { createDeferred, createDeferredFromPromise } from '../../client/common/utils/async'; -import { sleep } from '../common'; -import { noop } from '../core'; +} from '../../../client/common/types'; +import { createDeferred, createDeferredFromPromise } from '../../../client/common/utils/async'; +import { sleep } from '../../common'; +import { noop } from '../../core'; // tslint:disable: max-func-body-length From 930fa5a7cc90b71730c94ff6f013466a56aea68b Mon Sep 17 00:00:00 2001 From: Kim-Adeline Miguel Date: Tue, 26 May 2020 08:36:42 -0700 Subject: [PATCH 4/5] experimentGroups -> groups --- src/client/activation/aaTesting.ts | 2 +- src/client/activation/activationManager.ts | 2 +- src/client/activation/activationService.ts | 2 +- src/client/activation/extensionSurvey.ts | 2 +- .../activation/languageClientMiddleware.ts | 2 +- src/client/api.ts | 2 +- .../checks/macPythonInterpreter.ts | 2 +- .../checks/pythonPathDeprecated.ts | 2 +- .../diagnostics/checks/upgradeCodeRunner.ts | 2 +- src/client/common/configSettings.ts | 2 +- src/client/common/configuration/service.ts | 2 +- .../{experimentGroups.ts => groups.ts} | 0 src/client/common/experiments/manager.ts | 2 +- src/client/common/experiments/telemetry.ts | 23 +++++++++++++++++++ src/client/common/utils/cacheUtils.ts | 2 +- .../context/activeEditorContext.ts | 2 +- .../datascience/data-viewing/dataViewer.ts | 2 +- .../editor-integration/hoverProvider.ts | 2 +- .../interactive-common/interactiveBase.ts | 2 +- .../ipywidgets/ipywidgetHandler.ts | 2 +- .../datascience/jupyter/jupyterDebugger.ts | 2 +- .../datascience/jupyter/jupyterVariables.ts | 2 +- .../kernel-launcher/kernelDaemonPreWarmer.ts | 2 +- .../datascience/notebook/integration.ts | 2 +- src/client/datascience/plotting/plotViewer.ts | 2 +- .../raw-kernel/rawNotebookProvider.ts | 2 +- src/client/datascience/serviceRegistry.ts | 2 +- .../debugger/extension/adapter/factory.ts | 2 +- .../adapter/outdatedDebuggerPrompt.ts | 2 +- .../configuration/resolvers/attach.ts | 2 +- .../resolvers/launchConfigExperiment.ts | 2 +- .../wrapperEnvironmentActivationService.ts | 2 +- .../autoSelection/rules/settings.ts | 2 +- .../autoSelection/rules/workspaceEnv.ts | 2 +- .../interpreterSelector.ts | 2 +- .../pythonPathUpdaterServiceFactory.ts | 2 +- src/client/interpreter/interpreterService.ts | 2 +- src/client/startupTelemetry.ts | 2 +- src/client/testing/main.ts | 2 +- src/test/activation/aaTesting.unit.test.ts | 2 +- .../activation/activationManager.unit.test.ts | 2 +- .../activation/activationService.unit.test.ts | 2 +- .../activation/extensionSurvey.unit.test.ts | 2 +- .../checks/macPythonInterpreter.unit.test.ts | 2 +- .../checks/pythonPathDeprecated.unit.test.ts | 2 +- .../checks/upgradeCodeRunner.unit.test.ts | 2 +- .../configSettings.pythonPath.unit.test.ts | 2 +- .../common/configuration/service.unit.test.ts | 2 +- .../common/experiments/manager.unit.test.ts | 2 +- .../terminalActivation.testvirtualenvs.ts | 2 +- .../interpreterSelector.unit.test.ts | 2 +- .../datascience/dataScienceIocContainer.ts | 2 +- .../datascience/debugger.functional.test.tsx | 2 +- .../datascience/notebook.functional.test.ts | 2 +- .../uiTests/ipywidget.ui.functional.test.ts | 2 +- .../variableexplorer.functional.test.tsx | 2 +- src/test/debugger/attach.ptvsd.test.ts | 2 +- .../extension/adapter/factory.unit.test.ts | 2 +- .../outdatedDebuggerPrompt.unit.test.ts | 2 +- .../resolvers/attach.unit.test.ts | 2 +- .../launchConfigExperiments.unit.test.ts | 2 +- .../autoSelection/rules/settings.unit.test.ts | 2 +- .../rules/workspaceEnv.unit.test.ts | 2 +- .../interpreterService.unit.test.ts | 2 +- .../pythonPathUpdaterFactory.unit.test.ts | 2 +- src/test/startupTelemetry.unit.test.ts | 2 +- src/test/testing/main.unit.test.ts | 2 +- 67 files changed, 88 insertions(+), 65 deletions(-) rename src/client/common/experiments/{experimentGroups.ts => groups.ts} (100%) create mode 100644 src/client/common/experiments/telemetry.ts diff --git a/src/client/activation/aaTesting.ts b/src/client/activation/aaTesting.ts index 7a0bad49065a..1a424e5f2606 100644 --- a/src/client/activation/aaTesting.ts +++ b/src/client/activation/aaTesting.ts @@ -4,7 +4,7 @@ 'use strict'; import { inject, injectable } from 'inversify'; -import { ValidateABTesting } from '../common/experiments/experimentGroups'; +import { ValidateABTesting } from '../common/experiments/groups'; import { IExperimentsManager } from '../common/types'; import { IExtensionSingleActivationService } from './types'; diff --git a/src/client/activation/activationManager.ts b/src/client/activation/activationManager.ts index cda28ba0d9a1..bf53a1d18103 100644 --- a/src/client/activation/activationManager.ts +++ b/src/client/activation/activationManager.ts @@ -8,7 +8,7 @@ import { TextDocument } from 'vscode'; import { IApplicationDiagnostics } from '../application/types'; import { IActiveResourceService, IDocumentManager, IWorkspaceService } from '../common/application/types'; import { DEFAULT_INTERPRETER_SETTING, PYTHON_LANGUAGE } from '../common/constants'; -import { DeprecatePythonPath } from '../common/experiments/experimentGroups'; +import { DeprecatePythonPath } from '../common/experiments/groups'; import { traceDecorators } from '../common/logger'; import { IFileSystem } from '../common/platform/types'; import { IDisposable, IExperimentsManager, IInterpreterPathService, Resource } from '../common/types'; diff --git a/src/client/activation/activationService.ts b/src/client/activation/activationService.ts index bd7f73481e63..77c7e9e0d412 100644 --- a/src/client/activation/activationService.ts +++ b/src/client/activation/activationService.ts @@ -9,7 +9,7 @@ import { LSNotSupportedDiagnosticServiceId } from '../application/diagnostics/ch import { IDiagnosticsService } from '../application/diagnostics/types'; import { IApplicationShell, ICommandManager, IWorkspaceService } from '../common/application/types'; import { STANDARD_OUTPUT_CHANNEL } from '../common/constants'; -import { LSControl, LSEnabled } from '../common/experiments/experimentGroups'; +import { LSControl, LSEnabled } from '../common/experiments/groups'; import { traceError } from '../common/logger'; import { IConfigurationService, diff --git a/src/client/activation/extensionSurvey.ts b/src/client/activation/extensionSurvey.ts index 9b0642b71190..d9ca8551b91d 100644 --- a/src/client/activation/extensionSurvey.ts +++ b/src/client/activation/extensionSurvey.ts @@ -6,7 +6,7 @@ import { inject, injectable, optional } from 'inversify'; import * as querystring from 'querystring'; import { IApplicationEnvironment, IApplicationShell } from '../common/application/types'; -import { ShowExtensionSurveyPrompt } from '../common/experiments/experimentGroups'; +import { ShowExtensionSurveyPrompt } from '../common/experiments/groups'; import '../common/extensions'; import { traceDecorators } from '../common/logger'; import { IPlatformService } from '../common/platform/types'; diff --git a/src/client/activation/languageClientMiddleware.ts b/src/client/activation/languageClientMiddleware.ts index 12d8aca5418f..512bb5e4eac3 100644 --- a/src/client/activation/languageClientMiddleware.ts +++ b/src/client/activation/languageClientMiddleware.ts @@ -60,7 +60,7 @@ import { import { ProvideDeclarationSignature } from 'vscode-languageclient/lib/declaration'; import { HiddenFilePrefix } from '../common/constants'; -import { CollectLSRequestTiming, CollectNodeLSRequestTiming } from '../common/experiments/experimentGroups'; +import { CollectLSRequestTiming, CollectNodeLSRequestTiming } from '../common/experiments/groups'; import { IConfigurationService, IExperimentsManager, IPythonExtensionBanner } from '../common/types'; import { StopWatch } from '../common/utils/stopWatch'; import { sendTelemetryEvent } from '../telemetry'; diff --git a/src/client/api.ts b/src/client/api.ts index c9e7532e8e74..0b37a5da101c 100644 --- a/src/client/api.ts +++ b/src/client/api.ts @@ -4,7 +4,7 @@ 'use strict'; import { isTestExecution } from './common/constants'; -import { DebugAdapterNewPtvsd } from './common/experiments/experimentGroups'; +import { DebugAdapterNewPtvsd } from './common/experiments/groups'; import { traceError } from './common/logger'; import { IConfigurationService, IExperimentsManager, Resource } from './common/types'; import { diff --git a/src/client/application/diagnostics/checks/macPythonInterpreter.ts b/src/client/application/diagnostics/checks/macPythonInterpreter.ts index 1f14bec6be4e..b3c8434c7b30 100644 --- a/src/client/application/diagnostics/checks/macPythonInterpreter.ts +++ b/src/client/application/diagnostics/checks/macPythonInterpreter.ts @@ -6,7 +6,7 @@ import { inject, injectable } from 'inversify'; import { ConfigurationChangeEvent, DiagnosticSeverity, Uri } from 'vscode'; import { IWorkspaceService } from '../../../common/application/types'; -import { DeprecatePythonPath } from '../../../common/experiments/experimentGroups'; +import { DeprecatePythonPath } from '../../../common/experiments/groups'; import '../../../common/extensions'; import { IPlatformService } from '../../../common/platform/types'; import { diff --git a/src/client/application/diagnostics/checks/pythonPathDeprecated.ts b/src/client/application/diagnostics/checks/pythonPathDeprecated.ts index 0dd88786d6fe..0a2754cca958 100644 --- a/src/client/application/diagnostics/checks/pythonPathDeprecated.ts +++ b/src/client/application/diagnostics/checks/pythonPathDeprecated.ts @@ -6,7 +6,7 @@ import { inject, named } from 'inversify'; import { ConfigurationTarget, DiagnosticSeverity } from 'vscode'; import { IWorkspaceService } from '../../../common/application/types'; -import { DeprecatePythonPath } from '../../../common/experiments/experimentGroups'; +import { DeprecatePythonPath } from '../../../common/experiments/groups'; import { IDisposableRegistry, IExperimentsManager, Resource } from '../../../common/types'; import { Common, Diagnostics } from '../../../common/utils/localize'; import { IServiceContainer } from '../../../ioc/types'; diff --git a/src/client/application/diagnostics/checks/upgradeCodeRunner.ts b/src/client/application/diagnostics/checks/upgradeCodeRunner.ts index da7e11b4268d..6418e3636e7b 100644 --- a/src/client/application/diagnostics/checks/upgradeCodeRunner.ts +++ b/src/client/application/diagnostics/checks/upgradeCodeRunner.ts @@ -7,7 +7,7 @@ import { inject, named } from 'inversify'; import { DiagnosticSeverity } from 'vscode'; import { IWorkspaceService } from '../../../common/application/types'; import { CODE_RUNNER_EXTENSION_ID } from '../../../common/constants'; -import { DeprecatePythonPath } from '../../../common/experiments/experimentGroups'; +import { DeprecatePythonPath } from '../../../common/experiments/groups'; import { IDisposableRegistry, IExperimentsManager, IExtensions, Resource } from '../../../common/types'; import { Common, Diagnostics } from '../../../common/utils/localize'; import { IServiceContainer } from '../../../ioc/types'; diff --git a/src/client/common/configSettings.ts b/src/client/common/configSettings.ts index 5ae5f0165e77..d5464ddcc762 100644 --- a/src/client/common/configSettings.ts +++ b/src/client/common/configSettings.ts @@ -21,7 +21,7 @@ import { sendSettingTelemetry } from '../telemetry/envFileTelemetry'; import { IWorkspaceService } from './application/types'; import { WorkspaceService } from './application/workspace'; import { DEFAULT_INTERPRETER_SETTING, isTestExecution } from './constants'; -import { DeprecatePythonPath } from './experiments/experimentGroups'; +import { DeprecatePythonPath } from './experiments/groups'; import { ExtensionChannels } from './insidersBuild/types'; import { IS_WINDOWS } from './platform/constants'; import * as internalPython from './process/internal/python'; diff --git a/src/client/common/configuration/service.ts b/src/client/common/configuration/service.ts index 658e3f2cba23..b922254d8b05 100644 --- a/src/client/common/configuration/service.ts +++ b/src/client/common/configuration/service.ts @@ -11,7 +11,7 @@ import { IServiceContainer } from '../../ioc/types'; import { IWorkspaceService } from '../application/types'; import { PythonSettings } from '../configSettings'; import { isUnitTestExecution } from '../constants'; -import { DeprecatePythonPath } from '../experiments/experimentGroups'; +import { DeprecatePythonPath } from '../experiments/groups'; import { IConfigurationService, IExperimentsManager, IInterpreterPathService, IPythonSettings } from '../types'; @injectable() diff --git a/src/client/common/experiments/experimentGroups.ts b/src/client/common/experiments/groups.ts similarity index 100% rename from src/client/common/experiments/experimentGroups.ts rename to src/client/common/experiments/groups.ts diff --git a/src/client/common/experiments/manager.ts b/src/client/common/experiments/manager.ts index 67a6a59d266b..71fa8e92d897 100644 --- a/src/client/common/experiments/manager.ts +++ b/src/client/common/experiments/manager.ts @@ -28,7 +28,7 @@ import { import { sleep } from '../utils/async'; import { swallowExceptions } from '../utils/decorators'; import { Experiments } from '../utils/localize'; -import { NativeNotebook } from './experimentGroups'; +import { NativeNotebook } from './groups'; const EXPIRY_DURATION_MS = 30 * 60 * 1000; export const isDownloadedStorageValidKey = 'IS_EXPERIMENTS_STORAGE_VALID_KEY'; diff --git a/src/client/common/experiments/telemetry.ts b/src/client/common/experiments/telemetry.ts new file mode 100644 index 000000000000..5352209c31de --- /dev/null +++ b/src/client/common/experiments/telemetry.ts @@ -0,0 +1,23 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +import { IExperimentationTelemetry } from 'vscode-tas-client'; +import { sendTelemetryEvent } from '../../telemetry'; + +export class ExperimentationTelemetry implements IExperimentationTelemetry { + private readonly sharedProperties: { [key: string]: string } = {}; + + public setSharedProperty(name: string, value: string): void { + this.sharedProperties[name] = value; + } + + public postEvent(eventName: string, props: Map): void { + // Add shared properties to telemetry props (we may overwrite existing ones). + for (const [key, value] of Object.entries(this.sharedProperties)) { + props.set(key, value); + } + + // tslint:disable-next-line: no-any + sendTelemetryEvent(eventName as any, undefined, props); + } +} diff --git a/src/client/common/utils/cacheUtils.ts b/src/client/common/utils/cacheUtils.ts index 51ccd1741fc6..0f57303d75bf 100644 --- a/src/client/common/utils/cacheUtils.ts +++ b/src/client/common/utils/cacheUtils.ts @@ -9,7 +9,7 @@ import { Uri } from 'vscode'; import '../../common/extensions'; import { IServiceContainer } from '../../ioc/types'; import { DEFAULT_INTERPRETER_SETTING } from '../constants'; -import { DeprecatePythonPath } from '../experiments/experimentGroups'; +import { DeprecatePythonPath } from '../experiments/groups'; import { IExperimentsManager, IInterpreterPathService, Resource } from '../types'; type VSCodeType = typeof import('vscode'); diff --git a/src/client/datascience/context/activeEditorContext.ts b/src/client/datascience/context/activeEditorContext.ts index f7b490ce14b8..d16d74fad0b2 100644 --- a/src/client/datascience/context/activeEditorContext.ts +++ b/src/client/datascience/context/activeEditorContext.ts @@ -9,7 +9,7 @@ import { IExtensionSingleActivationService } from '../../activation/types'; import { ICommandManager, IDocumentManager, IVSCodeNotebook } from '../../common/application/types'; import { PYTHON_LANGUAGE } from '../../common/constants'; import { ContextKey } from '../../common/contextKey'; -import { NativeNotebook } from '../../common/experiments/experimentGroups'; +import { NativeNotebook } from '../../common/experiments/groups'; import { IDisposable, IDisposableRegistry, IExperimentsManager } from '../../common/types'; import { EditorContexts } from '../constants'; import { IInteractiveWindow, IInteractiveWindowProvider, INotebookEditor, INotebookEditorProvider } from '../types'; diff --git a/src/client/datascience/data-viewing/dataViewer.ts b/src/client/datascience/data-viewing/dataViewer.ts index f46e6a4ea091..9c5985fd30c7 100644 --- a/src/client/datascience/data-viewing/dataViewer.ts +++ b/src/client/datascience/data-viewing/dataViewer.ts @@ -9,7 +9,7 @@ import { ViewColumn } from 'vscode'; import { IApplicationShell, IWebPanelProvider, IWorkspaceService } from '../../common/application/types'; import { EXTENSION_ROOT_DIR, UseCustomEditorApi } from '../../common/constants'; -import { WebHostNotebook } from '../../common/experiments/experimentGroups'; +import { WebHostNotebook } from '../../common/experiments/groups'; import { traceError } from '../../common/logger'; import { IConfigurationService, IDisposable, IExperimentsManager, Resource } from '../../common/types'; import * as localize from '../../common/utils/localize'; diff --git a/src/client/datascience/editor-integration/hoverProvider.ts b/src/client/datascience/editor-integration/hoverProvider.ts index c25be9da85f1..85c7acdecac9 100644 --- a/src/client/datascience/editor-integration/hoverProvider.ts +++ b/src/client/datascience/editor-integration/hoverProvider.ts @@ -6,7 +6,7 @@ import { inject, injectable, named } from 'inversify'; import * as vscode from 'vscode'; import { Cancellation } from '../../common/cancellation'; import { PYTHON } from '../../common/constants'; -import { RunByLine } from '../../common/experiments/experimentGroups'; +import { RunByLine } from '../../common/experiments/groups'; import { traceError } from '../../common/logger'; import { IExperimentsManager } from '../../common/types'; import { sleep } from '../../common/utils/async'; diff --git a/src/client/datascience/interactive-common/interactiveBase.ts b/src/client/datascience/interactive-common/interactiveBase.ts index 1d45baddb77d..8ef24c5b122d 100644 --- a/src/client/datascience/interactive-common/interactiveBase.ts +++ b/src/client/datascience/interactive-common/interactiveBase.ts @@ -35,7 +35,7 @@ import { } from '../../common/application/types'; import { CancellationError } from '../../common/cancellation'; import { EXTENSION_ROOT_DIR, isTestExecution, PYTHON_LANGUAGE } from '../../common/constants'; -import { RunByLine, WebHostNotebook } from '../../common/experiments/experimentGroups'; +import { RunByLine, WebHostNotebook } from '../../common/experiments/groups'; import { traceError, traceInfo, traceWarning } from '../../common/logger'; import { IFileSystem } from '../../common/platform/types'; import { IConfigurationService, IDisposableRegistry, IExperimentsManager } from '../../common/types'; diff --git a/src/client/datascience/ipywidgets/ipywidgetHandler.ts b/src/client/datascience/ipywidgets/ipywidgetHandler.ts index 7d29232156c1..c2f569070d80 100644 --- a/src/client/datascience/ipywidgets/ipywidgetHandler.ts +++ b/src/client/datascience/ipywidgets/ipywidgetHandler.ts @@ -12,7 +12,7 @@ import { LoadIPyWidgetClassLoadAction, NotifyIPyWidgeWidgetVersionNotSupportedAction } from '../../../datascience-ui/interactive-common/redux/reducers/types'; -import { EnableIPyWidgets } from '../../common/experiments/experimentGroups'; +import { EnableIPyWidgets } from '../../common/experiments/groups'; import { traceError, traceInfo } from '../../common/logger'; import { IDisposableRegistry, IExperimentsManager, IOutputChannel } from '../../common/types'; import * as localize from '../../common/utils/localize'; diff --git a/src/client/datascience/jupyter/jupyterDebugger.ts b/src/client/datascience/jupyter/jupyterDebugger.ts index 34ce21652832..7093b7f052cc 100644 --- a/src/client/datascience/jupyter/jupyterDebugger.ts +++ b/src/client/datascience/jupyter/jupyterDebugger.ts @@ -10,7 +10,7 @@ import * as vsls from 'vsls/vscode'; import { concatMultilineStringOutput } from '../../../datascience-ui/common'; import { ServerStatus } from '../../../datascience-ui/interactive-common/mainState'; import { IApplicationShell } from '../../common/application/types'; -import { DebugAdapterNewPtvsd } from '../../common/experiments/experimentGroups'; +import { DebugAdapterNewPtvsd } from '../../common/experiments/groups'; import { traceError, traceInfo, traceWarning } from '../../common/logger'; import { IPlatformService } from '../../common/platform/types'; import { IConfigurationService, IExperimentsManager, Version } from '../../common/types'; diff --git a/src/client/datascience/jupyter/jupyterVariables.ts b/src/client/datascience/jupyter/jupyterVariables.ts index 8fff0747a771..43ea967fcb1e 100644 --- a/src/client/datascience/jupyter/jupyterVariables.ts +++ b/src/client/datascience/jupyter/jupyterVariables.ts @@ -5,7 +5,7 @@ import type { JSONObject } from '@phosphor/coreutils'; import { inject, injectable, named } from 'inversify'; import { Event, EventEmitter } from 'vscode'; -import { RunByLine } from '../../common/experiments/experimentGroups'; +import { RunByLine } from '../../common/experiments/groups'; import { IDisposableRegistry, IExperimentsManager } from '../../common/types'; import { captureTelemetry } from '../../telemetry'; import { Identifiers, Telemetry } from '../constants'; diff --git a/src/client/datascience/kernel-launcher/kernelDaemonPreWarmer.ts b/src/client/datascience/kernel-launcher/kernelDaemonPreWarmer.ts index f4a21c8231a9..33d80d1955c9 100644 --- a/src/client/datascience/kernel-launcher/kernelDaemonPreWarmer.ts +++ b/src/client/datascience/kernel-launcher/kernelDaemonPreWarmer.ts @@ -5,7 +5,7 @@ import { inject, injectable } from 'inversify'; import { IExtensionActivationService } from '../../activation/types'; -import { LocalZMQKernel } from '../../common/experiments/experimentGroups'; +import { LocalZMQKernel } from '../../common/experiments/groups'; import '../../common/extensions'; import { IDisposableRegistry, IExperimentsManager, Resource } from '../../common/types'; import { swallowExceptions } from '../../common/utils/decorators'; diff --git a/src/client/datascience/notebook/integration.ts b/src/client/datascience/notebook/integration.ts index fa1d2750c9d4..a2b2d31ffe9c 100644 --- a/src/client/datascience/notebook/integration.ts +++ b/src/client/datascience/notebook/integration.ts @@ -5,7 +5,7 @@ import { inject, injectable } from 'inversify'; import * as path from 'path'; import { IExtensionSingleActivationService } from '../../activation/types'; import { ICommandManager, IVSCodeNotebook } from '../../common/application/types'; -import { NativeNotebook } from '../../common/experiments/experimentGroups'; +import { NativeNotebook } from '../../common/experiments/groups'; import { IFileSystem } from '../../common/platform/types'; import { IDisposableRegistry, IExperimentsManager, IExtensionContext } from '../../common/types'; import { noop } from '../../common/utils/misc'; diff --git a/src/client/datascience/plotting/plotViewer.ts b/src/client/datascience/plotting/plotViewer.ts index 9b4917a21735..89e395907e63 100644 --- a/src/client/datascience/plotting/plotViewer.ts +++ b/src/client/datascience/plotting/plotViewer.ts @@ -11,7 +11,7 @@ import { traceInfo } from '../../../client/common/logger'; import { createDeferred } from '../../../client/common/utils/async'; import { IApplicationShell, IWebPanelProvider, IWorkspaceService } from '../../common/application/types'; import { EXTENSION_ROOT_DIR, UseCustomEditorApi } from '../../common/constants'; -import { WebHostNotebook } from '../../common/experiments/experimentGroups'; +import { WebHostNotebook } from '../../common/experiments/groups'; import { traceError } from '../../common/logger'; import { IFileSystem } from '../../common/platform/types'; import { IConfigurationService, IDisposable, IExperimentsManager, Resource } from '../../common/types'; diff --git a/src/client/datascience/raw-kernel/rawNotebookProvider.ts b/src/client/datascience/raw-kernel/rawNotebookProvider.ts index 1cc06161ba2e..0da23c03f744 100644 --- a/src/client/datascience/raw-kernel/rawNotebookProvider.ts +++ b/src/client/datascience/raw-kernel/rawNotebookProvider.ts @@ -6,7 +6,7 @@ import * as uuid from 'uuid/v4'; import { Event, EventEmitter, Uri } from 'vscode'; import { CancellationToken } from 'vscode-jsonrpc'; import { ILiveShareApi } from '../../common/application/types'; -import { LocalZMQKernel } from '../../common/experiments/experimentGroups'; +import { LocalZMQKernel } from '../../common/experiments/groups'; import '../../common/extensions'; import { traceError, traceInfo } from '../../common/logger'; import { IAsyncDisposableRegistry, IConfigurationService, IExperimentsManager, Resource } from '../../common/types'; diff --git a/src/client/datascience/serviceRegistry.ts b/src/client/datascience/serviceRegistry.ts index e242c26b8dfa..33c66cc97b4e 100644 --- a/src/client/datascience/serviceRegistry.ts +++ b/src/client/datascience/serviceRegistry.ts @@ -4,7 +4,7 @@ import { IExtensionSingleActivationService } from '../activation/types'; import { IApplicationEnvironment } from '../common/application/types'; import { UseCustomEditorApi } from '../common/constants'; -import { NativeNotebook } from '../common/experiments/experimentGroups'; +import { NativeNotebook } from '../common/experiments/groups'; import { IExperimentsManager } from '../common/types'; import { ProtocolParser } from '../debugger/debugAdapter/Common/protocolParser'; import { IProtocolParser } from '../debugger/debugAdapter/types'; diff --git a/src/client/debugger/extension/adapter/factory.ts b/src/client/debugger/extension/adapter/factory.ts index 968e7c013003..ffdecaad3c06 100644 --- a/src/client/debugger/extension/adapter/factory.ts +++ b/src/client/debugger/extension/adapter/factory.ts @@ -13,7 +13,7 @@ import { WorkspaceFolder } from 'vscode'; import { IApplicationShell } from '../../../common/application/types'; -import { DebugAdapterNewPtvsd } from '../../../common/experiments/experimentGroups'; +import { DebugAdapterNewPtvsd } from '../../../common/experiments/groups'; import { traceVerbose } from '../../../common/logger'; import { IExperimentsManager } from '../../../common/types'; import { EXTENSION_ROOT_DIR } from '../../../constants'; diff --git a/src/client/debugger/extension/adapter/outdatedDebuggerPrompt.ts b/src/client/debugger/extension/adapter/outdatedDebuggerPrompt.ts index b5ff671369aa..457ac2c18a77 100644 --- a/src/client/debugger/extension/adapter/outdatedDebuggerPrompt.ts +++ b/src/client/debugger/extension/adapter/outdatedDebuggerPrompt.ts @@ -7,7 +7,7 @@ import { inject, injectable } from 'inversify'; import { DebugAdapterTracker, DebugAdapterTrackerFactory, DebugSession, ProviderResult } from 'vscode'; import { DebugProtocol } from 'vscode-debugprotocol'; import { IApplicationShell } from '../../../common/application/types'; -import { DebugAdapterNewPtvsd } from '../../../common/experiments/experimentGroups'; +import { DebugAdapterNewPtvsd } from '../../../common/experiments/groups'; import { IBrowserService, IExperimentsManager } from '../../../common/types'; import { Common, OutdatedDebugger } from '../../../common/utils/localize'; import { IPromptShowState } from './types'; diff --git a/src/client/debugger/extension/configuration/resolvers/attach.ts b/src/client/debugger/extension/configuration/resolvers/attach.ts index fc18fd614d8b..7fb951cb386b 100644 --- a/src/client/debugger/extension/configuration/resolvers/attach.ts +++ b/src/client/debugger/extension/configuration/resolvers/attach.ts @@ -6,7 +6,7 @@ import { inject, injectable } from 'inversify'; import { CancellationToken, Uri, WorkspaceFolder } from 'vscode'; import { IDocumentManager, IWorkspaceService } from '../../../../common/application/types'; -import { DebugAdapterNewPtvsd } from '../../../../common/experiments/experimentGroups'; +import { DebugAdapterNewPtvsd } from '../../../../common/experiments/groups'; import { IPlatformService } from '../../../../common/platform/types'; import { IConfigurationService, IExperimentsManager } from '../../../../common/types'; import { Diagnostics } from '../../../../common/utils/localize'; diff --git a/src/client/debugger/extension/configuration/resolvers/launchConfigExperiment.ts b/src/client/debugger/extension/configuration/resolvers/launchConfigExperiment.ts index 6c7d32184a5e..66abc44ecbd3 100644 --- a/src/client/debugger/extension/configuration/resolvers/launchConfigExperiment.ts +++ b/src/client/debugger/extension/configuration/resolvers/launchConfigExperiment.ts @@ -4,7 +4,7 @@ 'use strict'; import { inject, injectable } from 'inversify'; -import { DebugAdapterNewPtvsd, WebAppReload } from '../../../../common/experiments/experimentGroups'; +import { DebugAdapterNewPtvsd, WebAppReload } from '../../../../common/experiments/groups'; import { traceInfo } from '../../../../common/logger'; import { IExperimentsManager } from '../../../../common/types'; import { sendTelemetryEvent } from '../../../../telemetry'; diff --git a/src/client/interpreter/activation/wrapperEnvironmentActivationService.ts b/src/client/interpreter/activation/wrapperEnvironmentActivationService.ts index 7dcf0e41b93b..4fb5d8ea2e29 100644 --- a/src/client/interpreter/activation/wrapperEnvironmentActivationService.ts +++ b/src/client/interpreter/activation/wrapperEnvironmentActivationService.ts @@ -5,7 +5,7 @@ import { inject, injectable } from 'inversify'; import * as path from 'path'; -import { UseTerminalToGetActivatedEnvVars } from '../../common/experiments/experimentGroups'; +import { UseTerminalToGetActivatedEnvVars } from '../../common/experiments/groups'; import '../../common/extensions'; import { traceError } from '../../common/logger'; import { IFileSystem } from '../../common/platform/types'; diff --git a/src/client/interpreter/autoSelection/rules/settings.ts b/src/client/interpreter/autoSelection/rules/settings.ts index a2139a5a480f..eae85e915ca2 100644 --- a/src/client/interpreter/autoSelection/rules/settings.ts +++ b/src/client/interpreter/autoSelection/rules/settings.ts @@ -5,7 +5,7 @@ import { inject, injectable } from 'inversify'; import { IWorkspaceService } from '../../../common/application/types'; -import { DeprecatePythonPath } from '../../../common/experiments/experimentGroups'; +import { DeprecatePythonPath } from '../../../common/experiments/groups'; import { IFileSystem } from '../../../common/platform/types'; import { IExperimentsManager, IInterpreterPathService, IPersistentStateFactory, Resource } from '../../../common/types'; import { AutoSelectionRule, IInterpreterAutoSelectionService } from '../types'; diff --git a/src/client/interpreter/autoSelection/rules/workspaceEnv.ts b/src/client/interpreter/autoSelection/rules/workspaceEnv.ts index 95e625a3a44d..53bf0cb6f769 100644 --- a/src/client/interpreter/autoSelection/rules/workspaceEnv.ts +++ b/src/client/interpreter/autoSelection/rules/workspaceEnv.ts @@ -6,7 +6,7 @@ import { inject, injectable, named } from 'inversify'; import { Uri } from 'vscode'; import { IWorkspaceService } from '../../../common/application/types'; -import { DeprecatePythonPath } from '../../../common/experiments/experimentGroups'; +import { DeprecatePythonPath } from '../../../common/experiments/groups'; import { traceVerbose } from '../../../common/logger'; import { IFileSystem, IPlatformService } from '../../../common/platform/types'; import { IExperimentsManager, IInterpreterPathService, IPersistentStateFactory, Resource } from '../../../common/types'; diff --git a/src/client/interpreter/configuration/interpreterSelector/interpreterSelector.ts b/src/client/interpreter/configuration/interpreterSelector/interpreterSelector.ts index 4d449b782d95..6afc9ace5b45 100644 --- a/src/client/interpreter/configuration/interpreterSelector/interpreterSelector.ts +++ b/src/client/interpreter/configuration/interpreterSelector/interpreterSelector.ts @@ -5,7 +5,7 @@ import { inject, injectable } from 'inversify'; import { Disposable, Uri } from 'vscode'; -import { DeprecatePythonPath } from '../../../common/experiments/experimentGroups'; +import { DeprecatePythonPath } from '../../../common/experiments/groups'; import { IExperimentsManager, IPathUtils, Resource } from '../../../common/types'; import { IInterpreterSecurityService } from '../../autoSelection/types'; import { IInterpreterService, PythonInterpreter } from '../../contracts'; diff --git a/src/client/interpreter/configuration/pythonPathUpdaterServiceFactory.ts b/src/client/interpreter/configuration/pythonPathUpdaterServiceFactory.ts index 66a0ea85d923..aecf7beeb5b6 100644 --- a/src/client/interpreter/configuration/pythonPathUpdaterServiceFactory.ts +++ b/src/client/interpreter/configuration/pythonPathUpdaterServiceFactory.ts @@ -1,7 +1,7 @@ import { inject, injectable } from 'inversify'; import { Uri } from 'vscode'; import { IWorkspaceService } from '../../common/application/types'; -import { DeprecatePythonPath } from '../../common/experiments/experimentGroups'; +import { DeprecatePythonPath } from '../../common/experiments/groups'; import { IExperimentsManager, IInterpreterPathService } from '../../common/types'; import { IServiceContainer } from '../../ioc/types'; import { GlobalPythonPathUpdaterService } from './services/globalUpdaterService'; diff --git a/src/client/interpreter/interpreterService.ts b/src/client/interpreter/interpreterService.ts index 6d9a0496f752..0bbc5b48ac2e 100644 --- a/src/client/interpreter/interpreterService.ts +++ b/src/client/interpreter/interpreterService.ts @@ -4,7 +4,7 @@ import * as path from 'path'; import { Disposable, Event, EventEmitter, Uri } from 'vscode'; import '../../client/common/extensions'; import { IDocumentManager, IWorkspaceService } from '../common/application/types'; -import { DeprecatePythonPath } from '../common/experiments/experimentGroups'; +import { DeprecatePythonPath } from '../common/experiments/groups'; import { traceError } from '../common/logger'; import { getArchitectureDisplayName } from '../common/platform/registry'; import { IFileSystem } from '../common/platform/types'; diff --git a/src/client/startupTelemetry.ts b/src/client/startupTelemetry.ts index cbc48b7553df..d48ebeedd397 100644 --- a/src/client/startupTelemetry.ts +++ b/src/client/startupTelemetry.ts @@ -3,7 +3,7 @@ import { IWorkspaceService } from './common/application/types'; import { isTestExecution } from './common/constants'; -import { DeprecatePythonPath } from './common/experiments/experimentGroups'; +import { DeprecatePythonPath } from './common/experiments/groups'; import { traceError } from './common/logger'; import { ITerminalHelper } from './common/terminal/types'; import { diff --git a/src/client/testing/main.ts b/src/client/testing/main.ts index c242014ee51a..f4763bd74b23 100644 --- a/src/client/testing/main.ts +++ b/src/client/testing/main.ts @@ -15,7 +15,7 @@ import { } from 'vscode'; import { IApplicationShell, ICommandManager, IDocumentManager, IWorkspaceService } from '../common/application/types'; import * as constants from '../common/constants'; -import { AlwaysDisplayTestExplorerGroups } from '../common/experiments/experimentGroups'; +import { AlwaysDisplayTestExplorerGroups } from '../common/experiments/groups'; import '../common/extensions'; import { traceError } from '../common/logger'; import { diff --git a/src/test/activation/aaTesting.unit.test.ts b/src/test/activation/aaTesting.unit.test.ts index 5b2d7340fb92..97cba28f3e03 100644 --- a/src/test/activation/aaTesting.unit.test.ts +++ b/src/test/activation/aaTesting.unit.test.ts @@ -5,7 +5,7 @@ import * as TypeMoq from 'typemoq'; import { AATesting } from '../../client/activation/aaTesting'; -import { ValidateABTesting } from '../../client/common/experiments/experimentGroups'; +import { ValidateABTesting } from '../../client/common/experiments/groups'; import { IExperimentsManager } from '../../client/common/types'; suite('A/A Testing', () => { diff --git a/src/test/activation/activationManager.unit.test.ts b/src/test/activation/activationManager.unit.test.ts index 8fd5bd519c79..c4fc941ed17b 100644 --- a/src/test/activation/activationManager.unit.test.ts +++ b/src/test/activation/activationManager.unit.test.ts @@ -16,7 +16,7 @@ import { ActiveResourceService } from '../../client/common/application/activeRes import { IActiveResourceService, IDocumentManager, IWorkspaceService } from '../../client/common/application/types'; import { WorkspaceService } from '../../client/common/application/workspace'; import { PYTHON_LANGUAGE } from '../../client/common/constants'; -import { DeprecatePythonPath } from '../../client/common/experiments/experimentGroups'; +import { DeprecatePythonPath } from '../../client/common/experiments/groups'; import { ExperimentsManager } from '../../client/common/experiments/manager'; import { InterpreterPathService } from '../../client/common/interpreterPathService'; import { FileSystem } from '../../client/common/platform/fileSystem'; diff --git a/src/test/activation/activationService.unit.test.ts b/src/test/activation/activationService.unit.test.ts index 6dc12f75ae90..8c8d884d1c93 100644 --- a/src/test/activation/activationService.unit.test.ts +++ b/src/test/activation/activationService.unit.test.ts @@ -16,7 +16,7 @@ import { import { LSNotSupportedDiagnosticServiceId } from '../../client/application/diagnostics/checks/lsNotSupported'; import { IDiagnostic, IDiagnosticsService } from '../../client/application/diagnostics/types'; import { IApplicationShell, ICommandManager, IWorkspaceService } from '../../client/common/application/types'; -import { LSControl, LSEnabled } from '../../client/common/experiments/experimentGroups'; +import { LSControl, LSEnabled } from '../../client/common/experiments/groups'; import { IPlatformService } from '../../client/common/platform/types'; import { IConfigurationService, diff --git a/src/test/activation/extensionSurvey.unit.test.ts b/src/test/activation/extensionSurvey.unit.test.ts index 09bba07a6fc8..6668914144a6 100644 --- a/src/test/activation/extensionSurvey.unit.test.ts +++ b/src/test/activation/extensionSurvey.unit.test.ts @@ -9,7 +9,7 @@ import { anything, instance, mock, verify, when } from 'ts-mockito'; import * as TypeMoq from 'typemoq'; import { ExtensionSurveyPrompt, extensionSurveyStateKeys } from '../../client/activation/extensionSurvey'; import { IApplicationEnvironment, IApplicationShell } from '../../client/common/application/types'; -import { ShowExtensionSurveyPrompt } from '../../client/common/experiments/experimentGroups'; +import { ShowExtensionSurveyPrompt } from '../../client/common/experiments/groups'; import { PersistentStateFactory } from '../../client/common/persistentState'; import { IPlatformService } from '../../client/common/platform/types'; import { diff --git a/src/test/application/diagnostics/checks/macPythonInterpreter.unit.test.ts b/src/test/application/diagnostics/checks/macPythonInterpreter.unit.test.ts index 6ff415893eef..6389e7f81b4d 100644 --- a/src/test/application/diagnostics/checks/macPythonInterpreter.unit.test.ts +++ b/src/test/application/diagnostics/checks/macPythonInterpreter.unit.test.ts @@ -29,7 +29,7 @@ import { } from '../../../../client/application/diagnostics/types'; import { CommandsWithoutArgs } from '../../../../client/common/application/commands'; import { IWorkspaceService } from '../../../../client/common/application/types'; -import { DeprecatePythonPath } from '../../../../client/common/experiments/experimentGroups'; +import { DeprecatePythonPath } from '../../../../client/common/experiments/groups'; import { IPlatformService } from '../../../../client/common/platform/types'; import { IConfigurationService, diff --git a/src/test/application/diagnostics/checks/pythonPathDeprecated.unit.test.ts b/src/test/application/diagnostics/checks/pythonPathDeprecated.unit.test.ts index c530d16d0220..32cdb98b2032 100644 --- a/src/test/application/diagnostics/checks/pythonPathDeprecated.unit.test.ts +++ b/src/test/application/diagnostics/checks/pythonPathDeprecated.unit.test.ts @@ -28,7 +28,7 @@ import { IDiagnosticHandlerService } from '../../../../client/application/diagnostics/types'; import { IWorkspaceService } from '../../../../client/common/application/types'; -import { DeprecatePythonPath } from '../../../../client/common/experiments/experimentGroups'; +import { DeprecatePythonPath } from '../../../../client/common/experiments/groups'; import { IDisposableRegistry, IExperimentsManager, Resource } from '../../../../client/common/types'; import { Common, Diagnostics } from '../../../../client/common/utils/localize'; import { IServiceContainer } from '../../../../client/ioc/types'; diff --git a/src/test/application/diagnostics/checks/upgradeCodeRunner.unit.test.ts b/src/test/application/diagnostics/checks/upgradeCodeRunner.unit.test.ts index 7bb493668761..7664f16d937a 100644 --- a/src/test/application/diagnostics/checks/upgradeCodeRunner.unit.test.ts +++ b/src/test/application/diagnostics/checks/upgradeCodeRunner.unit.test.ts @@ -28,7 +28,7 @@ import { } from '../../../../client/application/diagnostics/types'; import { IWorkspaceService } from '../../../../client/common/application/types'; import { CODE_RUNNER_EXTENSION_ID } from '../../../../client/common/constants'; -import { DeprecatePythonPath } from '../../../../client/common/experiments/experimentGroups'; +import { DeprecatePythonPath } from '../../../../client/common/experiments/groups'; import { IDisposableRegistry, IExperimentsManager, IExtensions, Resource } from '../../../../client/common/types'; import { Common, Diagnostics } from '../../../../client/common/utils/localize'; import { IServiceContainer } from '../../../../client/ioc/types'; diff --git a/src/test/common/configSettings/configSettings.pythonPath.unit.test.ts b/src/test/common/configSettings/configSettings.pythonPath.unit.test.ts index ab3fdd57439f..43099b8d54cd 100644 --- a/src/test/common/configSettings/configSettings.pythonPath.unit.test.ts +++ b/src/test/common/configSettings/configSettings.pythonPath.unit.test.ts @@ -13,7 +13,7 @@ import * as typemoq from 'typemoq'; import { Uri, WorkspaceConfiguration } from 'vscode'; import { IWorkspaceService } from '../../../client/common/application/types'; import { PythonSettings } from '../../../client/common/configSettings'; -import { DeprecatePythonPath } from '../../../client/common/experiments/experimentGroups'; +import { DeprecatePythonPath } from '../../../client/common/experiments/groups'; import { IExperimentsManager, IInterpreterPathService } from '../../../client/common/types'; import { noop } from '../../../client/common/utils/misc'; import { IInterpreterSecurityService } from '../../../client/interpreter/autoSelection/types'; diff --git a/src/test/common/configuration/service.unit.test.ts b/src/test/common/configuration/service.unit.test.ts index 0beb2f7d2b06..887a0779acf7 100644 --- a/src/test/common/configuration/service.unit.test.ts +++ b/src/test/common/configuration/service.unit.test.ts @@ -9,7 +9,7 @@ import { ConfigurationTarget, Uri, WorkspaceConfiguration } from 'vscode'; import { IWorkspaceService } from '../../../client/common/application/types'; import { PythonSettings } from '../../../client/common/configSettings'; import { ConfigurationService } from '../../../client/common/configuration/service'; -import { DeprecatePythonPath } from '../../../client/common/experiments/experimentGroups'; +import { DeprecatePythonPath } from '../../../client/common/experiments/groups'; import { IExperimentsManager, IInterpreterPathService } from '../../../client/common/types'; import { IInterpreterAutoSeletionProxyService, diff --git a/src/test/common/experiments/manager.unit.test.ts b/src/test/common/experiments/manager.unit.test.ts index 0772d0937ab7..b0cdf486d402 100644 --- a/src/test/common/experiments/manager.unit.test.ts +++ b/src/test/common/experiments/manager.unit.test.ts @@ -14,7 +14,7 @@ import { IApplicationEnvironment } from '../../../client/common/application/type import { PythonSettings } from '../../../client/common/configSettings'; import { ConfigurationService } from '../../../client/common/configuration/service'; import { CryptoUtils } from '../../../client/common/crypto'; -import { NativeNotebook } from '../../../client/common/experiments/experimentGroups'; +import { NativeNotebook } from '../../../client/common/experiments/groups'; import { configUri, downloadedExperimentStorageKey, diff --git a/src/test/common/terminals/environmentActivationProviders/terminalActivation.testvirtualenvs.ts b/src/test/common/terminals/environmentActivationProviders/terminalActivation.testvirtualenvs.ts index 8203dd709e7c..63d6958d9883 100644 --- a/src/test/common/terminals/environmentActivationProviders/terminalActivation.testvirtualenvs.ts +++ b/src/test/common/terminals/environmentActivationProviders/terminalActivation.testvirtualenvs.ts @@ -7,7 +7,7 @@ import { expect } from 'chai'; import * as fs from 'fs-extra'; import * as path from 'path'; import * as vscode from 'vscode'; -import { DeprecatePythonPath } from '../../../../client/common/experiments/experimentGroups'; +import { DeprecatePythonPath } from '../../../../client/common/experiments/groups'; import { FileSystem } from '../../../../client/common/platform/fileSystem'; import { IExperimentsManager } from '../../../../client/common/types'; import { PYTHON_VIRTUAL_ENVS_LOCATION } from '../../../ciConstants'; diff --git a/src/test/configuration/interpreterSelector/interpreterSelector.unit.test.ts b/src/test/configuration/interpreterSelector/interpreterSelector.unit.test.ts index 61396c503138..5842768e3547 100644 --- a/src/test/configuration/interpreterSelector/interpreterSelector.unit.test.ts +++ b/src/test/configuration/interpreterSelector/interpreterSelector.unit.test.ts @@ -5,7 +5,7 @@ import * as assert from 'assert'; import { SemVer } from 'semver'; import * as TypeMoq from 'typemoq'; import { Uri } from 'vscode'; -import { DeprecatePythonPath } from '../../../client/common/experiments/experimentGroups'; +import { DeprecatePythonPath } from '../../../client/common/experiments/groups'; import { PathUtils } from '../../../client/common/platform/pathUtils'; import { IFileSystem } from '../../../client/common/platform/types'; import { IExperimentsManager } from '../../../client/common/types'; diff --git a/src/test/datascience/dataScienceIocContainer.ts b/src/test/datascience/dataScienceIocContainer.ts index 6a19f5ffd26f..ebb24859bfed 100644 --- a/src/test/datascience/dataScienceIocContainer.ts +++ b/src/test/datascience/dataScienceIocContainer.ts @@ -96,7 +96,7 @@ import { EXTENSION_ROOT_DIR, UseCustomEditorApi, UseProposedApi } from '../../cl import { CryptoUtils } from '../../client/common/crypto'; import { DotNetCompatibilityService } from '../../client/common/dotnet/compatibilityService'; import { IDotNetCompatibilityService } from '../../client/common/dotnet/types'; -import { LocalZMQKernel } from '../../client/common/experiments/experimentGroups'; +import { LocalZMQKernel } from '../../client/common/experiments/groups'; import { ExperimentsManager } from '../../client/common/experiments/manager'; import { InstallationChannelManager } from '../../client/common/installer/channelManager'; import { ProductInstaller } from '../../client/common/installer/productInstaller'; diff --git a/src/test/datascience/debugger.functional.test.tsx b/src/test/datascience/debugger.functional.test.tsx index 6ec94dfb04a4..71315e78ae60 100644 --- a/src/test/datascience/debugger.functional.test.tsx +++ b/src/test/datascience/debugger.functional.test.tsx @@ -9,7 +9,7 @@ import { CodeLens, Disposable, Position, Range, SourceBreakpoint, Uri } from 'vs import { CancellationToken } from 'vscode-jsonrpc'; import { IApplicationShell, IDocumentManager } from '../../client/common/application/types'; -import { RunByLine } from '../../client/common/experiments/experimentGroups'; +import { RunByLine } from '../../client/common/experiments/groups'; import { createDeferred, waitForPromise } from '../../client/common/utils/async'; import { noop } from '../../client/common/utils/misc'; import { EXTENSION_ROOT_DIR } from '../../client/constants'; diff --git a/src/test/datascience/notebook.functional.test.ts b/src/test/datascience/notebook.functional.test.ts index 2d5a3cc0d7fe..f2c2fa2f23d3 100644 --- a/src/test/datascience/notebook.functional.test.ts +++ b/src/test/datascience/notebook.functional.test.ts @@ -19,7 +19,7 @@ import { ApplicationShell } from '../../client/common/application/applicationShe import { IApplicationShell } from '../../client/common/application/types'; import { Cancellation, CancellationError } from '../../client/common/cancellation'; import { EXTENSION_ROOT_DIR } from '../../client/common/constants'; -import { LocalZMQKernel } from '../../client/common/experiments/experimentGroups'; +import { LocalZMQKernel } from '../../client/common/experiments/groups'; import { traceError, traceInfo } from '../../client/common/logger'; import { IFileSystem } from '../../client/common/platform/types'; import { IPythonExecutionFactory, IPythonExecutionService, Output } from '../../client/common/process/types'; diff --git a/src/test/datascience/uiTests/ipywidget.ui.functional.test.ts b/src/test/datascience/uiTests/ipywidget.ui.functional.test.ts index 969e89668236..f098220d3e03 100644 --- a/src/test/datascience/uiTests/ipywidget.ui.functional.test.ts +++ b/src/test/datascience/uiTests/ipywidget.ui.functional.test.ts @@ -13,7 +13,7 @@ import * as os from 'os'; import * as path from 'path'; import * as sinon from 'sinon'; import { Disposable } from 'vscode'; -import { LocalZMQKernel } from '../../../client/common/experiments/experimentGroups'; +import { LocalZMQKernel } from '../../../client/common/experiments/groups'; import { EXTENSION_ROOT_DIR } from '../../../client/constants'; import { retryIfFail as retryIfFailOriginal } from '../../common'; import { mockedVSCodeNamespaces } from '../../vscode-mock'; diff --git a/src/test/datascience/variableexplorer.functional.test.tsx b/src/test/datascience/variableexplorer.functional.test.tsx index bb5fdc0e9856..72aa486f9c91 100644 --- a/src/test/datascience/variableexplorer.functional.test.tsx +++ b/src/test/datascience/variableexplorer.functional.test.tsx @@ -6,7 +6,7 @@ import * as React from 'react'; import * as AdazzleReactDataGrid from 'react-data-grid'; import { Disposable } from 'vscode'; -import { RunByLine } from '../../client/common/experiments/experimentGroups'; +import { RunByLine } from '../../client/common/experiments/groups'; import { InteractiveWindowMessages } from '../../client/datascience/interactive-common/interactiveWindowTypes'; import { IJupyterVariable } from '../../client/datascience/types'; import { DataScienceIocContainer } from './dataScienceIocContainer'; diff --git a/src/test/debugger/attach.ptvsd.test.ts b/src/test/debugger/attach.ptvsd.test.ts index 7c79de45c230..d846ad7c62c2 100644 --- a/src/test/debugger/attach.ptvsd.test.ts +++ b/src/test/debugger/attach.ptvsd.test.ts @@ -13,7 +13,7 @@ import { DebugClient } from 'vscode-debugadapter-testsupport'; import { IDocumentManager, IWorkspaceService } from '../../client/common/application/types'; import { EXTENSION_ROOT_DIR } from '../../client/common/constants'; -import { DebugAdapterNewPtvsd } from '../../client/common/experiments/experimentGroups'; +import { DebugAdapterNewPtvsd } from '../../client/common/experiments/groups'; import { IS_WINDOWS } from '../../client/common/platform/constants'; import { IPlatformService } from '../../client/common/platform/types'; import { IConfigurationService, IExperimentsManager } from '../../client/common/types'; diff --git a/src/test/debugger/extension/adapter/factory.unit.test.ts b/src/test/debugger/extension/adapter/factory.unit.test.ts index 7254bc211252..87e7679df898 100644 --- a/src/test/debugger/extension/adapter/factory.unit.test.ts +++ b/src/test/debugger/extension/adapter/factory.unit.test.ts @@ -17,7 +17,7 @@ import { ApplicationShell } from '../../../../client/common/application/applicat import { IApplicationShell } from '../../../../client/common/application/types'; import { ConfigurationService } from '../../../../client/common/configuration/service'; import { CryptoUtils } from '../../../../client/common/crypto'; -import { DebugAdapterNewPtvsd } from '../../../../client/common/experiments/experimentGroups'; +import { DebugAdapterNewPtvsd } from '../../../../client/common/experiments/groups'; import { ExperimentsManager } from '../../../../client/common/experiments/manager'; import { HttpClient } from '../../../../client/common/net/httpClient'; import { PersistentStateFactory } from '../../../../client/common/persistentState'; diff --git a/src/test/debugger/extension/adapter/outdatedDebuggerPrompt.unit.test.ts b/src/test/debugger/extension/adapter/outdatedDebuggerPrompt.unit.test.ts index 33e3b7f49a01..7c262b56de20 100644 --- a/src/test/debugger/extension/adapter/outdatedDebuggerPrompt.unit.test.ts +++ b/src/test/debugger/extension/adapter/outdatedDebuggerPrompt.unit.test.ts @@ -12,7 +12,7 @@ import { ApplicationShell } from '../../../../client/common/application/applicat import { IApplicationShell } from '../../../../client/common/application/types'; import { ConfigurationService } from '../../../../client/common/configuration/service'; import { CryptoUtils } from '../../../../client/common/crypto'; -import { DebugAdapterNewPtvsd } from '../../../../client/common/experiments/experimentGroups'; +import { DebugAdapterNewPtvsd } from '../../../../client/common/experiments/groups'; import { ExperimentsManager } from '../../../../client/common/experiments/manager'; import { BrowserService } from '../../../../client/common/net/browser'; import { HttpClient } from '../../../../client/common/net/httpClient'; diff --git a/src/test/debugger/extension/configuration/resolvers/attach.unit.test.ts b/src/test/debugger/extension/configuration/resolvers/attach.unit.test.ts index de7c21c5cef1..2e7b29dee168 100644 --- a/src/test/debugger/extension/configuration/resolvers/attach.unit.test.ts +++ b/src/test/debugger/extension/configuration/resolvers/attach.unit.test.ts @@ -10,7 +10,7 @@ import * as TypeMoq from 'typemoq'; import { DebugConfiguration, DebugConfigurationProvider, TextDocument, TextEditor, Uri, WorkspaceFolder } from 'vscode'; import { IDocumentManager, IWorkspaceService } from '../../../../../client/common/application/types'; import { PYTHON_LANGUAGE } from '../../../../../client/common/constants'; -import { DebugAdapterNewPtvsd } from '../../../../../client/common/experiments/experimentGroups'; +import { DebugAdapterNewPtvsd } from '../../../../../client/common/experiments/groups'; import { IFileSystem, IPlatformService } from '../../../../../client/common/platform/types'; import { IConfigurationService, IExperimentsManager } from '../../../../../client/common/types'; import { Diagnostics } from '../../../../../client/common/utils/localize'; diff --git a/src/test/debugger/extension/configuration/resolvers/launchConfigExperiments.unit.test.ts b/src/test/debugger/extension/configuration/resolvers/launchConfigExperiments.unit.test.ts index f50f807c732a..62b034ac8771 100644 --- a/src/test/debugger/extension/configuration/resolvers/launchConfigExperiments.unit.test.ts +++ b/src/test/debugger/extension/configuration/resolvers/launchConfigExperiments.unit.test.ts @@ -10,7 +10,7 @@ import { instance, mock, spy, when } from 'ts-mockito'; import { ApplicationEnvironment } from '../../../../../client/common/application/applicationEnvironment'; import { ConfigurationService } from '../../../../../client/common/configuration/service'; import { CryptoUtils } from '../../../../../client/common/crypto'; -import { DebugAdapterNewPtvsd, WebAppReload } from '../../../../../client/common/experiments/experimentGroups'; +import { DebugAdapterNewPtvsd, WebAppReload } from '../../../../../client/common/experiments/groups'; import { ExperimentsManager } from '../../../../../client/common/experiments/manager'; import { HttpClient } from '../../../../../client/common/net/httpClient'; import { PersistentStateFactory } from '../../../../../client/common/persistentState'; diff --git a/src/test/interpreters/autoSelection/rules/settings.unit.test.ts b/src/test/interpreters/autoSelection/rules/settings.unit.test.ts index 6b9bb5af5190..eb561f754e92 100644 --- a/src/test/interpreters/autoSelection/rules/settings.unit.test.ts +++ b/src/test/interpreters/autoSelection/rules/settings.unit.test.ts @@ -9,7 +9,7 @@ import { expect } from 'chai'; import { anything, instance, mock, when } from 'ts-mockito'; import { IWorkspaceService } from '../../../../client/common/application/types'; import { WorkspaceService } from '../../../../client/common/application/workspace'; -import { DeprecatePythonPath } from '../../../../client/common/experiments/experimentGroups'; +import { DeprecatePythonPath } from '../../../../client/common/experiments/groups'; import { ExperimentsManager } from '../../../../client/common/experiments/manager'; import { InterpreterPathService } from '../../../../client/common/interpreterPathService'; import { PersistentState, PersistentStateFactory } from '../../../../client/common/persistentState'; diff --git a/src/test/interpreters/autoSelection/rules/workspaceEnv.unit.test.ts b/src/test/interpreters/autoSelection/rules/workspaceEnv.unit.test.ts index 97d809fbc47e..c347853d2dea 100644 --- a/src/test/interpreters/autoSelection/rules/workspaceEnv.unit.test.ts +++ b/src/test/interpreters/autoSelection/rules/workspaceEnv.unit.test.ts @@ -13,7 +13,7 @@ import * as typemoq from 'typemoq'; import { Uri, WorkspaceFolder } from 'vscode'; import { IWorkspaceService } from '../../../../client/common/application/types'; import { WorkspaceService } from '../../../../client/common/application/workspace'; -import { DeprecatePythonPath } from '../../../../client/common/experiments/experimentGroups'; +import { DeprecatePythonPath } from '../../../../client/common/experiments/groups'; import { ExperimentsManager } from '../../../../client/common/experiments/manager'; import { InterpreterPathService } from '../../../../client/common/interpreterPathService'; import { PersistentState, PersistentStateFactory } from '../../../../client/common/persistentState'; diff --git a/src/test/interpreters/interpreterService.unit.test.ts b/src/test/interpreters/interpreterService.unit.test.ts index 8cad13c1ef54..2b870efbdccc 100644 --- a/src/test/interpreters/interpreterService.unit.test.ts +++ b/src/test/interpreters/interpreterService.unit.test.ts @@ -14,7 +14,7 @@ import { SemVer } from 'semver'; import * as TypeMoq from 'typemoq'; import { ConfigurationTarget, Disposable, TextDocument, TextEditor, Uri, WorkspaceConfiguration } from 'vscode'; import { IDocumentManager, IWorkspaceService } from '../../client/common/application/types'; -import { DeprecatePythonPath } from '../../client/common/experiments/experimentGroups'; +import { DeprecatePythonPath } from '../../client/common/experiments/groups'; import { getArchitectureDisplayName } from '../../client/common/platform/registry'; import { IFileSystem } from '../../client/common/platform/types'; import { IPythonExecutionFactory, IPythonExecutionService } from '../../client/common/process/types'; diff --git a/src/test/interpreters/pythonPathUpdaterFactory.unit.test.ts b/src/test/interpreters/pythonPathUpdaterFactory.unit.test.ts index 91e511b4d09b..5ba72dc2c1bf 100644 --- a/src/test/interpreters/pythonPathUpdaterFactory.unit.test.ts +++ b/src/test/interpreters/pythonPathUpdaterFactory.unit.test.ts @@ -2,7 +2,7 @@ import * as path from 'path'; import * as TypeMoq from 'typemoq'; import { ConfigurationTarget, Uri, WorkspaceConfiguration } from 'vscode'; import { IWorkspaceService } from '../../client/common/application/types'; -import { DeprecatePythonPath } from '../../client/common/experiments/experimentGroups'; +import { DeprecatePythonPath } from '../../client/common/experiments/groups'; import { IExperimentsManager, IInterpreterPathService } from '../../client/common/types'; import { PythonPathUpdaterServiceFactory } from '../../client/interpreter/configuration/pythonPathUpdaterServiceFactory'; import { IPythonPathUpdaterServiceFactory } from '../../client/interpreter/configuration/types'; diff --git a/src/test/startupTelemetry.unit.test.ts b/src/test/startupTelemetry.unit.test.ts index 2dfdbec2ecc2..0099f4d4ff5e 100644 --- a/src/test/startupTelemetry.unit.test.ts +++ b/src/test/startupTelemetry.unit.test.ts @@ -7,7 +7,7 @@ import { expect } from 'chai'; import * as TypeMoq from 'typemoq'; import { Uri, WorkspaceConfiguration } from 'vscode'; import { IWorkspaceService } from '../client/common/application/types'; -import { DeprecatePythonPath } from '../client/common/experiments/experimentGroups'; +import { DeprecatePythonPath } from '../client/common/experiments/groups'; import { IExperimentsManager, IInterpreterPathService } from '../client/common/types'; import { IServiceContainer } from '../client/ioc/types'; import { hasUserDefinedPythonPath } from '../client/startupTelemetry'; diff --git a/src/test/testing/main.unit.test.ts b/src/test/testing/main.unit.test.ts index b9b5ceb6deae..147fbee07733 100644 --- a/src/test/testing/main.unit.test.ts +++ b/src/test/testing/main.unit.test.ts @@ -8,7 +8,7 @@ import { anything, instance, mock, verify, when } from 'ts-mockito'; import { Disposable } from 'vscode'; import { CommandManager } from '../../client/common/application/commandManager'; import { ICommandManager } from '../../client/common/application/types'; -import { AlwaysDisplayTestExplorerGroups } from '../../client/common/experiments/experimentGroups'; +import { AlwaysDisplayTestExplorerGroups } from '../../client/common/experiments/groups'; import { ExperimentsManager } from '../../client/common/experiments/manager'; import { IDisposableRegistry, IExperimentsManager } from '../../client/common/types'; import { ServiceContainer } from '../../client/ioc/container'; From f6cddd10ddcc07117dadb5ba159b58e7e2bf362e Mon Sep 17 00:00:00 2001 From: Kim-Adeline Miguel Date: Tue, 26 May 2020 08:44:19 -0700 Subject: [PATCH 5/5] Whoops committed one file too many --- src/client/common/experiments/telemetry.ts | 23 ---------------------- 1 file changed, 23 deletions(-) delete mode 100644 src/client/common/experiments/telemetry.ts diff --git a/src/client/common/experiments/telemetry.ts b/src/client/common/experiments/telemetry.ts deleted file mode 100644 index 5352209c31de..000000000000 --- a/src/client/common/experiments/telemetry.ts +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -import { IExperimentationTelemetry } from 'vscode-tas-client'; -import { sendTelemetryEvent } from '../../telemetry'; - -export class ExperimentationTelemetry implements IExperimentationTelemetry { - private readonly sharedProperties: { [key: string]: string } = {}; - - public setSharedProperty(name: string, value: string): void { - this.sharedProperties[name] = value; - } - - public postEvent(eventName: string, props: Map): void { - // Add shared properties to telemetry props (we may overwrite existing ones). - for (const [key, value] of Object.entries(this.sharedProperties)) { - props.set(key, value); - } - - // tslint:disable-next-line: no-any - sendTelemetryEvent(eventName as any, undefined, props); - } -}