diff --git a/src/client/activation/aaTesting.ts b/src/client/activation/aaTesting.ts index e37ddb31e4d0..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/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 f570eb05aa3a..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/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 3cc2d7f18b80..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/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 67ec7e68e9d6..b6c0847407cc 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/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 287ce9c47ef8..80ef914ae35e 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/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 61328de72ae6..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/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 26344f41a607..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/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 80dd0d5b0cbc..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/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 c2f43939ce6e..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/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 89aa79e5f7eb..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 './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 00a8c789f204..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 '../experimentGroups'; +import { DeprecatePythonPath } from '../experiments/groups'; import { IConfigurationService, IExperimentsManager, IInterpreterPathService, IPythonSettings } from '../types'; @injectable() diff --git a/src/client/common/experimentGroups.ts b/src/client/common/experiments/groups.ts similarity index 100% rename from src/client/common/experimentGroups.ts rename to src/client/common/experiments/groups.ts diff --git a/src/client/common/experiments.ts b/src/client/common/experiments/manager.ts similarity index 96% rename from src/client/common/experiments.ts rename to src/client/common/experiments/manager.ts index f916568dbdc7..38d8a1f8fed2 100644 --- a/src/client/common/experiments.ts +++ b/src/client/common/experiments/manager.ts @@ -8,24 +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 { 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 { 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'; +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/serviceRegistry.ts b/src/client/common/serviceRegistry.ts index 3105e902c3d9..18f52c0ff53a 100644 --- a/src/client/common/serviceRegistry.ts +++ b/src/client/common/serviceRegistry.ts @@ -39,7 +39,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/client/common/utils/cacheUtils.ts b/src/client/common/utils/cacheUtils.ts index 66fe0c35f626..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 '../experimentGroups'; +import { DeprecatePythonPath } from '../experiments/groups'; import { IExperimentsManager, IInterpreterPathService, Resource } from '../types'; type VSCodeType = typeof import('vscode'); diff --git a/src/client/datascience/data-viewing/dataViewer.ts b/src/client/datascience/data-viewing/dataViewer.ts index 25a3538c08dc..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/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/interactive-common/interactiveBase.ts b/src/client/datascience/interactive-common/interactiveBase.ts index 0ea429d5a72a..cda47d3e2216 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/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 3a22f0a79462..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/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 29413db006e7..e9d88dea98d2 100644 --- a/src/client/datascience/jupyter/jupyterDebugger.ts +++ b/src/client/datascience/jupyter/jupyterDebugger.ts @@ -9,7 +9,7 @@ import { DebugConfiguration } from 'vscode'; import * as vsls from 'vsls/vscode'; import { concatMultilineStringOutput } from '../../../datascience-ui/common'; import { IApplicationShell, ICommandManager, IDebugService, IWorkspaceService } from '../../common/application/types'; -import { DebugAdapterNewPtvsd } from '../../common/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 f1ec50fbffc0..578c9abb465f 100644 --- a/src/client/datascience/jupyter/jupyterVariables.ts +++ b/src/client/datascience/jupyter/jupyterVariables.ts @@ -6,7 +6,7 @@ import { inject, injectable, named } from 'inversify'; import { Event, EventEmitter } from 'vscode'; import { IDebugService } from '../../common/application/types'; -import { RunByLine } from '../../common/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/plotting/plotViewer.ts b/src/client/datascience/plotting/plotViewer.ts index 6f17e0d9bf91..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/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 22e222a3e208..f9c863b8710f 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/groups'; import '../../common/extensions'; import { traceError, traceInfo } from '../../common/logger'; import { IAsyncDisposableRegistry, IConfigurationService, IExperimentsManager, Resource } from '../../common/types'; diff --git a/src/client/debugger/extension/adapter/factory.ts b/src/client/debugger/extension/adapter/factory.ts index c0339f9e4705..23d428b18470 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/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 f149e0958dbd..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/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 bcfdd4734e79..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/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 d6416950adf0..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/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 b8fc7317caeb..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/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 bbd79abe6f0c..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/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 d033b087c451..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/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 f7c95fb7e0e1..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/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 b1e70235c4b8..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/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 6eef287fe8e4..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/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 c84e78c10837..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/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 f7e84b4b1ff0..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/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 78e1af84a2c9..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/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 43a14e4978c0..c4fc941ed17b 100644 --- a/src/test/activation/activationManager.unit.test.ts +++ b/src/test/activation/activationManager.unit.test.ts @@ -16,8 +16,8 @@ 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 { ExperimentsManager } from '../../client/common/experiments'; +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'; import { IFileSystem } from '../../client/common/platform/types'; diff --git a/src/test/activation/activationService.unit.test.ts b/src/test/activation/activationService.unit.test.ts index 4dccd02b03f3..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/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 ddee96f38b58..e6ce42310631 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/groups'; import { PersistentStateFactory } from '../../client/common/persistentState'; import { IPlatformService } from '../../client/common/platform/types'; import { 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 3ddf70b837c3..72ca62d17580 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/application/diagnostics/checks/macPythonInterpreter.unit.test.ts b/src/test/application/diagnostics/checks/macPythonInterpreter.unit.test.ts index eaa9315341d3..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/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 014bf92eff1e..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/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 64b4f9f35ee5..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/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 b15ebfff705e..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/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 87fceaad4a7c..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/experimentGroups'; +import { DeprecatePythonPath } from '../../../client/common/experiments/groups'; import { IExperimentsManager, IInterpreterPathService } from '../../../client/common/types'; import { IInterpreterAutoSeletionProxyService, diff --git a/src/test/common/experiments.unit.test.ts b/src/test/common/experiments/manager.unit.test.ts similarity index 98% rename from src/test/common/experiments.unit.test.ts rename to src/test/common/experiments/manager.unit.test.ts index df28f1f4b49d..fc7fec8f4e1e 100644 --- a/src/test/common/experiments.unit.test.ts +++ b/src/test/common/experiments/manager.unit.test.ts @@ -9,11 +9,11 @@ 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 { 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 { configUri, downloadedExperimentStorageKey, @@ -21,11 +21,11 @@ import { experimentStorageKey, isDownloadedStorageValidKey, oldExperimentSalts -} from '../../client/common/experiments'; -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, @@ -33,10 +33,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 diff --git a/src/test/common/installer.test.ts b/src/test/common/installer.test.ts index f3b6118ee4c1..c1f849e755a2 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 92109eeca0e1..4a6aa24ded62 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 '../../client/common/extensions'; import { FeatureDeprecationManager } from '../../client/common/featureDeprecationManager'; import { 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/common/terminals/environmentActivationProviders/terminalActivation.testvirtualenvs.ts b/src/test/common/terminals/environmentActivationProviders/terminalActivation.testvirtualenvs.ts index 180b790eb774..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/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 0410a29dac78..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/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 5ba7cc96afc7..47f813fe17d5 100644 --- a/src/test/datascience/dataScienceIocContainer.ts +++ b/src/test/datascience/dataScienceIocContainer.ts @@ -94,8 +94,8 @@ import { EXTENSION_ROOT_DIR, UseCustomEditorApi } from '../../client/common/cons 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 { 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'; import { diff --git a/src/test/datascience/debugger.functional.test.tsx b/src/test/datascience/debugger.functional.test.tsx index 39ad034bf522..3cb83fa4ff9d 100644 --- a/src/test/datascience/debugger.functional.test.tsx +++ b/src/test/datascience/debugger.functional.test.tsx @@ -10,7 +10,7 @@ import { CancellationToken } from 'vscode-jsonrpc'; import * as vsls from 'vsls/vscode'; import { IApplicationShell, IDebugService, IDocumentManager } from '../../client/common/application/types'; -import { RunByLine } from '../../client/common/experimentGroups'; +import { RunByLine } from '../../client/common/experiments/groups'; import { IProcessServiceFactory, Output } from '../../client/common/process/types'; import { createDeferred, waitForPromise } from '../../client/common/utils/async'; import { noop } from '../../client/common/utils/misc'; diff --git a/src/test/datascience/notebook.functional.test.ts b/src/test/datascience/notebook.functional.test.ts index 3cc3f5dddb15..4dfa2a407902 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/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 0c7bee367f83..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/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 5e911332a6d0..1dd73dc3e382 100644 --- a/src/test/datascience/variableexplorer.functional.test.tsx +++ b/src/test/datascience/variableexplorer.functional.test.tsx @@ -8,7 +8,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/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 0be2a3801c87..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/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 bd9e3d90d2d7..a96b32910957 100644 --- a/src/test/debugger/extension/adapter/factory.unit.test.ts +++ b/src/test/debugger/extension/adapter/factory.unit.test.ts @@ -17,8 +17,8 @@ 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 { ExperimentsManager } from '../../../../client/common/experiments'; +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'; 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..7c262b56de20 100644 --- a/src/test/debugger/extension/adapter/outdatedDebuggerPrompt.unit.test.ts +++ b/src/test/debugger/extension/adapter/outdatedDebuggerPrompt.unit.test.ts @@ -12,8 +12,8 @@ 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 { ExperimentsManager } from '../../../../client/common/experiments'; +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'; import { PersistentStateFactory } from '../../../../client/common/persistentState'; 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..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/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 339f3bd68ba1..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,8 +10,8 @@ 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 { ExperimentsManager } from '../../../../../client/common/experiments'; +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'; 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..eb561f754e92 100644 --- a/src/test/interpreters/autoSelection/rules/settings.unit.test.ts +++ b/src/test/interpreters/autoSelection/rules/settings.unit.test.ts @@ -9,8 +9,8 @@ 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 { ExperimentsManager } from '../../../../client/common/experiments'; +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'; 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..c347853d2dea 100644 --- a/src/test/interpreters/autoSelection/rules/workspaceEnv.unit.test.ts +++ b/src/test/interpreters/autoSelection/rules/workspaceEnv.unit.test.ts @@ -13,8 +13,8 @@ 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 { ExperimentsManager } from '../../../../client/common/experiments'; +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'; import { FileSystem } from '../../../../client/common/platform/fileSystem'; diff --git a/src/test/interpreters/interpreterService.unit.test.ts b/src/test/interpreters/interpreterService.unit.test.ts index 48b224666585..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/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 e59e379cbc34..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/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 828a85a000ff..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/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 7f38e6ad6b72..147fbee07733 100644 --- a/src/test/testing/main.unit.test.ts +++ b/src/test/testing/main.unit.test.ts @@ -8,8 +8,8 @@ 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 { ExperimentsManager } from '../../client/common/experiments'; +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'; import { IServiceContainer } from '../../client/ioc/types';