detekt and pr feedback

Author: zixlin7

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/startup/AmazonQStartupActivity.kt

@@ -20,7 +20,6 @@ import software.aws.toolkits.jetbrains.services.amazonq.toolwindow.AmazonQToolWi
 import software.aws.toolkits.jetbrains.services.amazonq.toolwindow.AmazonQToolWindowFactory
 import software.aws.toolkits.jetbrains.services.codewhisperer.explorer.CodeWhispererExplorerActionManager
 import software.aws.toolkits.jetbrains.services.cwc.inline.InlineChatController
-import software.aws.toolkits.jetbrains.settings.CodeWhispererSettings
 import java.lang.management.ManagementFactory
 import java.time.Duration
 import java.util.concurrent.atomic.AtomicBoolean

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/editor/context/focusArea/FocusAreaContextExtractor.kt

@@ -14,6 +14,7 @@ import software.aws.toolkits.core.utils.warn
 import software.aws.toolkits.jetbrains.services.amazonq.webview.FqnWebviewAdapter
 import software.aws.toolkits.jetbrains.services.cwc.clients.chat.model.CodeNames
 import software.aws.toolkits.jetbrains.services.cwc.clients.chat.model.CodeNamesImpl
+import software.aws.toolkits.jetbrains.services.cwc.clients.chat.model.FullyQualifiedNames
 import software.aws.toolkits.jetbrains.services.cwc.controller.ChatController
 import software.aws.toolkits.jetbrains.services.cwc.editor.context.file.util.LanguageExtractor
 import software.aws.toolkits.jetbrains.utils.computeOnEdt
@@ -140,9 +141,8 @@ class FocusAreaContextExtractor(private val fqnWebviewAdapter: FqnWebviewAdapter
             val requestString = ChatController.objectMapper.writeValueAsString(extractNamesRequest)
 
             codeNames = try {
-                val namesString = fqnWebviewAdapter?.let { it.extractNames(requestString) }
-                    ?: """{"simpleNames": [], "fullyQualifiedNames": {"used": []}}"""
-                ChatController.objectMapper.readValue(namesString, CodeNamesImpl::class.java)
+                fqnWebviewAdapter?.let { ChatController.objectMapper.readValue(it.extractNames(requestString), CodeNamesImpl::class.java)
+                } ?: CodeNamesImpl(simpleNames = emptyList(), fullyQualifiedNames = FullyQualifiedNames(used = emptyList()))
             } catch (e: Exception) {
                 getLogger<FocusAreaContextExtractor>().warn(e) { "Failed to extract names from file" }
                 null

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

@@ -17,6 +17,8 @@ import com.intellij.openapi.components.service
 import com.intellij.openapi.editor.Document
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.editor.RangeMarker
+import com.intellij.openapi.editor.event.CaretEvent
+import com.intellij.openapi.editor.event.CaretListener
 import com.intellij.openapi.editor.markup.HighlighterLayer
 import com.intellij.openapi.editor.markup.HighlighterTargetArea
 import com.intellij.openapi.editor.markup.RangeHighlighter
@@ -81,11 +83,11 @@ class InlineChatController(
     private var metrics: InlineChatMetrics? = null
     private var canPopupAbort = AtomicBoolean(true)
     private var currentSelectionRange: RangeMarker? = null
+    private val listener = InlineChatFileListener(project, this)
 
     init {
-        InlineChatFileListener(project, this).apply {
-            project.messageBus.connect().subscribe(FileEditorManagerListener.FILE_EDITOR_MANAGER, this)
-        }
+        Disposer.register(this, listener)
+        project.messageBus.connect(this).subscribe(FileEditorManagerListener.FILE_EDITOR_MANAGER, listener)
     }
 
     data class InlineChatMetrics(
@@ -151,7 +153,7 @@ class InlineChatController(
         metrics = null
     }
 
-    private fun undoChanges () {
+    private fun undoChanges() {
         scope.launch(EDT) {
             while (partialUndoActions.isNotEmpty()) {
                 val action = partialUndoActions.pop()
@@ -203,10 +205,20 @@ class InlineChatController(
             submitHandler = popupSubmitHandler, cancelHandler = { popupCancelHandler(editor) }
         ).createPopup(editor, scope)
         addPopupListeners(currentPopup!!, editor)
+        val caretListener = createCaretListener(editor)
+        editor.caretModel.addCaretListener(caretListener)
         Disposer.register(this, currentPopup!!)
         canPopupAbort.set(true)
     }
 
+    private fun createCaretListener(editor: Editor): CaretListener = object : CaretListener {
+        override fun caretPositionChanged(event: CaretEvent) {
+            disposePopup(false)
+
+            editor.caretModel.removeCaretListener(this)
+        }
+    }
+
     private fun removeSelection(editor: Editor) {
         scope.launch(EDT) {
             val selectionModel = editor.selectionModel
@@ -588,8 +600,8 @@ class InlineChatController(
                 triggerId,
                 requestData,
                 sessionInfo,
-                false,
-                true
+                shouldAddIndexInProgressMessage = false,
+                isInlineChat = true
             )
                 .catch { e ->
                     logger.warn { "Error in inline chat request: ${e.message}" }
@@ -618,7 +630,7 @@ class InlineChatController(
             try {
                 processChatDiff(selectedCode, finalMessage, editor, selectionRange!!)
             } catch (e: Exception) {
-                logger.warn {"error precessing chat diff in editor: ${e.stackTraceToString()}" }
+                logger.warn { "error precessing chat diff in editor: ${e.stackTraceToString()}" }
                 errorMessage = "Error processing request; please try again."
             }
         }
@@ -631,7 +643,7 @@ class InlineChatController(
                 codeIntent = true, responseStartLatency = firstResponseLatency, responseEndLatency = lastResponseLatency
             )
         }
-        if(errorMessage.isNotEmpty()) {
+        if (errorMessage.isNotEmpty()) {
             undoChanges()
         }
         return errorMessage

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

@@ -7,6 +7,7 @@ import com.intellij.codeInsight.hint.HintManagerImpl
 import com.intellij.codeInsight.hint.HintUtil
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.editor.VisualPosition
+import com.intellij.openapi.keymap.KeymapUtil
 import com.intellij.openapi.util.SystemInfo
 import com.intellij.ui.LightweightHint
 import com.intellij.ui.SimpleColoredText
@@ -66,13 +67,14 @@ class InlineChatEditorHint {
 
         coloredText.appendToComponent(component)
         val shortcutComponent = HintUtil.createInformationComponent()
-        if (!SystemInfo.isWindows) {
+        val shortCut = KeymapUtil.getShortcutText("aws.toolkit.jetbrains.core.services.cwc.inline.openChat")
+        if (!SystemInfo.isWindows && shortCut == "⌃I") {
             val shortCutIcon = AwsIcons.Resources.InlineChat.AWS_Q_INLINECHAT_SHORTCUT
             shortcutComponent.isIconOnTheRight = true
             shortcutComponent.icon = shortCutIcon
         } else {
             val shortcutText =
-                SimpleColoredText(message("amazonqInlineChat.hint.windows.shortCut"), SimpleTextAttributes.REGULAR_ATTRIBUTES)
+                SimpleColoredText(shortCut, SimpleTextAttributes.REGULAR_ATTRIBUTES)
             shortcutText.appendToComponent(shortcutComponent)
         }
 

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

@@ -61,7 +61,6 @@ class InlineChatPopupPanel(private val parentDisposable: Disposable) : JPanel()
         font = font.deriveFont(popupButtonFontSize)
     }
 
-
     private val inputPanel = JPanel(BorderLayout()).apply {
         border = BorderFactory.createEmptyBorder(10, 10, 5, 10)
     }
@@ -152,7 +151,6 @@ class InlineChatPopupPanel(private val parentDisposable: Disposable) : JPanel()
         revalidate()
     }
 
-
     fun setLabel(text: String) {
         textLabel.text = text
         textField.isEnabled = false

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

@@ -11,27 +11,11 @@ import com.intellij.openapi.editor.event.CaretEvent
 import com.intellij.openapi.editor.event.CaretListener
 
 class OpenChatInputAction : AnAction() {
-    private var inlineChatController: InlineChatController? = null
-    private var caretListener: CaretListener? = null
     override fun actionPerformed(e: AnActionEvent) {
         val editor = e.getRequiredData(CommonDataKeys.EDITOR)
-        val project = editor.project
+        val project = editor.project ?: return
 
-        if (editor == null || project == null) return
-        inlineChatController = InlineChatController.getInstance(project)
-        inlineChatController?.initPopup(editor)
-
-        caretListener = createCaretListener(editor)
-        editor.caretModel.addCaretListener(caretListener!!)
-    }
-
-    private fun createCaretListener(editor: Editor): CaretListener = object : CaretListener {
-        override fun caretPositionChanged(event: CaretEvent) {
-            inlineChatController?.disposePopup(false)
-
-            editor.caretModel.removeCaretListener(this)
-            caretListener = null
-            inlineChatController = null
-        }
+        val inlineChatController = InlineChatController.getInstance(project)
+        inlineChatController.initPopup(editor)
     }
 }

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

@@ -3,6 +3,7 @@
 
 package software.aws.toolkits.jetbrains.services.cwc.inline.listeners
 
+import com.intellij.openapi.Disposable
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.fileEditor.FileEditorManager
 import com.intellij.openapi.fileEditor.FileEditorManagerEvent
@@ -12,7 +13,7 @@ import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.Disposer
 import software.aws.toolkits.jetbrains.services.cwc.inline.InlineChatController
 
-class InlineChatFileListener(project: Project, private val controller: InlineChatController) : FileEditorManagerListener {
+class InlineChatFileListener(project: Project, private val controller: InlineChatController) : FileEditorManagerListener, Disposable {
     private var currentEditor: Editor? = null
     private var selectionListener: InlineChatSelectionListener? = null
 
@@ -37,6 +38,7 @@ class InlineChatFileListener(project: Project, private val controller: InlineCha
     private fun setupListenersForEditor(editor: Editor) {
         selectionListener = InlineChatSelectionListener().also { listener ->
             editor.selectionModel.addSelectionListener(listener)
+            Disposer.register(this, listener)
         }
     }
 
@@ -48,7 +50,7 @@ class InlineChatFileListener(project: Project, private val controller: InlineCha
         selectionListener = null
     }
 
-    fun dispose() {
+    override fun dispose() {
         currentEditor?.let { removeListenersFromCurrentEditor(it) }
         currentEditor = null
     }

plugins/core/jetbrains-community/src/icons/AwsIcons.kt

@@ -129,8 +129,6 @@ object AwsIcons {
         object InlineChat {
             @JvmField val CONFIRM = load("/icons/resources/inlinechat/amazonq_inline_chat_confirm_icon.svg")
 
-            @JvmField val CANCEL = load("/icons/resources/inlinechat/amazonq_inline_chat_cancel_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")