merge conflict

Author: samgst-amazon

.changes/next-release/bugfix-1b531ca4-5b80-48d9-89e7-ac88adc77ad5.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Improve the position that inline chat shortcut hint is shown in editor"
+}

package-lock.json

@@ -0,0 +1,9 @@
+{
+  "dependencies": {
+    "node": "^22.9.0",
+    "vue-select": "^3.20.3"
+  },
+  "devDependencies": {
+    "@types/vue-select": "^3.16.8"
+  }
+}

package.json

@@ -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/inline/InlineChatEditorHint.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.",