use executeAsyncIfRunning

Author: andrewyuq

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

@@ -326,13 +326,15 @@ class QInlineCompletionProvider(private val cs: CoroutineScope) : InlineCompleti
                             }
                         }
                     }
-                    CodeWhispererTelemetryService.getInstance().sendUserTriggerDecisionEventForTriggerSession(
-                        project,
-                        latencyContext,
-                        sessionContext,
-                        triggerSessionId,
-                    )
-                    activeTriggerSessions.remove(triggerSessionId)
+                    cs.launch {
+                        CodeWhispererTelemetryService.getInstance().sendUserTriggerDecisionEventForTriggerSession(
+                            project,
+                            latencyContext,
+                            sessionContext,
+                            triggerSessionId,
+                        )
+                        activeTriggerSessions.remove(triggerSessionId)
+                    }
                 }
             },
             session
@@ -492,7 +494,7 @@ class QInlineCompletionProvider(private val cs: CoroutineScope) : InlineCompleti
                 "Fetching next paginated results with token: ${nextToken?.left}"
             }
 
-            val nextPageResult = AmazonQLspService.executeIfRunning(project) { server ->
+            val nextPageResult = AmazonQLspService.executeAsyncIfRunning(project) { server ->
                 val params = createInlineCompletionParams(editor, triggerTypeInfo, nextToken)
                 server.inlineCompletionWithReferences(params)
             }?.await() ?: run {

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

@@ -70,7 +70,7 @@ class CodeWhispererTelemetryService(private val cs: CoroutineScope) {
         }
     }
 
-    fun sendUserTriggerDecisionEventForTriggerSession(
+    suspend fun sendUserTriggerDecisionEventForTriggerSession(
         project: Project,
         latencyContext: LatencyContext,
         sessionContext: InlineCompletionSessionContext,
@@ -112,7 +112,7 @@ class CodeWhispererTelemetryService(private val cs: CoroutineScope) {
             // user input is always 0
             typeaheadLength = 0
         )
-        AmazonQLspService.executeIfRunning(project) { server ->
+        AmazonQLspService.executeAsyncIfRunning(project) { server ->
             server.logInlineCompletionSessionResults(params)
         }
     }

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/toolwindow/CodeWhispererCodeReferenceManager.kt

@@ -128,7 +128,7 @@ class CodeWhispererCodeReferenceManager(private val project: Project) {
     }
 
     fun insertCodeReference(editor: Editor, item: InlineCompletionItem?, offset: Int) {
-        insertCodeReference(item?.insertText ?: "", item?.references, editor, offset)
+        insertCodeReference(item?.insertText.orEmpty(), item?.references, editor, offset)
     }
 
     fun getReferenceLineNums(editor: Editor, start: Int, end: Int): String {