Remove reload experiment (#12930)

Author: karthiknadig

src/client/debugger/extension/configuration/resolvers/launch.ts

@@ -12,7 +12,6 @@ import { IPlatformService } from '../../../../common/platform/types';
 import { IConfigurationService } from '../../../../common/types';
 import { DebuggerTypeName } from '../../../constants';
 import { DebugOptions, LaunchRequestArguments } from '../../../types';
-import { ILaunchDebugConfigurationResolverExperiment } from '../types';
 import { BaseConfigurationResolver } from './base';
 import { IDebugEnvironmentVariablesService } from './helper';
 
@@ -26,9 +25,7 @@ export class LaunchConfigurationResolver extends BaseConfigurationResolver<Launc
         private readonly invalidPythonPathInDebuggerService: IInvalidPythonPathInDebuggerService,
         @inject(IPlatformService) platformService: IPlatformService,
         @inject(IConfigurationService) configurationService: IConfigurationService,
-        @inject(IDebugEnvironmentVariablesService) private readonly debugEnvHelper: IDebugEnvironmentVariablesService,
-        @inject(ILaunchDebugConfigurationResolverExperiment)
-        private readonly configExperiment: ILaunchDebugConfigurationResolverExperiment
+        @inject(IDebugEnvironmentVariablesService) private readonly debugEnvHelper: IDebugEnvironmentVariablesService
     ) {
         super(workspaceService, documentManager, platformService, configurationService);
     }
@@ -54,8 +51,6 @@ export class LaunchConfigurationResolver extends BaseConfigurationResolver<Launc
 
         await this.provideLaunchDefaults(workspaceFolder, config);
 
-        this.configExperiment.modifyConfigurationBasedOnExperiment(config);
-
         const isValid = await this.validateLaunchConfiguration(folder, config);
         if (!isValid) {
             return;

src/client/debugger/extension/configuration/resolvers/launchConfigExperiment.ts

@@ -4,7 +4,6 @@
 'use strict';
 
 import { CancellationToken, DebugConfiguration, WorkspaceFolder } from 'vscode';
-import { LaunchRequestArguments } from '../../types';
 import { DebugConfigurationType, IDebugConfigurationProvider } from '../types';
 
 export const IDebugConfigurationResolver = Symbol('IDebugConfigurationResolver');
@@ -20,8 +19,3 @@ export const IDebugConfigurationProviderFactory = Symbol('IDebugConfigurationPro
 export interface IDebugConfigurationProviderFactory {
     create(configurationType: DebugConfigurationType): IDebugConfigurationProvider;
 }
-
-export const ILaunchDebugConfigurationResolverExperiment = Symbol('ILaunchDebugConfigurationResolverExperiment');
-export interface ILaunchDebugConfigurationResolverExperiment {
-    modifyConfigurationBasedOnExperiment(debugConfiguration: LaunchRequestArguments): void;
-}

src/client/debugger/extension/configuration/types.ts

@@ -28,12 +28,7 @@ import { RemoteAttachDebugConfigurationProvider } from './configuration/provider
 import { AttachConfigurationResolver } from './configuration/resolvers/attach';
 import { DebugEnvironmentVariablesHelper, IDebugEnvironmentVariablesService } from './configuration/resolvers/helper';
 import { LaunchConfigurationResolver } from './configuration/resolvers/launch';
-import { LaunchDebugConfigurationExperiment } from './configuration/resolvers/launchConfigExperiment';
-import {
-    IDebugConfigurationProviderFactory,
-    IDebugConfigurationResolver,
-    ILaunchDebugConfigurationResolverExperiment
-} from './configuration/types';
+import { IDebugConfigurationProviderFactory, IDebugConfigurationResolver } from './configuration/types';
 import { ChildProcessAttachEventHandler } from './hooks/childProcessAttachHandler';
 import { ChildProcessAttachService } from './hooks/childProcessAttachService';
 import { IChildProcessAttachService, IDebugSessionEventHandlers } from './hooks/types';
@@ -133,10 +128,6 @@ export function registerTypes(serviceManager: IServiceManager) {
         IOutdatedDebuggerPromptFactory,
         OutdatedDebuggerPromptFactory
     );
-    serviceManager.addSingleton<ILaunchDebugConfigurationResolverExperiment>(
-        ILaunchDebugConfigurationResolverExperiment,
-        LaunchDebugConfigurationExperiment
-    );
     serviceManager.addSingleton<IAttachProcessProviderFactory>(
         IAttachProcessProviderFactory,
         AttachProcessProviderFactory

src/client/debugger/extension/serviceRegistry.ts

@@ -18,7 +18,6 @@ import { OSType } from '../../../../../client/common/utils/platform';
 import { DebuggerTypeName } from '../../../../../client/debugger/constants';
 import { IDebugEnvironmentVariablesService } from '../../../../../client/debugger/extension/configuration/resolvers/helper';
 import { LaunchConfigurationResolver } from '../../../../../client/debugger/extension/configuration/resolvers/launch';
-import { ILaunchDebugConfigurationResolverExperiment } from '../../../../../client/debugger/extension/configuration/types';
 import { DebugOptions, LaunchRequestArguments } from '../../../../../client/debugger/types';
 import { IInterpreterHelper } from '../../../../../client/interpreter/contracts';
 import { getOSType } from '../../../../common';
@@ -38,21 +37,19 @@ getInfoPerOS().forEach(([osName, osType, path]) => {
         let documentManager: TypeMoq.IMock<IDocumentManager>;
         let diagnosticsService: TypeMoq.IMock<IInvalidPythonPathInDebuggerService>;
         let debugEnvHelper: TypeMoq.IMock<IDebugEnvironmentVariablesService>;
-        let configExperiment: TypeMoq.IMock<ILaunchDebugConfigurationResolverExperiment>;
         function createMoqWorkspaceFolder(folderPath: string) {
             const folder = TypeMoq.Mock.ofType<WorkspaceFolder>();
             folder.setup((f) => f.uri).returns(() => Uri.file(folderPath));
             return folder.object;
         }
         function setupIoc(pythonPath: string, workspaceFolder?: WorkspaceFolder) {
-            const confgService = TypeMoq.Mock.ofType<IConfigurationService>();
+            const configService = TypeMoq.Mock.ofType<IConfigurationService>();
             workspaceService = TypeMoq.Mock.ofType<IWorkspaceService>();
             documentManager = TypeMoq.Mock.ofType<IDocumentManager>();
 
             platformService = TypeMoq.Mock.ofType<IPlatformService>();
             diagnosticsService = TypeMoq.Mock.ofType<IInvalidPythonPathInDebuggerService>();
             debugEnvHelper = TypeMoq.Mock.ofType<IDebugEnvironmentVariablesService>();
-            configExperiment = TypeMoq.Mock.ofType<ILaunchDebugConfigurationResolverExperiment>();
 
             pythonExecutionService = TypeMoq.Mock.ofType<IPythonExecutionService>();
             helper = TypeMoq.Mock.ofType<IInterpreterHelper>();
@@ -71,25 +68,19 @@ getInfoPerOS().forEach(([osName, osType, path]) => {
             if (workspaceFolder) {
                 settings.setup((s) => s.envFile).returns(() => path.join(workspaceFolder!.uri.fsPath, '.env2'));
             }
-            confgService.setup((c) => c.getSettings(TypeMoq.It.isAny())).returns(() => settings.object);
+            configService.setup((c) => c.getSettings(TypeMoq.It.isAny())).returns(() => settings.object);
             setUpOSMocks(osType, platformService);
             debugEnvHelper
                 .setup((x) => x.getEnvironmentVariables(TypeMoq.It.isAny()))
                 .returns(() => Promise.resolve({}));
-            configExperiment
-                .setup((c) => c.modifyConfigurationBasedOnExperiment(TypeMoq.It.isAny()))
-                .returns(() => {
-                    return;
-                });
 
             debugProvider = new LaunchConfigurationResolver(
                 workspaceService.object,
                 documentManager.object,
                 diagnosticsService.object,
                 platformService.object,
-                confgService.object,
-                debugEnvHelper.object,
-                configExperiment.object
+                configService.object,
+                debugEnvHelper.object
             );
         }
         function setupActiveEditor(fileName: string | undefined, languageId: string) {