10790 prep - Create an experiments/ folder

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';
 

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';

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,

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';

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';

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 {

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 {

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';

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';

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';

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()

src/client/common/experiments.ts → 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 { 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';

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,

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');

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/groups';
 import { IDisposable, IDisposableRegistry, IExperimentsManager } from '../../common/types';
 import { EditorContexts } from '../constants';
 import { IInteractiveWindow, IInteractiveWindowProvider, INotebookEditor, INotebookEditorProvider } from '../types';

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';

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/groups';
 import { traceError } from '../../common/logger';
 import { IExperimentsManager } from '../../common/types';
 import { sleep } from '../../common/utils/async';

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';

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';

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/groups';
 import { traceError, traceInfo, traceWarning } from '../../common/logger';
 import { IPlatformService } from '../../common/platform/types';
 import { IConfigurationService, IExperimentsManager, Version } from '../../common/types';

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/groups';
 import { IDisposableRegistry, IExperimentsManager } from '../../common/types';
 import { captureTelemetry } from '../../telemetry';
 import { Identifiers, Telemetry } from '../constants';

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/groups';
 import '../../common/extensions';
 import { IDisposableRegistry, IExperimentsManager, Resource } from '../../common/types';
 import { swallowExceptions } from '../../common/utils/decorators';

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/groups';
 import { IFileSystem } from '../../common/platform/types';
 import { IDisposableRegistry, IExperimentsManager, IExtensionContext } from '../../common/types';
 import { noop } from '../../common/utils/misc';

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';

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';

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/groups';
 import { IExperimentsManager } from '../common/types';
 import { ProtocolParser } from '../debugger/debugAdapter/Common/protocolParser';
 import { IProtocolParser } from '../debugger/debugAdapter/types';

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';

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';

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';

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';

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';

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';

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';

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';

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';