Set default logic normalizing code sent to REPL (#15650)

Author: kimadeline

news/1 Enhancements/15649.md

@@ -0,0 +1 @@
+Use the updated logic for normalizing code sent to REPL as the default behaviour.

package.json

@@ -1052,7 +1052,6 @@
                             "Reload - experiment",
                             "DeprecatePythonPath - experiment",
                             "tryPylance",
-                            "pythonSendEntireLineToREPL",
                             "pythonTensorboardExperiment",
                             "pythonDiscoveryModule",
                             "pythonJediLSP",
@@ -1071,7 +1070,6 @@
                             "Reload - experiment",
                             "DeprecatePythonPath - experiment",
                             "tryPylance",
-                            "pythonSendEntireLineToREPL",
                             "pythonTensorboardExperiment",
                             "pythonDiscoveryModule",
                             "pythonJediLSP",

pythonFiles/normalizeForInterpreter.py

@@ -43,11 +43,6 @@ export enum JoinMailingListPromptVariants {
     variant3 = 'pythonJoinMailingListVar3',
 }
 
-// Experiment to use a different method for normalizing code to be sent to the REPL.
-export enum SendSelectionToREPL {
-    experiment = 'pythonSendEntireLineToREPL',
-}
-
 // Feature flag for 'Python: Launch TensorBoard' feature
 export enum NativeTensorBoard {
     experiment = 'pythonTensorboardExperiment',

pythonFiles/tests/test_normalize_for_interpreter.py

@@ -226,21 +226,6 @@ export function refactor(root: string): [string[], (out: string) => object[]] {
     return [args, parse];
 }
 
-//============================
-// normalizeForInterpreter.py
-
-export function normalizeForInterpreter(): [string[], (out: string) => string] {
-    const script = path.join(SCRIPTS_DIR, 'normalizeForInterpreter.py');
-    const args = maybeIsolated([script]);
-
-    function parse(out: string) {
-        // The text will be used as-is.
-        return out;
-    }
-
-    return [args, parse];
-}
-
 //============================
 // normalizeSelection.py
 

src/client/common/experiments/groups.ts

@@ -7,11 +7,9 @@ import { Position, Range, TextEditor, Uri } from 'vscode';
 
 import { IApplicationShell, IDocumentManager } from '../../common/application/types';
 import { PYTHON_LANGUAGE } from '../../common/constants';
-import { SendSelectionToREPL } from '../../common/experiments/groups';
 import { traceError } from '../../common/logger';
 import * as internalScripts from '../../common/process/internal/scripts';
 import { IProcessServiceFactory } from '../../common/process/types';
-import { IExperimentService } from '../../common/types';
 import { createDeferred } from '../../common/utils/async';
 import { IInterpreterService } from '../../interpreter/contracts';
 import { IServiceContainer } from '../../ioc/types';
@@ -23,14 +21,12 @@ export class CodeExecutionHelper implements ICodeExecutionHelper {
     private readonly applicationShell: IApplicationShell;
     private readonly processServiceFactory: IProcessServiceFactory;
     private readonly interpreterService: IInterpreterService;
-    private readonly experimentService: IExperimentService;
 
     constructor(@inject(IServiceContainer) serviceContainer: IServiceContainer) {
         this.documentManager = serviceContainer.get<IDocumentManager>(IDocumentManager);
         this.applicationShell = serviceContainer.get<IApplicationShell>(IApplicationShell);
         this.processServiceFactory = serviceContainer.get<IProcessServiceFactory>(IProcessServiceFactory);
         this.interpreterService = serviceContainer.get<IInterpreterService>(IInterpreterService);
-        this.experimentService = serviceContainer.get<IExperimentService>(IExperimentService);
     }
 
     public async normalizeLines(code: string, resource?: Uri): Promise<string> {
@@ -45,10 +41,7 @@ export class CodeExecutionHelper implements ICodeExecutionHelper {
             const interpreter = await this.interpreterService.getActiveInterpreter(resource);
             const processService = await this.processServiceFactory.create(resource);
 
-            const inExperiment = await this.experimentService.inExperiment(SendSelectionToREPL.experiment);
-            const [args, parse] = inExperiment
-                ? internalScripts.normalizeSelection()
-                : internalScripts.normalizeForInterpreter();
+            const [args, parse] = internalScripts.normalizeSelection();
             const observable = processService.execObservable(interpreter?.path || 'python', args, {
                 throwOnStdErr: true,
             });