fixes

Author: zixlin7

plugins/amazonq/chat/jetbrains-community/resources/META-INF/plugin-chat.xml

@@ -30,8 +30,9 @@
     <actions>
         <action id="aws.toolkit.open.q.window" class="software.aws.toolkits.jetbrains.services.amazonq.QRefreshPanelAction"/>
         <action id="aws.toolkit.jetbrains.core.services.cwc.inline.openChat" class="software.aws.toolkits.jetbrains.services.cwc.inline.OpenChatInputAction">
-            <keyboard-shortcut first-keystroke="meta I" keymap="$default"/>
-            <keyboard-shortcut first-keystroke="control I" keymap="$default"/>
+            <keyboard-shortcut keymap="Mac OS X" first-keystroke="meta I"/>
+            <keyboard-shortcut keymap="Mac OS X 10.5+" first-keystroke="meta I"/>
+            <keyboard-shortcut keymap="$default" first-keystroke="control I"/>
         </action>
         <group id="aws.q.toolwindow.titleBar" popup="false" compact="true">
             <reference id="aws.toolkit.open.q.window"/>

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

@@ -243,13 +243,13 @@ class InlineChatController(
 
     private fun highlightCodeWithBackgroundColor(editor: Editor, startOffset: Int, endOffset: Int, isGreen: Boolean) {
         val greenBackgroundAttributes = TextAttributes().apply {
-            backgroundColor = JBColor(0xAADEAA, 0x447152)
-            effectColor = JBColor(0xAADEAA, 0x447152)
+            backgroundColor = JBColor(0xAADEAA, 0x294436)
+            effectColor = JBColor(0xAADEAA, 0x294436)
         }
 
         val redBackgroundAttributes = TextAttributes().apply {
-            backgroundColor = JBColor(0xFFC8BD, 0x8F5247)
-            effectColor = JBColor(0xFFC8BD, 0x8F5247)
+            backgroundColor = JBColor(0xFFC8BD, 0x45302B)
+            effectColor = JBColor(0xFFC8BD, 0x45302B)
         }
         val attributes = if (isGreen) greenBackgroundAttributes else redBackgroundAttributes
         rangeHighlighter = editor.markupModel.addRangeHighlighter(
@@ -395,6 +395,7 @@ class InlineChatController(
 
     private fun finalComputation(selectedCode: String, finalMessage: String?) {
         if (finalMessage == null) {
+            canPopupAbort.set(true)
             throw Exception("No suggestions from Q; please try a different instruction.")
         }
         var numSuggestionAddChars = 0
@@ -437,6 +438,7 @@ class InlineChatController(
         metrics?.numSuggestionDelChars = numSuggestionDelChars
         metrics?.numSuggestionDelLines = numSuggestionDelLines
         if (isAllEqual) {
+            canPopupAbort.set(true)
             throw Exception("No suggestions from Q; please try a different instruction.")
         }
     }
@@ -650,6 +652,8 @@ class InlineChatController(
                                     processNewCode(editor, selectedLineStart, unescape(event.message), prevMessage)
                                 }
                             } catch (e: Exception) {
+                                canPopupAbort.set(true)
+                                undoChanges()
                                 logger.warn { "error streaming chat message to editor: ${e.stackTraceToString()}" }
                                 errorMessage = "Error processing request; please try again."
                             }

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

@@ -54,11 +54,11 @@ class InlineChatPopupFactory(
             }
 
             val submitListener: () -> Unit = {
-                submitButton.isEnabled = false
-                cancelButton.isEnabled = false
-                textField.isEnabled = false
                 val prompt = textField.text
                 if (prompt.isNotBlank()) {
+                    submitButton.isEnabled = false
+                    cancelButton.isEnabled = false
+                    textField.isEnabled = false
                     setLabel(message("amazonqInlineChat.popup.generating"))
                     revalidate()
 

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

@@ -20,12 +20,13 @@ import java.awt.BorderLayout
 import java.awt.Dimension
 import java.awt.Font
 import javax.swing.BorderFactory
-import javax.swing.Icon
 import javax.swing.JButton
 import javax.swing.JLabel
 import javax.swing.JPanel
 import javax.swing.JTextField
 import javax.swing.SwingConstants
+import javax.swing.event.DocumentEvent
+import javax.swing.event.DocumentListener
 
 class InlineChatPopupPanel(private val parentDisposable: Disposable) : JPanel() {
     private var submitClickListener: (() -> Unit)? = null
@@ -37,11 +38,23 @@ class InlineChatPopupPanel(private val parentDisposable: Disposable) : JPanel()
     private val popupInputHeight = 40
     private val popupInputWidth = 500
 
-    val textField = createTextField()
+    val textField = createTextField().apply {
+        document.addDocumentListener(object : DocumentListener {
+            fun updateButtonState() {
+                submitButton.isEnabled = text.isNotEmpty()
+            }
+
+            override fun insertUpdate(e: DocumentEvent) = updateButtonState()
+            override fun removeUpdate(e: DocumentEvent) = updateButtonState()
+            override fun changedUpdate(e: DocumentEvent) = updateButtonState()
+        })
+    }
 
-    val submitButton = createButtonWithIcon(AwsIcons.Resources.InlineChat.CONFIRM, message("amazonqInlineChat.popup.confirm"))
+    val submitButton = createButton(message("amazonqInlineChat.popup.confirm")).apply {
+        isEnabled = false
+    }
 
-    val cancelButton = createButtonWithIcon(AwsIcons.Resources.InlineChat.REJECT, message("amazonqInlineChat.popup.cancel")).apply {
+    val cancelButton = createButton(message("amazonqInlineChat.popup.cancel")).apply {
         addActionListener {
             if (!Disposer.isDisposed(parentDisposable)) {
                 Disposer.dispose(parentDisposable)
@@ -55,8 +68,8 @@ class InlineChatPopupPanel(private val parentDisposable: Disposable) : JPanel()
         add(cancelButton, BorderLayout.EAST)
     }
 
-    private val acceptButton = createButtonWithIcon(AwsIcons.Resources.InlineChat.CONFIRM, message("amazonqInlineChat.popup.accept"))
-    private val rejectButton = createButtonWithIcon(AwsIcons.Resources.InlineChat.REJECT, message("amazonqInlineChat.popup.reject"))
+    private val acceptButton = createButton(message("amazonqInlineChat.popup.accept"))
+    private val rejectButton = createButton(message("amazonqInlineChat.popup.reject"))
     private val textLabel = JLabel(message("amazonqInlineChat.popup.editCode"), AwsIcons.Logos.AWS_Q_GREY, SwingConstants.RIGHT).apply {
         font = font.deriveFont(popupButtonFontSize)
     }
@@ -86,10 +99,8 @@ class InlineChatPopupPanel(private val parentDisposable: Disposable) : JPanel()
         font = Font(editorColorsScheme.editorFontName, Font.PLAIN, editorColorsScheme.editorFontSize)
     }
 
-    private fun createButtonWithIcon(icon: Icon, text: String): JButton = JButton(text).apply {
-        horizontalTextPosition = SwingConstants.LEFT
+    private fun createButton(text: String): JButton = JButton(text).apply {
         preferredSize = Dimension(popupButtonWidth, popupButtonHeight)
-        setIcon(icon)
         isOpaque = false
         isContentAreaFilled = false
         isBorderPainted = false

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

@@ -180,7 +180,7 @@ class TelemetryHelperTest {
         sessionStorage = mock {
             on { this.getSession(eq(tabId)) } doReturn ChatSessionInfo(session = mockSession, scope = mock(), history = mutableListOf())
         }
-        sut = TelemetryHelper(appInitContext, sessionStorage)
+        sut = TelemetryHelper(appInitContext.project, sessionStorage)
 
         // set up client
         mockClientManager.create<SsoOidcClient>()

plugins/amazonq/shared/jetbrains-community/resources/software/aws/toolkits/resources/AmazonQBundle.properties

@@ -1,13 +1,11 @@
 action.q.hello.description=Hello description
-amazonqInlineChat.gutter.tooltip = Amazon Q
 amazonqInlineChat.hint.edit = Edit
-amazonqInlineChat.hint.windows.shortCut = (Ctrl + I)
-amazonqInlineChat.popup.accept=Accept
-amazonqInlineChat.popup.cancel=Cancel
-amazonqInlineChat.popup.confirm=Confirm
+amazonqInlineChat.popup.accept=Accept \u23CE
+amazonqInlineChat.popup.cancel=Cancel \u238B
+amazonqInlineChat.popup.confirm=Confirm \u23CE
 amazonqInlineChat.popup.editCode = Edit Code
 amazonqInlineChat.popup.generating = Generating...
-amazonqInlineChat.popup.reject=Reject
+amazonqInlineChat.popup.reject=Reject \u238B
 amazonqInlineChat.popup.title=Enter Instructions for Q
 amazonq.refresh.panel=Refresh Chat Session
 q.hello=Hello

plugins/core/jetbrains-community/resources/icons/resources/inlinechat/amazonq_inline_chat_cancel_icon.svg

@@ -127,10 +127,6 @@ object AwsIcons {
         }
 
         object InlineChat {
-            @JvmField val CONFIRM = load("/icons/resources/inlinechat/amazonq_inline_chat_confirm_icon.svg")
-
-            @JvmField val REJECT = load("/icons/resources/inlinechat/amazonq_inline_chat_reject.svg")
-
             @JvmField val AWS_Q_INLINECHAT_SHORTCUT = load("/icons/resources/inlinechat/amazonq_inline_chat_shortcut.svg")
         }
     }