feat(amazonq): add support for CodeReview and DisplayFindings tools, alter behavior of explain and fix buttons

Author: blakelaz-amazon

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/BrowserConnector.kt

@@ -113,8 +113,10 @@ import software.aws.toolkits.jetbrains.services.amazonqCodeTest.auth.isCodeTestA
 import software.aws.toolkits.jetbrains.services.amazonqDoc.auth.isDocAvailable
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.auth.isFeatureDevAvailable
 import software.aws.toolkits.jetbrains.services.codemodernizer.utils.isCodeTransformAvailable
+import software.aws.toolkits.jetbrains.services.codewhisperer.codescan.CodeLine
 import software.aws.toolkits.jetbrains.services.codewhisperer.codescan.CodeWhispererCodeScanIssue
 import software.aws.toolkits.jetbrains.services.codewhisperer.codescan.CodeWhispererCodeScanManager
+import software.aws.toolkits.jetbrains.services.codewhisperer.codescan.CodeWhispererCodeScanSession
 import software.aws.toolkits.jetbrains.services.codewhisperer.codescan.Description
 import software.aws.toolkits.jetbrains.services.codewhisperer.codescan.Recommendation
 import software.aws.toolkits.jetbrains.services.codewhisperer.codescan.SuggestedFix
@@ -583,7 +585,7 @@ class BrowserConnector(
         }
     }
 
-    data class FlareCodeScanIssue(
+    data class flareCodeScanIssue(
         val startLine: Int,
         val endLine: Int,
         val comment: String?,
@@ -607,7 +609,7 @@ class BrowserConnector(
 
     data class AggregatedCodeScanIssue(
         val filePath: String,
-        val issues: List<FlareCodeScanIssue>
+        val issues: List<flareCodeScanIssue>
     )
 
     private fun showResult(
@@ -629,7 +631,7 @@ class BrowserConnector(
                 val findingsMessage = additionalMessages?.find {message ->
                     (message["messageId"] as String).endsWith(CODE_REVIEW_FINDINGS_SUFFIX)
                     || (message["messageId"] as String).endsWith(DISPLAY_FINDINGS_SUFFIX)}
-                val scannedFiles = mutableListOf<VirtualFile>()
+                val scannedFiles = mutableListOf<VirtualFile>();
                 if (findingsMessage != null) {
                     additionalMessages.remove(findingsMessage)
                     val gson = Gson()

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/CodeWhispererCodeScanIssueDetailsPanel.kt

@@ -143,6 +143,8 @@ internal class CodeWhispererCodeScanIssueDetailsPanel(
 
             buttonPane.apply {
                 removeAll()
+//                if (issue.suggestedFixes.isNotEmpty()) add(applyFixButton)
+//                add(regenerateFixButton)
                 add(explainIssueButton)
                 add(applyFixButton)
                 add(ignoreIssueButton)
@@ -233,6 +235,29 @@ internal class CodeWhispererCodeScanIssueDetailsPanel(
         horizontalTextPosition = JLabel.LEFT
         font = font.deriveFont(16f)
     }
+//    private val applyFixButton = JButton(message("codewhisperer.codescan.apply_fix_button_label")).apply {
+//        putClientProperty(DarculaButtonUI.DEFAULT_STYLE_KEY, true)
+//        addActionListener {
+//            applySuggestedFix(project, issue)
+//        }
+//    }
+//    private val generateFixButton = JButton(message("codewhisperer.codescan.generate_fix_button_label")).apply {
+//        putClientProperty(DarculaButtonUI.DEFAULT_STYLE_KEY, true)
+//        isEnabled = issue.ruleId != "sbom-software-assurance-services"
+//        addActionListener {
+//            defaultScope.launch {
+//                handleGenerateFix(issue)
+//            }
+//        }
+//    }
+//    private val regenerateFixButton = JButton(message("codewhisperer.codescan.regenerate_fix_button_label")).apply {
+//        putClientProperty(DarculaButtonUI.DEFAULT_STYLE_KEY, true)
+//        addActionListener {
+//            defaultScope.launch {
+//                handleGenerateFix(issue, isRegenerate = true)
+//            }
+//        }
+//    }
     private val applyFixButton = JButton(message("codewhisperer.codescan.apply_fix_button_label")).apply {
         addActionListener {
             applyFix(issue)
@@ -279,6 +304,8 @@ internal class CodeWhispererCodeScanIssueDetailsPanel(
     private val buttonPane = JPanel().apply {
         layout = BoxLayout(this, BoxLayout.X_AXIS)
         preferredSize = Dimension(this.width, 30)
+//        if (issue.suggestedFixes.isNotEmpty()) add(applyFixButton)
+//        if (issue.suggestedFixes.isNotEmpty()) add(regenerateFixButton) else add(generateFixButton)
         add(explainIssueButton)
         add(applyFixButton)
         add(ignoreIssueButton)
@@ -313,5 +340,10 @@ internal class CodeWhispererCodeScanIssueDetailsPanel(
         add(BorderLayout.SOUTH, buttonPane)
         isVisible = true
         revalidate()
+//        if (issue.suggestedFixes.isEmpty()) {
+//            defaultScope.launch {
+//                handleGenerateFix(issue)
+//            }
+//        }
     }
 }

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/flareChat/ChatCommunicationManager.kt

@@ -143,15 +143,6 @@ class ChatCommunicationManager(private val project: Project, private val cs: Cor
                 Gson().fromJson(partialChatResult, Map::class.java)
             } ?: partialChatResult
 
-            if (partialResultMap is Map<*, *>) {
-                val additionalMessages = partialResultMap["additionalMessages"] as? MutableList<Map<String, Any>>
-                additionalMessages?.removeAll {
-                    val messageId = it["messageId"] as? String
-                    messageId != null &&
-                        (messageId.endsWith(CODE_REVIEW_FINDINGS_SUFFIX) ||
-                            messageId.endsWith(DISPLAY_FINDINGS_SUFFIX))
-                }
-            }
 
             notifyUi(
                 FlareUiMessage(

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/model/aws/chat/ChatMessage.kt

@@ -110,5 +110,5 @@ enum class MessageType(@JsonValue val repr: String) {
     TOOL("tool"),
 }
 
-const val CODE_REVIEW_FINDINGS_SUFFIX = "_codeReviewFindings"
-const val DISPLAY_FINDINGS_SUFFIX = "_displayFindings"
+val CODE_REVIEW_FINDINGS_SUFFIX = "_codeReviewFindings"
+val DISPLAY_FINDINGS_SUFFIX = "_displayFindings"