don't send all rejects for a display session

Author: andrewyuq

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/telemetry/CodeWhispererTelemetryService.kt

@@ -393,6 +393,7 @@ class CodeWhispererTelemetryService {
         hasUserAccepted: Boolean,
         popupShownTime: Duration? = null,
     ) {
+        var hasSentRejectedTrigger = false
         CodeWhispererService.getInstance().getAllPaginationSessions().forEach { (jobId, state) ->
             if (state == null) return@forEach
             val details = state.recommendationContext.details
@@ -405,9 +406,15 @@ class CodeWhispererTelemetryService {
             }
             LOG.debug { "jobId: $jobId, userDecisions: [${decisions.joinToString(", ")}]" }
 
-            with(aggregateUserDecision(decisions)) {
+            with(aggregateUserDecision(decisions, hasSentRejectedTrigger)) {
                 // the order of the following matters
                 // step 1, send out current decision
+
+                // if we have sent one reject in this display session(which can contain multiple triggers),
+                // we will not send rejects for the remaining triggers in this display session.
+                if (this == CodewhispererSuggestionState.Reject) {
+                    hasSentRejectedTrigger = true
+                }
                 LOG.debug { "jobId: $jobId, userTriggerDecision: $this" }
                 previousUserTriggerDecisionTimestamp = Instant.now()
 
@@ -455,7 +462,10 @@ class CodeWhispererTelemetryService {
      * - Record the accepted suggestion index
      * - Discard otherwise
      */
-    fun aggregateUserDecision(decisions: List<CodewhispererSuggestionState>): CodewhispererSuggestionState {
+    fun aggregateUserDecision(
+        decisions: List<CodewhispererSuggestionState>,
+        hasRejectedTrigger: Boolean,
+    ): CodewhispererSuggestionState {
         var isEmpty = true
         var isUnseen = true
         var isDiscard = true
@@ -464,7 +474,11 @@ class CodeWhispererTelemetryService {
             if (decision == CodewhispererSuggestionState.Accept) {
                 return CodewhispererSuggestionState.Accept
             } else if (decision == CodewhispererSuggestionState.Reject) {
-                return CodewhispererSuggestionState.Reject
+                return if (!hasRejectedTrigger) {
+                    CodewhispererSuggestionState.Reject
+                } else {
+                    CodewhispererSuggestionState.Ignore
+                }
             } else if (decision == CodewhispererSuggestionState.Unseen) {
                 isEmpty = false
                 isDiscard = false

plugins/amazonq/codewhisperer/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codewhisperer/CodeWhispererServiceTest.kt

@@ -10,7 +10,6 @@ import com.intellij.testFramework.DisposableRule
 import com.intellij.testFramework.replaceService
 import com.intellij.testFramework.runInEdtAndWait
 import kotlinx.coroutines.async
-import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.test.runTest
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.After
@@ -23,6 +22,7 @@ import org.mockito.kotlin.argumentCaptor
 import org.mockito.kotlin.doReturn
 import org.mockito.kotlin.mock
 import org.mockito.kotlin.spy
+import org.mockito.kotlin.timeout
 import org.mockito.kotlin.times
 import org.mockito.kotlin.verify
 import org.mockito.kotlin.whenever
@@ -191,11 +191,9 @@ class CodeWhispererServiceTest {
             )
         )
 
-        runBlocking {
-            sut.invokeCodeWhispererInBackground(mockRequestContext, 0, LatencyContext())
-        }
+        sut.invokeCodeWhispererInBackground(mockRequestContext, 0, LatencyContext())
 
-        verify(mockRequestContext, times(1)).awaitSupplementalContext()
+        verify(mockRequestContext, timeout(5000).atLeastOnce()).awaitSupplementalContext()
         verify(clientFacade).generateCompletionsPaginator(any())
 
         argumentCaptor<GenerateCompletionsRequest> {