Merge branch 'main' into main

KevinDing1 · web-flow · commit dec166160c50 · 2025-02-11T09:47:18.000-05:00
diff --git a/.changes/3.54.json b/.changes/3.54.json
@@ -0,0 +1,8 @@
+{
+  "date" : "2025-02-11",
+  "version" : "3.54",
+  "entries" : [ {
+    "type" : "bugfix",
+    "description" : "Amazon Q: Reverting the behavior of making JetBrains suggestions(IntelliSense) and Q suggestions co-exist"
+  } ]
+}
diff --git a/.changes/next-release/feature-a6b77635-5ddb-42c9-a31a-518f8cae1ebc.json b/.changes/next-release/feature-a6b77635-5ddb-42c9-a31a-518f8cae1ebc.json
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# _3.54_ (2025-02-11)
+- **(Bug Fix)** Amazon Q: Reverting the behavior of making JetBrains suggestions(IntelliSense) and Q suggestions co-exist
+
 # _3.53_ (2025-02-07)
 - **(Bug Fix)** Amazon Q: Fixed an issue where in a specific scenario when receiving multiple suggestions with JetBrains suggestions visible, users are not able to accept the suggestion.
 
diff --git a/gradle.properties b/gradle.properties
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # Toolkit Version
-toolkitVersion=3.54-SNAPSHOT
+toolkitVersion=3.55-SNAPSHOT
 
 # Publish Settings
 publishToken=
diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeModernizerManager.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeModernizerManager.kt
@@ -122,10 +122,9 @@ class CodeModernizerManager(private val project: Project) : PersistentStateCompo
         }
     private val artifactHandler = ArtifactHandler(project, GumbyClient.getInstance(project))
     private val supportedJavaMappings = mapOf(
-        JavaSdkVersion.JDK_1_8 to setOf(JavaSdkVersion.JDK_17, JavaSdkVersion.JDK_21),
-        JavaSdkVersion.JDK_11 to setOf(JavaSdkVersion.JDK_17, JavaSdkVersion.JDK_21),
-        JavaSdkVersion.JDK_17 to setOf(JavaSdkVersion.JDK_17, JavaSdkVersion.JDK_21),
-        JavaSdkVersion.JDK_21 to setOf(JavaSdkVersion.JDK_21),
+        JavaSdkVersion.JDK_1_8 to setOf(JavaSdkVersion.JDK_17),
+        JavaSdkVersion.JDK_11 to setOf(JavaSdkVersion.JDK_17),
+        JavaSdkVersion.JDK_17 to setOf(JavaSdkVersion.JDK_17),
     )
 
     init {
diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/constants/CodeTransformChatItems.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/constants/CodeTransformChatItems.kt
@@ -179,10 +179,6 @@ private val selectTargetVersionFormItem = FormItem(
         FormItemOption(
             label = JavaSdkVersion.JDK_17.toString(),
             value = JavaSdkVersion.JDK_17.toString(),
-        ),
-        FormItemOption(
-            label = JavaSdkVersion.JDK_21.toString(),
-            value = JavaSdkVersion.JDK_21.toString(),
         )
     )
 )
diff --git a/plugins/amazonq/codetransform/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codemodernizer/CodeWhispererCodeModernizerGumbyClientTest.kt b/plugins/amazonq/codetransform/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codemodernizer/CodeWhispererCodeModernizerGumbyClientTest.kt
@@ -146,17 +146,6 @@ class CodeWhispererCodeModernizerGumbyClientTest : CodeWhispererCodeModernizerTe
         }
     }
 
-    @Test
-    fun `check startCodeModernization on JAVA_21 target`() {
-        val actual = gumbyClient.startCodeModernization("jobId", TransformationLanguage.JAVA_8, TransformationLanguage.JAVA_21)
-        argumentCaptor<StartTransformationRequest>().apply {
-            verify(bearerClient).startTransformation(capture())
-            verifyNoInteractions(streamingBearerClient)
-            assertThat(actual).isInstanceOf(StartTransformationResponse::class.java)
-            assertThat(actual).usingRecursiveComparison().comparingOnlyFields("transformationJobId").isEqualTo(exampleStartCodeMigrationResponse)
-        }
-    }
-
     @Test
     fun `check getCodeModernizationPlan`() {
         val actual = gumbyClient.getCodeModernizationPlan(JobId("JobId"))
diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/resources/META-INF/plugin-codewhisperer.xml b/plugins/amazonq/codewhisperer/jetbrains-community/resources/META-INF/plugin-codewhisperer.xml
@@ -106,7 +106,7 @@
         </action>
         <action id="codewhisperer.inline.force.accept"
                 class="software.aws.toolkits.jetbrains.services.codewhisperer.actions.CodeWhispererForceAcceptAction"
-                text="Force Accept the Current Inline Suggestion" description="Force accept the current inline suggestion">
+                text="Force Accept the Current Amazon Q Suggestion" description="Force accept the current Amazon Q suggestion">
             <keyboard-shortcut keymap="Mac OS X" first-keystroke="alt TAB"/>
             <keyboard-shortcut keymap="Mac OS X 10.5+" first-keystroke="alt TAB"/>
             <keyboard-shortcut keymap="$default" first-keystroke="alt ENTER"/>
diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/actions/CodeWhispererActionPromoter.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/actions/CodeWhispererActionPromoter.kt
@@ -3,13 +3,11 @@
 
 package software.aws.toolkits.jetbrains.services.codewhisperer.actions
 
-import com.intellij.codeInsight.lookup.impl.actions.ChooseItemAction
 import com.intellij.openapi.actionSystem.ActionPromoter
 import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.DataContext
 import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispererInvocationStatus
 import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispererInvocationStatusNew
-import software.aws.toolkits.jetbrains.settings.CodeWhispererSettings
 
 class CodeWhispererActionPromoter : ActionPromoter {
     override fun promote(actions: MutableList<out AnAction>, context: DataContext): MutableList<AnAction> {
@@ -27,30 +25,10 @@ class CodeWhispererActionPromoter : ActionPromoter {
                 return@sortWith 1
             }
 
-            if (CodeWhispererSettings.getInstance().isQPrioritizedForTabAccept()) {
-                if (isCodeWhispererAcceptAction(a)) {
-                    return@sortWith -1
-                } else if (isCodeWhispererAcceptAction(b)) {
-                    return@sortWith 1
-                }
-
-                if (a is ChooseItemAction) {
-                    return@sortWith -1
-                } else if (b is ChooseItemAction) {
-                    return@sortWith 1
-                }
-            } else {
-                if (a is ChooseItemAction) {
-                    return@sortWith -1
-                } else if (b is ChooseItemAction) {
-                    return@sortWith 1
-                }
-
-                if (isCodeWhispererAcceptAction(a)) {
-                    return@sortWith -1
-                } else if (isCodeWhispererAcceptAction(b)) {
-                    return@sortWith 1
-                }
+            if (isCodeWhispererAcceptAction(a)) {
+                return@sortWith -1
+            } else if (isCodeWhispererAcceptAction(b)) {
+                return@sortWith 1
             }
 
             0
diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/credentials/CodeWhispererClientAdaptor.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/credentials/CodeWhispererClientAdaptor.kt
@@ -7,6 +7,7 @@ import com.intellij.openapi.Disposable
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.components.service
 import com.intellij.openapi.project.Project
+import com.intellij.util.text.nullize
 import software.amazon.awssdk.auth.credentials.AnonymousCredentialsProvider
 import software.amazon.awssdk.services.codewhisperer.CodeWhispererClient
 import software.amazon.awssdk.services.codewhisperer.model.CreateCodeScanRequest
@@ -146,7 +147,7 @@ interface CodeWhispererClientAdaptor : Disposable {
         sessionId: String,
         requestId: String,
         language: CodeWhispererProgrammingLanguage,
-        customizationArn: String,
+        customizationArn: String?,
         acceptedCharacterCount: Int,
         unmodifiedAcceptedTokenCount: Int,
     ): SendTelemetryEventResponse
@@ -427,7 +428,7 @@ open class CodeWhispererClientAdaptorImpl(override val project: Project) : CodeW
                     it.timestamp(Instant.now())
                     it.suggestionReferenceCount(suggestionReferenceCount)
                     it.generatedLine(lineCount)
-                    it.customizationArn(requestContext.customizationArn)
+                    it.customizationArn(requestContext.customizationArn.nullize(nullizeSpaces = true))
                     it.numberOfRecommendations(numberOfRecommendations)
                     it.acceptedCharacterCount(acceptedCharCount)
                 }
@@ -473,7 +474,7 @@ open class CodeWhispererClientAdaptorImpl(override val project: Project) : CodeW
                     it.timestamp(Instant.now())
                     it.suggestionReferenceCount(suggestionReferenceCount)
                     it.generatedLine(lineCount)
-                    it.customizationArn(requestContext.customizationArn)
+                    it.customizationArn(requestContext.customizationArn.nullize(nullizeSpaces = true))
                     it.numberOfRecommendations(numberOfRecommendations)
                     it.acceptedCharacterCount(acceptedCharCount)
                 }
@@ -495,7 +496,7 @@ open class CodeWhispererClientAdaptorImpl(override val project: Project) : CodeW
         requestBuilder.telemetryEvent { telemetryEventBuilder ->
             telemetryEventBuilder.codeCoverageEvent {
                 it.programmingLanguage { languageBuilder -> languageBuilder.languageName(language.toCodeWhispererRuntimeLanguage().languageId) }
-                it.customizationArn(customizationArn)
+                it.customizationArn(customizationArn.nullize(nullizeSpaces = true))
                 it.acceptedCharacterCount(acceptedTokenCount.toInt())
                 it.totalCharacterCount(totalTokenCount.toInt())
                 it.timestamp(Instant.now())
@@ -512,7 +513,7 @@ open class CodeWhispererClientAdaptorImpl(override val project: Project) : CodeW
         sessionId: String,
         requestId: String,
         language: CodeWhispererProgrammingLanguage,
-        customizationArn: String,
+        customizationArn: String?,
         acceptedCharacterCount: Int,
         unmodifiedAcceptedTokenCount: Int,
     ): SendTelemetryEventResponse = bearerClient().sendTelemetryEvent { requestBuilder ->
@@ -523,7 +524,7 @@ open class CodeWhispererClientAdaptorImpl(override val project: Project) : CodeW
                 it.programmingLanguage { languageBuilder ->
                     languageBuilder.languageName(language.toCodeWhispererRuntimeLanguage().languageId)
                 }
-                it.customizationArn(customizationArn)
+                it.customizationArn(customizationArn.nullize(nullizeSpaces = true))
                 // deprecated field, service side should not use this % anymore
                 it.modificationPercentage(0.0)
                 it.timestamp(Instant.now())
@@ -760,9 +761,7 @@ open class CodeWhispererClientAdaptorImpl(override val project: Project) : CodeW
                 it.responseLength(responseLength)
                 it.numberOfCodeBlocks(numberOfCodeBlocks)
                 it.hasProjectLevelContext(hasProjectLevelContext)
-                customization?.arn?.let { arn ->
-                    it.customizationArn(arn)
-                }
+                it.customizationArn(customization?.arn.nullize(nullizeSpaces = true))
             }
         }
         requestBuilder.optOutPreference(getTelemetryOptOutPreference())
@@ -815,9 +814,7 @@ open class CodeWhispererClientAdaptorImpl(override val project: Project) : CodeW
                 }
                 it.modificationPercentage(modificationPercentage)
                 it.hasProjectLevelContext(hasProjectLevelContext)
-                customization?.arn?.let { arn ->
-                    it.customizationArn(arn)
-                }
+                it.customizationArn(customization?.arn.nullize(nullizeSpaces = true))
             }
         }
         requestBuilder.optOutPreference(getTelemetryOptOutPreference())
diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/popup/CodeWhispererPopupManager.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/popup/CodeWhispererPopupManager.kt
@@ -3,6 +3,7 @@
 
 package software.aws.toolkits.jetbrains.services.codewhisperer.popup
 
+import com.intellij.codeInsight.hint.ParameterInfoController
 import com.intellij.codeInsight.lookup.LookupManager
 import com.intellij.codeInsight.lookup.LookupManagerListener
 import com.intellij.idea.AppMode
@@ -640,6 +641,10 @@ class CodeWhispererPopupManager {
         }
     }
 
+    fun hasConflictingPopups(editor: Editor): Boolean =
+        ParameterInfoController.existsWithVisibleHintForEditor(editor, true) ||
+            LookupManager.getActiveLookup(editor) != null
+
     private fun findNewSelectedIndex(
         isReverse: Boolean,
         detailContexts: List<DetailContext>,
diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/service/CodeWhispererService.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/service/CodeWhispererService.kt
@@ -660,6 +660,12 @@ class CodeWhispererService(private val cs: CoroutineScope) : Disposable {
         val recommendations = response.completions()
         val visualPosition = requestContext.editor.caretModel.visualPosition
 
+        if (CodeWhispererPopupManager.getInstance().hasConflictingPopups(requestContext.editor)) {
+            LOG.debug { "Detect conflicting popup window with CodeWhisperer popup, not showing CodeWhisperer popup" }
+            sendDiscardedUserDecisionEventForAll(requestContext, responseContext, recommendations)
+            return null
+        }
+
         if (caretMovement == CaretMovement.MOVE_BACKWARD) {
             LOG.debug { "Caret moved backward, discarding all of the recommendations. Request ID: $requestId" }
             sendDiscardedUserDecisionEventForAll(requestContext, responseContext, recommendations)
@@ -851,6 +857,8 @@ class CodeWhispererService(private val cs: CoroutineScope) : Disposable {
     }
 
     private fun addPopupChildDisposables(project: Project, editor: Editor, popup: JBPopup) {
+        codeInsightSettingsFacade.disableCodeInsightUntil(popup)
+
         Disposer.register(popup) {
             CodeWhispererPopupManager.getInstance().reset()
         }
@@ -906,6 +914,11 @@ class CodeWhispererService(private val cs: CoroutineScope) : Disposable {
             return false
         }
 
+        if (CodeWhispererPopupManager.getInstance().hasConflictingPopups(editor)) {
+            LOG.debug { "Find other active popup windows before triggering CodeWhisperer, not invoking service" }
+            return false
+        }
+
         if (CodeWhispererInvocationStatus.getInstance().isDisplaySessionActive()) {
             LOG.debug { "Find an existing CodeWhisperer popup window before triggering CodeWhisperer, not invoking service" }
             return false
diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/settings/CodeWhispererConfigurable.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/settings/CodeWhispererConfigurable.kt
@@ -13,7 +13,6 @@ import com.intellij.openapi.project.Project
 import com.intellij.ui.components.ActionLink
 import com.intellij.ui.components.fields.ExpandableTextField
 import com.intellij.ui.dsl.builder.bindIntText
-import com.intellij.ui.dsl.builder.bindItem
 import com.intellij.ui.dsl.builder.bindSelected
 import com.intellij.ui.dsl.builder.bindText
 import com.intellij.ui.dsl.builder.panel
@@ -98,17 +97,6 @@ class CodeWhispererConfigurable(private val project: Project) :
                 }.comment(message("aws.settings.codewhisperer.automatic_import_adder.tooltip"))
             }
 
-            row {
-                text(message("codewhisperer.inline.settings.tab_priority.prefix"))
-                val amazonq = message("codewhisperer.inline.settings.tab_priority.choice.amazonq")
-                val jetbrains = message("codewhisperer.inline.settings.tab_priority.choice.jetbrains")
-                comboBox(listOf(amazonq, jetbrains)).bindItem(
-                    { if (CodeWhispererSettings.getInstance().isQPrioritizedForTabAccept()) amazonq else jetbrains },
-                    { CodeWhispererSettings.getInstance().setQPrioritizedForTabAccept(it == amazonq) }
-                )
-                text(message("codewhisperer.inline.settings.tab_priority.suffix"))
-            }
-
             row {
                 link("Configure inline suggestion keybindings") { e ->
                     // TODO: user needs feedback if these are null
diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/telemetry/CodeWhispererUserModificationTracker.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/telemetry/CodeWhispererUserModificationTracker.kt
@@ -135,7 +135,7 @@ class CodeWhispererUserModificationTracker(private val project: Project) : Dispo
     }
 
     private fun emitTelemetryOnChatCodeInsert(insertedCode: InsertedCodeModificationEntry) {
-        try {
+        val modificationPercentage = try {
             val file = insertedCode.vFile
             if (file == null || (!file.isValid)) throw Exception("Record OnChatCodeInsert - invalid file")
 
@@ -145,11 +145,12 @@ class CodeWhispererUserModificationTracker(private val project: Project) : Dispo
             val currentString = document?.getText(
                 TextRange(insertedCode.range.startOffset, insertedCode.range.endOffset)
             )
-            val modificationPercentage = checkDiff(currentString?.trim(), insertedCode.originalString.trim())
-            sendModificationWithChatTelemetry(insertedCode, modificationPercentage)
+            checkDiff(currentString?.trim(), insertedCode.originalString.trim())
         } catch (e: Exception) {
-            sendModificationWithChatTelemetry(insertedCode, null)
+            null
         }
+
+        sendModificationWithChatTelemetry(insertedCode, modificationPercentage)
     }
 
     private fun emitTelemetryOnSuggestion(acceptedSuggestion: AcceptedSuggestionEntry) {
@@ -264,7 +265,7 @@ class CodeWhispererUserModificationTracker(private val project: Project) : Dispo
                         suggestion.sessionId,
                         suggestion.requestId,
                         CodeWhispererLanguageManager.getInstance().getLanguage(suggestion.vFile),
-                        CodeWhispererModelConfigurator.getInstance().activeCustomization(project)?.arn.orEmpty(),
+                        CodeWhispererModelConfigurator.getInstance().activeCustomization(project)?.arn,
                         suggestion.suggestion.length,
                         getUnmodifiedAcceptedCharsCount(suggestion.suggestion, modifiedSuggestion)
                     )
diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codewhisperer/CodeWhispererConfigurableTest.kt b/plugins/amazonq/codewhisperer/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codewhisperer/CodeWhispererConfigurableTest.kt
@@ -49,7 +49,7 @@ class CodeWhispererConfigurableTest : CodeWhispererTestBase() {
         )
 
         val comments = panel.components.filterIsInstance<DslLabel>()
-        assertThat(comments.size).isEqualTo(10)
+        assertThat(comments.size).isEqualTo(8)
 
         mockCodeWhispererEnabledStatus(false)
         ApplicationManager.getApplication().messageBus.syncPublisher(ToolkitConnectionManagerListener.TOPIC)
diff --git a/plugins/core/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties b/plugins/core/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties

Original file line number	Diff line number	Diff line change
`@@ -122,10 +122,9 @@ class CodeModernizerManager(private val project: Project) : PersistentStateCompo`
`122`	`122`	`}`
`123`	`123`	`private val artifactHandler = ArtifactHandler(project, GumbyClient.getInstance(project))`
`124`	`124`	`private val supportedJavaMappings = mapOf(`
`125`		`- JavaSdkVersion.JDK_1_8 to setOf(JavaSdkVersion.JDK_17, JavaSdkVersion.JDK_21),`
`126`		`- JavaSdkVersion.JDK_11 to setOf(JavaSdkVersion.JDK_17, JavaSdkVersion.JDK_21),`
`127`		`- JavaSdkVersion.JDK_17 to setOf(JavaSdkVersion.JDK_17, JavaSdkVersion.JDK_21),`
`128`		`- JavaSdkVersion.JDK_21 to setOf(JavaSdkVersion.JDK_21),`
	`125`	`+ JavaSdkVersion.JDK_1_8 to setOf(JavaSdkVersion.JDK_17),`
	`126`	`+ JavaSdkVersion.JDK_11 to setOf(JavaSdkVersion.JDK_17),`
	`127`	`+ JavaSdkVersion.JDK_17 to setOf(JavaSdkVersion.JDK_17),`
`129`	`128`	`)`
`130`	`129`
`131`	`130`	`init {`
Original file line number	Diff line number	Diff line change
`@@ -179,10 +179,6 @@ private val selectTargetVersionFormItem = FormItem(`
`179`	`179`	`FormItemOption(`
`180`	`180`	`label = JavaSdkVersion.JDK_17.toString(),`
`181`	`181`	`value = JavaSdkVersion.JDK_17.toString(),`
`182`		`- ),`
`183`		`- FormItemOption(`
`184`		`- label = JavaSdkVersion.JDK_21.toString(),`
`185`		`- value = JavaSdkVersion.JDK_21.toString(),`
`186`	`182`	`)`
`187`	`183`	`)`
`188`	`184`	`)`