Fix nesting for project context

Author: manodnyab

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLanguageClientImpl.kt

@@ -136,26 +136,13 @@ class AmazonQLanguageClientImpl(private val project: Project) : AmazonQLanguageC
                                     optOutTelemetry = AwsSettings.getInstance().isTelemetryEnabled,
                                     customization = CodeWhispererModelConfigurator.getInstance().activeCustomization(project)?.arn,
                                     // local context
-                                    enableLocalIndexing = qSettings.isProjectContextEnabled(),
-                                    indexWorkerThreads = qSettings.getProjectContextIndexThreadCount(),
-                                    enableGpuAcceleration = qSettings.isProjectContextGpu(),
-                                    localIndexing = LocalIndexingConfiguration(
-                                        maxIndexSizeMB = qSettings.getProjectContextIndexMaxSize()
-                                    )
-                                )
-                            )
-                        }
-                        AmazonQLspConstants.LSP_PROJECT_CONTEXT_KEY -> {
-                            add(
-                                AmazonQLspConfiguration(
-                                    optOutTelemetry = AwsSettings.getInstance().isTelemetryEnabled,
-                                    customization = CodeWhispererModelConfigurator.getInstance().activeCustomization(project)?.arn,
-                                    // local context
-                                    enableLocalIndexing = qSettings.isProjectContextEnabled(),
-                                    indexWorkerThreads = qSettings.getProjectContextIndexThreadCount(),
-                                    enableGpuAcceleration = qSettings.isProjectContextGpu(),
-                                    localIndexing = LocalIndexingConfiguration(
-                                        maxIndexSizeMB = qSettings.getProjectContextIndexMaxSize()
+                                    projectContext = QProjectContext(
+                                        enableLocalIndexing = qSettings.isProjectContextEnabled(),
+                                        indexWorkerThreads = qSettings.getProjectContextIndexThreadCount(),
+                                        enableGpuAcceleration = qSettings.isProjectContextGpu(),
+                                        localIndexing = LocalIndexingConfiguration(
+                                            maxIndexSizeMB = qSettings.getProjectContextIndexMaxSize()
+                                        )
                                     )
                                 )
                             )

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLspConfiguration.kt

@@ -15,6 +15,11 @@ data class AmazonQLspConfiguration(
     @SerializedName(AmazonQLspConstants.LSP_CUSTOMIZATION_CONFIGURATION_KEY)
     val customization: String? = null,
 
+    @SerializedName(AmazonQLspConstants.LSP_PROJECT_CONTEXT_KEY)
+    val projectContext: QProjectContext,
+)
+
+data class QProjectContext(
     val enableLocalIndexing: Boolean? = null,
 
     val enableGpuAcceleration: Boolean? = null,