Merge branch 'main' into openChat

Author: zixlin7

.changes/3.38.json

@@ -0,0 +1,14 @@
+{
+  "date" : "2024-11-07",
+  "version" : "3.38",
+  "entries" : [ {
+    "type" : "bugfix",
+    "description" : "Improve the position that inline chat shortcut hint is shown in editor"
+  }, {
+    "type" : "bugfix",
+    "description" : "Improve `@workspace` index start stop strategy"
+  }, {
+    "type" : "bugfix",
+    "description" : "Fixed an issue where Q inline won't appear in JetBrains remote 2024.2+"
+  } ]
+}

.changes/next-release/bugfix-4fee3628-1445-40f3-b164-2b0d3c12bd19.json

@@ -1,3 +1,8 @@
+# _3.38_ (2024-11-07)
+- **(Bug Fix)** Improve the position that inline chat shortcut hint is shown in editor
+- **(Bug Fix)** Improve `@workspace` index start stop strategy
+- **(Bug Fix)** Fixed an issue where Q inline won't appear in JetBrains remote 2024.2+
+
 # _3.37_ (2024-10-31)
 - **(Bug Fix)** Amazon Q /dev: Fix the issue resulting in the first request per conversation to /dev failing
 - **(Bug Fix)** Fix inline chat shortcut hint breaking text selection on remote editors

CHANGELOG.md

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

gradle.properties

@@ -19,23 +19,26 @@ import javax.swing.JPanel
 
 class InlineChatEditorHint {
     private val hint = createHint()
+    private val hintXOffset = 20
 
     private fun getHintLocation(editor: Editor): Point {
         val range = editor.calculateVisibleRange()
         val document = editor.document
         val selectionEnd = editor.selectionModel.selectionEnd
         val isOneLineSelection = isOneLineSelection(editor)
-        val isBelow = editor.offsetToXY(selectionEnd) !in editor.scrollingModel.visibleArea
+        val offset = document.getLineEndOffset(document.getLineNumber(selectionEnd))
+        val offsetXy = editor.offsetToXY(offset)
+        val potentialXy = Point(offsetXy.x + hintXOffset, offsetXy.y)
+        val isBelow = potentialXy !in editor.scrollingModel.visibleArea
         val areEdgesOutsideOfVisibleArea = editor.selectionModel.selectionStart !in range && editor.selectionModel.selectionEnd !in range
         val offsetForHint = when {
-            isOneLineSelection -> selectionEnd
             areEdgesOutsideOfVisibleArea -> document.getLineEndOffset(getLineByVisualStart(editor, editor.caretModel.offset, true))
             isBelow -> document.getLineEndOffset(getLineByVisualStart(editor, selectionEnd, true))
             else -> document.getLineEndOffset(getLineByVisualStart(editor, selectionEnd, false))
         }
         val visualPosition = editor.offsetToVisualPosition(offsetForHint)
-        val hintPoint = HintManagerImpl.getHintPosition(hint, editor, visualPosition, HintManager.RIGHT)
-        hintPoint.translate(0, if (isBelow) editor.lineHeight else 0)
+        val hintPoint = HintManagerImpl.getHintPosition(hint, editor, visualPosition, HintManager.RIGHT_UNDER)
+        hintPoint.translate(if (!isBelow) hintXOffset else 0, if (!isOneLineSelection || isBelow) editor.lineHeight else 0)
         return hintPoint
     }
 

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/controller/chat/telemetry/TelemetryHelper.kt

@@ -24,60 +24,68 @@ sealed interface CwcMessage : AmazonQMessage
 
 // === UI -> App Messages ===
 sealed interface IncomingCwcMessage : CwcMessage {
+    interface TabId {
+        val tabId: String?
+    }
+
+    interface MessageId {
+        val messageId: String?
+    }
+
     data class ClearChat(
-        @JsonProperty("tabID") val tabId: String,
-    ) : IncomingCwcMessage
+        @JsonProperty("tabID") override val tabId: String,
+    ) : IncomingCwcMessage, TabId
 
     data class Help(
-        @JsonProperty("tabID") val tabId: String,
-    ) : IncomingCwcMessage
+        @JsonProperty("tabID") override val tabId: String,
+    ) : IncomingCwcMessage, TabId
 
     data class ChatPrompt(
         val chatMessage: String,
         val command: String,
-        @JsonProperty("tabID") val tabId: String,
+        @JsonProperty("tabID") override val tabId: String,
         val userIntent: String?,
-    ) : IncomingCwcMessage
+    ) : IncomingCwcMessage, TabId
 
     data class TabAdded(
-        @JsonProperty("tabID") val tabId: String,
+        @JsonProperty("tabID") override val tabId: String,
         val tabType: String,
-    ) : IncomingCwcMessage
+    ) : IncomingCwcMessage, TabId
 
     data class TabRemoved(
-        @JsonProperty("tabID") val tabId: String,
+        @JsonProperty("tabID") override val tabId: String,
         val tabType: String,
-    ) : IncomingCwcMessage
+    ) : IncomingCwcMessage, TabId
 
     data class TabChanged(
-        @JsonProperty("tabID") val tabId: String,
+        @JsonProperty("tabID") override val tabId: String,
         @JsonProperty("prevTabID") val prevTabId: String?,
-    ) : IncomingCwcMessage
+    ) : IncomingCwcMessage, TabId
 
     data class FollowupClicked(
         val followUp: FollowUp,
-        @JsonProperty("tabID") val tabId: String,
-        val messageId: String?,
+        @JsonProperty("tabID") override val tabId: String,
+        override val messageId: String?,
         val command: String,
         val tabType: String,
-    ) : IncomingCwcMessage
+    ) : IncomingCwcMessage, TabId, MessageId
 
     data class CopyCodeToClipboard(
         val command: String?,
-        @JsonProperty("tabID") val tabId: String,
-        val messageId: String,
+        @JsonProperty("tabID") override val tabId: String,
+        override val messageId: String,
         val userIntent: UserIntent?,
         val code: String,
         val insertionTargetType: String?,
         val eventId: String?,
         val codeBlockIndex: Int?,
         val totalCodeBlocks: Int?,
         val codeBlockLanguage: String?,
-    ) : IncomingCwcMessage
+    ) : IncomingCwcMessage, TabId, MessageId
 
     data class InsertCodeAtCursorPosition(
-        @JsonProperty("tabID") val tabId: String,
-        val messageId: String,
+        @JsonProperty("tabID") override val tabId: String,
+        override val messageId: String,
         val userIntent: UserIntent?,
         val code: String,
         val insertionTargetType: String?,
@@ -86,29 +94,29 @@ sealed interface IncomingCwcMessage : CwcMessage {
         val codeBlockIndex: Int?,
         val totalCodeBlocks: Int?,
         val codeBlockLanguage: String?,
-    ) : IncomingCwcMessage
+    ) : IncomingCwcMessage, TabId, MessageId
 
     data class TriggerTabIdReceived(
         @JsonProperty("triggerID") val triggerId: String,
-        @JsonProperty("tabID") val tabId: String,
-    ) : IncomingCwcMessage
+        @JsonProperty("tabID") override val tabId: String,
+    ) : IncomingCwcMessage, TabId
 
     data class StopResponse(
-        @JsonProperty("tabID") val tabId: String,
-    ) : IncomingCwcMessage
+        @JsonProperty("tabID") override val tabId: String,
+    ) : IncomingCwcMessage, TabId
 
     data class ChatItemVoted(
-        @JsonProperty("tabID") val tabId: String,
-        val messageId: String,
+        @JsonProperty("tabID") override val tabId: String,
+        override val messageId: String,
         val vote: String, // upvote / downvote
-    ) : IncomingCwcMessage
+    ) : IncomingCwcMessage, TabId, MessageId
 
     data class ChatItemFeedback(
-        @JsonProperty("tabID") val tabId: String,
+        @JsonProperty("tabID") override val tabId: String,
         val selectedOption: String,
         val comment: String?,
-        val messageId: String,
-    ) : IncomingCwcMessage
+        override val messageId: String,
+    ) : IncomingCwcMessage, TabId, MessageId
 
     data class UIFocus(
         val command: String,
@@ -119,19 +127,19 @@ sealed interface IncomingCwcMessage : CwcMessage {
 
     data class ClickedLink(
         @JsonProperty("command") val type: LinkType,
-        @JsonProperty("tabID") val tabId: String,
-        val messageId: String?,
+        @JsonProperty("tabID") override val tabId: String,
+        override val messageId: String?,
         val link: String,
-    ) : IncomingCwcMessage
+    ) : IncomingCwcMessage, TabId, MessageId
 
     data class AuthFollowUpWasClicked(
-        @JsonProperty("tabID") val tabId: String,
+        @JsonProperty("tabID") override val tabId: String,
         val authType: AuthFollowUpType,
-    ) : IncomingCwcMessage
+    ) : IncomingCwcMessage, TabId
 
     data class OpenSettings(
-        @JsonProperty("tabID") val tabId: String? = null,
-    ) : IncomingCwcMessage
+        @JsonProperty("tabID") override val tabId: String? = null,
+    ) : IncomingCwcMessage, TabId
 }
 
 enum class FocusType {

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/inline/InlineChatEditorHint.kt

@@ -22,6 +22,7 @@ import org.mockito.kotlin.doReturn
 import org.mockito.kotlin.eq
 import org.mockito.kotlin.mock
 import org.mockito.kotlin.stub
+import org.mockito.kotlin.times
 import org.mockito.kotlin.verify
 import software.amazon.awssdk.awscore.DefaultAwsResponseMetadata
 import software.amazon.awssdk.awscore.util.AwsHeader.AWS_REQUEST_ID
@@ -608,7 +609,7 @@ class TelemetryHelperTest {
 
         // Toolkit telemetry
         argumentCaptor<MetricEvent> {
-            verify(mockBatcher).enqueue(capture())
+            verify(mockBatcher, times(2)).enqueue(capture())
             val event = firstValue.data.find { it.name == "feedback_result" }
             assertNotNull(event)
             assertThat(event).matches { it.metadata["result"] == "Succeeded" }

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/messages/CwcMessage.kt

@@ -46,6 +46,7 @@ import software.aws.toolkits.core.utils.debug
 import software.aws.toolkits.core.utils.getLogger
 import software.aws.toolkits.core.utils.info
 import software.aws.toolkits.core.utils.warn
+import software.aws.toolkits.jetbrains.core.coroutines.EDT
 import software.aws.toolkits.jetbrains.core.coroutines.disposableCoroutineScope
 import software.aws.toolkits.jetbrains.core.coroutines.getCoroutineBgContext
 import software.aws.toolkits.jetbrains.core.coroutines.projectCoroutineScope
@@ -206,9 +207,12 @@ class CodeWhispererService(private val cs: CoroutineScope) : Disposable {
         invokeCodeWhispererInBackground(requestContext)
     }
 
-    internal fun invokeCodeWhispererInBackground(requestContext: RequestContext): Job {
-        val popup = CodeWhispererPopupManager.getInstance().initPopup()
-        Disposer.register(popup) { CodeWhispererInvocationStatus.getInstance().finishInvocation() }
+    internal suspend fun invokeCodeWhispererInBackground(requestContext: RequestContext): Job {
+        val popup = withContext(EDT) {
+            CodeWhispererPopupManager.getInstance().initPopup().also {
+                Disposer.register(it) { CodeWhispererInvocationStatus.getInstance().finishInvocation() }
+            }
+        }
 
         val workerContexts = mutableListOf<WorkerContext>()
         // When popup is disposed we will cancel this coroutine. The only places popup can get disposed should be

plugins/amazonq/chat/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/amazonq/TelemetryHelperTest.kt

@@ -755,25 +755,6 @@
             ],
             "passive": true
         },
-        {
-            "name": "auth_userState",
-            "description": "The state of the user's authentication.",
-            "metadata": [
-                {
-                    "type": "source",
-                    "required": true
-                },
-                {
-                    "type": "authStatus",
-                    "required": true
-                },
-                {
-                    "type": "authEnabledConnections",
-                    "required": true
-                }
-            ],
-            "passive": true
-        },
         {
             "name": "webview_amazonqSignInOpened",
             "description": "Called when a Amazon Q sign in webview is opened.",