feat(amazonq): add lsp configuration support for includeSuggestionsWithCodeReferences (#5480)

* add message and data classes

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

Co-authored-by: Richard Li <[email protected]>

---------

Co-authored-by: Richard Li <[email protected]>

Author: samgst-amazon

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

@@ -82,7 +82,8 @@ class AmazonQLanguageClientImpl(private val project: Project) : AmazonQLanguageC
                         AmazonQLspConstants.LSP_CW_CONFIGURATION_KEY -> {
                             add(
                                 CodeWhispererLspConfiguration(
-                                    shouldShareData = CodeWhispererSettings.getInstance().isMetricOptIn()
+                                    shouldShareData = CodeWhispererSettings.getInstance().isMetricOptIn(),
+                                    shouldShareCodeReferences = CodeWhispererSettings.getInstance().isIncludeCodeWithReference(),
                                 )
                             )
                         }

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

@@ -4,7 +4,8 @@
 package software.aws.toolkits.jetbrains.services.amazonq.lsp
 
 object AmazonQLspConstants {
+    const val AWS_BUILDER_ID_URL = "https://view.awsapps.com/start"
     const val LSP_CW_CONFIGURATION_KEY = "aws.codeWhisperer"
     const val LSP_CW_OPT_OUT_KEY = "shareCodeWhispererContentWithAWS"
-    const val AWS_BUILDER_ID_URL = "https://view.awsapps.com/start"
+    const val LSP_CODE_REFERENCES_OPT_OUT_KEY = "includeSuggestionsWithCodeReferences"
 }

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

@@ -8,4 +8,7 @@ import com.google.gson.annotations.SerializedName
 data class CodeWhispererLspConfiguration(
     @SerializedName(AmazonQLspConstants.LSP_CW_OPT_OUT_KEY)
     val shouldShareData: Boolean? = null,
+
+    @SerializedName(AmazonQLspConstants.LSP_CODE_REFERENCES_OPT_OUT_KEY)
+    val shouldShareCodeReferences: Boolean? = null,
 )

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/settings/CodeWhispererSettings.kt

@@ -23,6 +23,13 @@ class CodeWhispererSettings : PersistentStateComponent<CodeWhispererConfiguratio
 
     fun toggleIncludeCodeWithReference(value: Boolean) {
         state.value[CodeWhispererConfigurationType.IsIncludeCodeWithReference] = value
+        ProjectManager.getInstance().openProjects.forEach {
+            if (it.isDisposed) {
+                return@forEach
+            }
+
+            AmazonQLspService.didChangeConfiguration(it)
+        }
     }
 
     fun isIncludeCodeWithReference() = state.value.getOrDefault(

plugins/amazonq/shared/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLanguageClientImplTest.kt

@@ -65,7 +65,10 @@ class AmazonQLanguageClientImplTest {
         assertThat(sut.configuration(configurationParams("aws.codeWhisperer")).get())
             .singleElement()
             .isEqualTo(
-                CodeWhispererLspConfiguration(shouldShareData = false)
+                CodeWhispererLspConfiguration(
+                    shouldShareData = false,
+                    shouldShareCodeReferences = false
+                )
             )
     }
 
@@ -75,7 +78,10 @@ class AmazonQLanguageClientImplTest {
         assertThat(sut.configuration(configurationParams("aws.codeWhisperer")).get())
             .singleElement()
             .isEqualTo(
-                CodeWhispererLspConfiguration(shouldShareData = true)
+                CodeWhispererLspConfiguration(
+                    shouldShareData = true,
+                    shouldShareCodeReferences = false
+                )
             )
     }
 
@@ -87,11 +93,15 @@ class AmazonQLanguageClientImplTest {
 
     @Test
     fun `Gson serializes CodeWhispererLspConfiguration serializes correctly`() {
-        val sut = CodeWhispererLspConfiguration(shouldShareData = true)
+        val sut = CodeWhispererLspConfiguration(
+            shouldShareData = true,
+            shouldShareCodeReferences = true
+        )
         assertThat(Gson().toJson(sut)).isEqualToIgnoringWhitespace(
             """
                 {
-                    "shareCodeWhispererContentWithAWS": true
+                    "shareCodeWhispererContentWithAWS": true,
+                    "includeSuggestionsWithCodeReferences": true
                 }
             """.trimIndent()
         )