From f06f21b90a6d4844cbcb19deb72751a10b0c54e7 Mon Sep 17 00:00:00 2001
From: Zoe Lin <zoelin@amazon.com>
Date: Tue, 29 Apr 2025 11:11:24 -0700
Subject: [PATCH] fix: tie enableLocalIndex back to user setting

---
 packages/amazonq/src/lsp/client.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/amazonq/src/lsp/client.ts b/packages/amazonq/src/lsp/client.ts
index 23633f15048..3dacee0c7f1 100644
--- a/packages/amazonq/src/lsp/client.ts
+++ b/packages/amazonq/src/lsp/client.ts
@@ -281,8 +281,7 @@ function getConfigSection(section: ConfigSection) {
                     customization: undefinedIfEmpty(getSelectedCustomization().arn),
                     optOutTelemetry: getOptOutPreference() === 'OPTOUT',
                     projectContext: {
-                        // TODO: we might need another setting to control the actual indexing
-                        enableLocalIndexing: true,
+                        enableLocalIndexing: CodeWhispererSettings.instance.isLocalIndexEnabled(),
                         enableGpuAcceleration: CodeWhispererSettings.instance.isLocalIndexGPUEnabled(),
                         indexWorkerThreads: CodeWhispererSettings.instance.getIndexWorkerThreads(),
                         localIndexing: {