From f69728dd4e32ca4108869d5f43f2572e0817b264 Mon Sep 17 00:00:00 2001
From: Anthony Kim <anthonykim@microsoft.com>
Date: Mon, 23 Sep 2024 11:20:54 -0700
Subject: [PATCH] switch setting name to terminal.shellIntegration.enabled

---
 src/client/common/configSettings.ts                | 1 +
 src/client/common/types.ts                         | 2 +-
 src/client/terminals/pythonStartup.ts              | 2 +-
 src/test/terminals/codeExecution/helper.test.ts    | 1 -
 src/test/terminals/codeExecution/smartSend.test.ts | 1 -
 5 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/client/common/configSettings.ts b/src/client/common/configSettings.ts
index 6cae60c9fb97..1b637e7aac2d 100644
--- a/src/client/common/configSettings.ts
+++ b/src/client/common/configSettings.ts
@@ -368,6 +368,7 @@ export class PythonSettings implements IPythonSettings {
                   launchArgs: [],
                   activateEnvironment: true,
                   activateEnvInCurrentTerminal: false,
+                  enableShellIntegration: false,
               };
 
         this.REPL = pythonSettings.get<IREPLSettings>('REPL')!;
diff --git a/src/client/common/types.ts b/src/client/common/types.ts
index 283319fd6cec..035e6ec4638b 100644
--- a/src/client/common/types.ts
+++ b/src/client/common/types.ts
@@ -197,12 +197,12 @@ export interface ITerminalSettings {
     readonly launchArgs: string[];
     readonly activateEnvironment: boolean;
     readonly activateEnvInCurrentTerminal: boolean;
+    readonly enableShellIntegration: boolean;
 }
 
 export interface IREPLSettings {
     readonly enableREPLSmartSend: boolean;
     readonly sendToNativeREPL: boolean;
-    readonly enableShellIntegration: boolean;
 }
 
 export interface IExperiments {
diff --git a/src/client/terminals/pythonStartup.ts b/src/client/terminals/pythonStartup.ts
index 9a6b956d7f6e..542a2e6a6355 100644
--- a/src/client/terminals/pythonStartup.ts
+++ b/src/client/terminals/pythonStartup.ts
@@ -8,7 +8,7 @@ import { EXTENSION_ROOT_DIR } from '../constants';
 
 export async function registerPythonStartup(context: ExtensionContext): Promise<void> {
     const config = getConfiguration('python');
-    const pythonrcSetting = config.get<boolean>('REPL.enableShellIntegration');
+    const pythonrcSetting = config.get<boolean>('terminal.shellIntegration.enabled');
 
     if (pythonrcSetting) {
         const storageUri = context.storageUri || context.globalStorageUri;
diff --git a/src/test/terminals/codeExecution/helper.test.ts b/src/test/terminals/codeExecution/helper.test.ts
index e15c41957726..ebadd153705e 100644
--- a/src/test/terminals/codeExecution/helper.test.ts
+++ b/src/test/terminals/codeExecution/helper.test.ts
@@ -116,7 +116,6 @@ suite('Terminal - Code Execution Helper', () => {
                 enableREPLSmartSend: false,
                 REPLSmartSend: false,
                 sendToNativeREPL: false,
-                enableShellIntegration: true,
             }));
         configurationService.setup((x) => x.getSettings(TypeMoq.It.isAny())).returns(() => pythonSettings.object);
         configurationService
diff --git a/src/test/terminals/codeExecution/smartSend.test.ts b/src/test/terminals/codeExecution/smartSend.test.ts
index 594db361f51e..f315bc004d4e 100644
--- a/src/test/terminals/codeExecution/smartSend.test.ts
+++ b/src/test/terminals/codeExecution/smartSend.test.ts
@@ -113,7 +113,6 @@ suite('REPL - Smart Send', () => {
                 enableREPLSmartSend: true,
                 REPLSmartSend: true,
                 sendToNativeREPL: false,
-                enableShellIntegration: true,
             }));
 
         configurationService.setup((x) => x.getSettings(TypeMoq.It.isAny())).returns(() => pythonSettings.object);