Merge branch 'main' into fixError

Author: dhasani23

.changes/3.53.json

@@ -0,0 +1,8 @@
+{
+  "date" : "2025-02-07",
+  "version" : "3.53",
+  "entries" : [ {
+    "type" : "bugfix",
+    "description" : "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."
+  } ]
+}

CHANGELOG.md

@@ -1,3 +1,6 @@
+# _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.
+
 # _3.52_ (2025-02-06)
 - **(Feature)** Adds event listener for notifying UI that AB feature configurations have been resolved
 - **(Feature)** Amazon Q /review: Code issues can now be grouped by severity or file location.

gradle.properties

@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # Toolkit Version
-toolkitVersion=3.53-SNAPSHOT
+toolkitVersion=3.54-SNAPSHOT
 
 # Publish Settings
 publishToken=

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/popup/CodeWhispererPopupManager.kt

@@ -41,11 +41,9 @@ import com.intellij.ui.popup.AbstractPopup
 import com.intellij.ui.popup.PopupFactoryImpl
 import com.intellij.util.messages.Topic
 import com.intellij.util.ui.UIUtil
-import kotlinx.coroutines.sync.Semaphore
 import software.amazon.awssdk.services.codewhispererruntime.model.Import
 import software.amazon.awssdk.services.codewhispererruntime.model.Reference
 import software.aws.toolkits.core.utils.debug
-import software.aws.toolkits.core.utils.error
 import software.aws.toolkits.core.utils.getLogger
 import software.aws.toolkits.jetbrains.services.codewhisperer.editor.CodeWhispererEditorManager
 import software.aws.toolkits.jetbrains.services.codewhisperer.layout.CodeWhispererLayoutConfig.addHorizontalGlue
@@ -88,8 +86,8 @@ import javax.swing.JLabel
 class CodeWhispererPopupManager {
     val popupComponents = CodeWhispererPopupComponents()
 
-    // Act like a semaphore: one increment only corresponds to one decrement
-    var allowEditsDuringSuggestionPreview = Semaphore(MAX_EDIT_SOURCE_DURING_SUGGESTION_PREVIEW)
+    var allowTypingDuringSuggestionPreview = false
+    var allowIntelliSenseDuringSuggestionPreview = false
     var sessionContext = SessionContext()
         private set
 
@@ -251,18 +249,11 @@ class CodeWhispererPopupManager {
 
     // Don't want to block or throw any kinds of exceptions here if it can continue to provide suggestions
     fun dontClosePopupAndRun(runnable: () -> Unit) {
-        if (allowEditsDuringSuggestionPreview.tryAcquire()) {
-            try {
-                runnable()
-            } finally {
-                try {
-                    allowEditsDuringSuggestionPreview.release()
-                } catch (e: Exception) {
-                    LOG.error(e) { "Failed to release allowEditsDuringSuggestionPreview semaphore" }
-                }
-            }
-        } else {
-            LOG.error { "Failed to acquire allowEditsDuringSuggestionPreview semaphore" }
+        try {
+            allowTypingDuringSuggestionPreview = true
+            runnable()
+        } finally {
+            allowTypingDuringSuggestionPreview = false
         }
     }
 
@@ -511,7 +502,7 @@ class CodeWhispererPopupManager {
         val editor = states.requestContext.editor
         val codewhispererSelectionListener: SelectionListener = object : SelectionListener {
             override fun selectionChanged(event: SelectionEvent) {
-                if (allowEditsDuringSuggestionPreview.availablePermits == MAX_EDIT_SOURCE_DURING_SUGGESTION_PREVIEW) {
+                if (!allowTypingDuringSuggestionPreview && !allowIntelliSenseDuringSuggestionPreview) {
                     cancelPopup(states.popup)
                 }
                 super.selectionChanged(event)
@@ -527,7 +518,7 @@ class CodeWhispererPopupManager {
                 if (!delete) return
                 if (editor.caretModel.offset == event.offset) {
                     changeStates(states, 0)
-                } else if (allowEditsDuringSuggestionPreview.availablePermits == MAX_EDIT_SOURCE_DURING_SUGGESTION_PREVIEW) {
+                } else if (!allowTypingDuringSuggestionPreview && !allowIntelliSenseDuringSuggestionPreview) {
                     cancelPopup(states.popup)
                 }
             }
@@ -536,7 +527,7 @@ class CodeWhispererPopupManager {
 
         val codewhispererCaretListener: CaretListener = object : CaretListener {
             override fun caretPositionChanged(event: CaretEvent) {
-                if (allowEditsDuringSuggestionPreview.availablePermits == MAX_EDIT_SOURCE_DURING_SUGGESTION_PREVIEW) {
+                if (!allowTypingDuringSuggestionPreview && !allowIntelliSenseDuringSuggestionPreview) {
                     cancelPopup(states.popup)
                 }
                 super.caretPositionChanged(event)

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/popup/listeners/CodeWhispererPopupIntelliSenseAcceptListener.kt

@@ -8,11 +8,10 @@ import com.intellij.codeInsight.lookup.LookupEvent
 import com.intellij.codeInsight.lookup.LookupListener
 import com.intellij.codeInsight.lookup.LookupManagerListener
 import com.intellij.codeInsight.lookup.impl.LookupImpl
-import software.aws.toolkits.core.utils.error
+import com.intellij.openapi.util.Disposer
 import software.aws.toolkits.core.utils.getLogger
 import software.aws.toolkits.jetbrains.services.codewhisperer.model.InvocationContext
 import software.aws.toolkits.jetbrains.services.codewhisperer.popup.CodeWhispererPopupManager
-import software.aws.toolkits.jetbrains.services.codewhisperer.popup.listeners.CodeWhispererPopupIntelliSenseAcceptListener.Companion.LOG
 import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispererInvocationStatus
 
 class CodeWhispererPopupIntelliSenseAcceptListener(private val states: InvocationContext) : LookupManagerListener {
@@ -28,10 +27,8 @@ class CodeWhispererPopupIntelliSenseAcceptListener(private val states: Invocatio
 }
 
 fun addIntelliSenseAcceptListener(lookup: Lookup, states: InvocationContext) {
-    if (!CodeWhispererPopupManager.getInstance().allowEditsDuringSuggestionPreview.tryAcquire()) {
-        LOG.error { "Failed to acquire allowEditsDuringSuggestionPreview semaphore" }
-    }
-    lookup.addLookupListener(object : LookupListener {
+    CodeWhispererPopupManager.getInstance().allowIntelliSenseDuringSuggestionPreview = true
+    val listener = object : LookupListener {
         override fun itemSelected(event: LookupEvent) {
             if (!CodeWhispererInvocationStatus.getInstance().isDisplaySessionActive() ||
                 !(event.lookup as LookupImpl).isShown
@@ -52,11 +49,12 @@ fun addIntelliSenseAcceptListener(lookup: Lookup, states: InvocationContext) {
 
         private fun cleanup() {
             lookup.removeLookupListener(this)
-            try {
-                CodeWhispererPopupManager.getInstance().allowEditsDuringSuggestionPreview.release()
-            } catch (e: Exception) {
-                LOG.error(e) { "Failed to release allowEditsDuringSuggestionPreview semaphore" }
-            }
+            CodeWhispererPopupManager.getInstance().allowIntelliSenseDuringSuggestionPreview = false
         }
-    })
+    }
+    lookup.addLookupListener(listener)
+    Disposer.register(states) {
+        lookup.removeLookupListener(listener)
+        CodeWhispererPopupManager.getInstance().allowIntelliSenseDuringSuggestionPreview = false
+    }
 }