Merge branch 'main' into lodogga/telemetryRefactor

LokeshDogga13 · web-flow · commit 9d6a0ecb5f7c · 2025-02-10T22:22:12.000-08: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/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/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
@@ -633,7 +633,7 @@ codemodernizer.chat.message.button.view_diff=View diff
 codemodernizer.chat.message.button.view_failure_build_log=View build log
 codemodernizer.chat.message.button.view_summary=View summary
 codemodernizer.chat.message.changes_applied=I applied the changes to your project.
-codemodernizer.chat.message.choose_objective=I can help you with the following tasks:\n- Upgrade your Java 8, Java 11, and Java 17 codebases to Java 17 or Java 21.\n- Upgrade Java 17 or Java 21 code with up-to-date libraries and other dependencies.\n- Convert embedded SQL code for Oracle to PostgreSQL database migrations in AWS DMS.\n\nWhat would you like to do? You can enter "language upgrade" or "sql conversion".
+codemodernizer.chat.message.choose_objective=I can help you with the following tasks:\n- Upgrade your Java 8 and Java 11 codebases to Java 17.\n- Upgrade Java 17 code with up-to-date libraries and other dependencies.\n- Convert embedded SQL code for Oracle to PostgreSQL database migrations in AWS DMS.\n\nWhat would you like to do? You can enter "language upgrade" or "sql conversion".
 codemodernizer.chat.message.choose_objective_placeholder=Enter "language upgrade" or "sql conversion"
 codemodernizer.chat.message.download_failed_client_instructions_expired=Your transformation is not available anymore. Your code and transformation summary are deleted 24 hours after the transformation completes. Please try starting the transformation again.
 codemodernizer.chat.message.download_failed_invalid_artifact=Sorry, I was unable to find your {0}. Artifacts are deleted after 24 hours. Please try starting the transformation again.
@@ -703,8 +703,8 @@ codemodernizer.chat.message.validation.error.invalid_target_db=I can only conver
 codemodernizer.chat.message.validation.error.missing_sct_file=An .sct file is required for transformation. Make sure that you've uploaded the .zip file you retrieved from your schema conversion in AWS DMS.
 codemodernizer.chat.message.validation.error.more_info=For more information, see the [Amazon Q documentation]({0}).
 codemodernizer.chat.message.validation.error.no_java_project=Sorry, I could not find an open Java module with embedded Oracle SQL statements. Make sure you have a Java module open that has at least 1 content root.
-codemodernizer.chat.message.validation.error.other=I couldn't find a module that I can upgrade. Currently, I support Java 8, Java 11, Java 17, and Java 21 projects built on Maven. Make sure your project is open in the IDE. If you have a Java 8, Java 11, Java 17, or Java 21 module in your workspace, you might need to configure your project so that I can find it. Go to File and choose Project Structure. In the Projects tab, set the correct project JDK and the correct language level. In the Modules tab, set the correct module JDK and language level.
-codemodernizer.chat.message.validation.error.unsupported_module=I couldn't find a module that I can upgrade. Currently, I support Java 8, Java 11, Java 17, and Java 21 projects built on Maven. Make sure your project is open in the IDE. If you have a Java 8, Java 11, Java 17, or Java 21 in your workspace, you might need to configure your project so that I can find it. Go to File and choose Project Structure. In the Projects tab, set the correct project JDK and the correct language level. In the Modules tab, set the correct module JDK and language level.
+codemodernizer.chat.message.validation.error.other=I couldn't find a module that I can upgrade. Currently, I support Java 8, Java 11, and Java 17 projects built on Maven. Make sure your project is open in the IDE. If you have a Java 8, Java 11, or Java 17 module in your workspace, you might need to configure your project so that I can find it. Go to File and choose Project Structure. In the Projects tab, set the correct project JDK and the correct language level. In the Modules tab, set the correct module JDK and language level.
+codemodernizer.chat.message.validation.error.unsupported_module=I couldn't find a module that I can upgrade. Currently, I support Java 8, Java 11, and Java 17 projects built on Maven. Make sure your project is open in the IDE. If you have a Java 8, Java 11, or Java 17 module in your workspace, you might need to configure your project so that I can find it. Go to File and choose Project Structure. In the Projects tab, set the correct project JDK and the correct language level. In the Modules tab, set the correct module JDK and language level.
 codemodernizer.chat.message.validation.no_jdk=I couldn't build your project with your current JDK configuration. To update your JDK, go to File and choose Project Structure. In the Projects tab, set the correct project JDK in the SDK field. In the Modules tab, set the correct module JDK in the SDK field. In Maven Runner settings, set the correct JDK in the JRE field.
 codemodernizer.chat.prompt.label.dependency_current_version=Current version
 codemodernizer.chat.prompt.label.dependency_name=Dependency name
@@ -778,7 +778,7 @@ codemodernizer.notification.warn.download_failed_other.content=Amazon Q ran into
 codemodernizer.notification.warn.download_failed_ssl.content=Please make sure all your certificates for your proxy client have been set up correctly for your IDE.
 codemodernizer.notification.warn.download_failed_wildcard.content=Check your IDE proxy settings and remove any wildcard (*) references, and then try viewing the diff again.
 codemodernizer.notification.warn.expired_credentials.title=Your connection to Q has expired
-codemodernizer.notification.warn.invalid_project.description.reason.missing_content_roots=None of your open modules are supported for code transformation with Amazon Q. Amazon Q can upgrade Java 8, Java 11, Java 17, and Java 21 projects built on Maven, with content roots configured.
+codemodernizer.notification.warn.invalid_project.description.reason.missing_content_roots=None of your open modules are supported for code transformation with Amazon Q. Amazon Q can upgrade Java 8, Java 11, and Java 17 projects built on Maven, with content roots configured.
 codemodernizer.notification.warn.invalid_project.description.reason.not_logged_in=Amazon Q cannot start the transformation as you are not logged in with Identity Center or Builder ID. Also ensure that you are not using IntelliJ version 232.8660.185 and that you are not developing on a remote host (uncommon).
 codemodernizer.notification.warn.invalid_project.description.reason.remote_backend=None of your open modules are supported for code transformation with Amazon Q. Amazon Q cannot transform modules running on a remote host.
 codemodernizer.notification.warn.maven_failed.content=Amazon Q could not run the Maven clean install command to build your module.

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`	`)`