bug fix(amazonq): fix an issue where user action is accept but telemetry is reject

Author: andrewyuq

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

@@ -85,7 +85,8 @@ import javax.swing.JLabel
 class CodeWhispererPopupManager {
     val popupComponents = CodeWhispererPopupComponents()
 
-    var shouldListenerCancelPopup: Boolean = true
+    // Act like a semaphore: one increment only corresponds to one decrement
+    var shouldEditorChangeCancelPopup: Int = 0
     var sessionContext = SessionContext()
         private set
 
@@ -247,10 +248,16 @@ class CodeWhispererPopupManager {
 
     fun dontClosePopupAndRun(runnable: () -> Unit) {
         try {
-            shouldListenerCancelPopup = false
+            shouldEditorChangeCancelPopup++
+            LOG.debug { "Incrementing shouldListenerCancelPopup semaphore value" }
             runnable()
         } finally {
-            shouldListenerCancelPopup = true
+            if (shouldEditorChangeCancelPopup <= 0) {
+                LOG.error("shouldListenerCancelPopup semaphore is not updated correctly")
+            } else {
+                shouldEditorChangeCancelPopup--
+                LOG.debug { "Decrementing shouldListenerCancelPopup semaphore value" }
+            }
         }
     }
 
@@ -496,7 +503,7 @@ class CodeWhispererPopupManager {
         val editor = states.requestContext.editor
         val codewhispererSelectionListener: SelectionListener = object : SelectionListener {
             override fun selectionChanged(event: SelectionEvent) {
-                if (shouldListenerCancelPopup) {
+                if (shouldEditorChangeCancelPopup == 0) {
                     cancelPopup(states.popup)
                 }
                 super.selectionChanged(event)
@@ -512,7 +519,7 @@ class CodeWhispererPopupManager {
                 if (!delete) return
                 if (editor.caretModel.offset == event.offset) {
                     changeStates(states, 0)
-                } else if (shouldListenerCancelPopup) {
+                } else if (shouldEditorChangeCancelPopup == 0) {
                     cancelPopup(states.popup)
                 }
             }
@@ -521,7 +528,7 @@ class CodeWhispererPopupManager {
 
         val codewhispererCaretListener: CaretListener = object : CaretListener {
             override fun caretPositionChanged(event: CaretEvent) {
-                if (shouldListenerCancelPopup) {
+                if (shouldEditorChangeCancelPopup == 0) {
                     cancelPopup(states.popup)
                 }
                 super.caretPositionChanged(event)

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

@@ -8,8 +8,11 @@ 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.debug
+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 {
@@ -18,14 +21,20 @@ class CodeWhispererPopupIntelliSenseAcceptListener(private val states: Invocatio
 
         addIntelliSenseAcceptListener(newLookup, states)
     }
+
+    companion object {
+        val LOG = getLogger<CodeWhispererPopupIntelliSenseAcceptListener>()
+    }
 }
 
 fun addIntelliSenseAcceptListener(lookup: Lookup, states: InvocationContext) {
     lookup.addLookupListener(object : LookupListener {
-        override fun beforeItemSelected(event: LookupEvent): Boolean {
-            CodeWhispererPopupManager.getInstance().shouldListenerCancelPopup = false
-            return super.beforeItemSelected(event)
+        override fun lookupShown(event: LookupEvent) {
+            CodeWhispererPopupManager.getInstance().shouldEditorChangeCancelPopup++
+            LOG.debug { "Incrementing shouldListenerCancelPopup semaphore value" }
+            super.lookupShown(event)
         }
+
         override fun itemSelected(event: LookupEvent) {
             if (!CodeWhispererInvocationStatus.getInstance().isDisplaySessionActive() ||
                 !(event.lookup as LookupImpl).isShown
@@ -46,7 +55,12 @@ fun addIntelliSenseAcceptListener(lookup: Lookup, states: InvocationContext) {
 
         private fun cleanup() {
             lookup.removeLookupListener(this)
-            CodeWhispererPopupManager.getInstance().shouldListenerCancelPopup = true
+            if (CodeWhispererPopupManager.getInstance().shouldEditorChangeCancelPopup <= 0) {
+                LOG.error("shouldListenerCancelPopup semaphore is not updated correctly")
+            } else {
+                CodeWhispererPopupManager.getInstance().shouldEditorChangeCancelPopup--
+                LOG.debug { "Decrementing shouldListenerCancelPopup semaphore value" }
+            }
         }
     })
 }