fix(amazonq): fix more formatting issues

Author: blakelaz-amazon

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

@@ -15,10 +15,6 @@ import com.intellij.openapi.ide.CopyPasteManager
 import com.intellij.openapi.project.Project
 import com.intellij.ui.components.JBScrollPane
 import com.intellij.util.Alarm
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.launch
-import software.aws.toolkits.core.utils.getLogger
-import software.aws.toolkits.core.utils.warn
 import software.aws.toolkits.jetbrains.services.codewhisperer.codescan.context.CodeScanIssueDetailsDisplayType
 import software.aws.toolkits.jetbrains.services.codewhisperer.codescan.utils.additionBackgroundColor
 import software.aws.toolkits.jetbrains.services.codewhisperer.codescan.utils.additionForegroundColor
@@ -34,15 +30,12 @@ import software.aws.toolkits.jetbrains.services.codewhisperer.codescan.utils.get
 import software.aws.toolkits.jetbrains.services.codewhisperer.codescan.utils.metaBackgroundColor
 import software.aws.toolkits.jetbrains.services.codewhisperer.codescan.utils.metaForegroundColor
 import software.aws.toolkits.jetbrains.services.codewhisperer.codescan.utils.openDiff
-import software.aws.toolkits.jetbrains.services.codewhisperer.codescan.utils.sendCodeFixGeneratedTelemetryToServiceAPI
 import software.aws.toolkits.jetbrains.services.codewhisperer.codescan.utils.truncateIssueTitle
 import software.aws.toolkits.jetbrains.services.codewhisperer.telemetry.CodeWhispererTelemetryService
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.getHexString
-import software.aws.toolkits.jetbrains.settings.CodeWhispererSettings
 import software.aws.toolkits.resources.message
 import software.aws.toolkits.telemetry.Component
-import software.aws.toolkits.telemetry.MetricResult
 import java.awt.BorderLayout
 import java.awt.Dimension
 import java.awt.datatransfer.StringSelection
@@ -57,115 +50,14 @@ import javax.swing.ScrollPaneConstants
 import javax.swing.event.HyperlinkEvent
 import javax.swing.text.html.HTMLEditorKit
 
-private val logger = getLogger<CodeWhispererCodeScanIssueDetailsPanel>()
 internal class CodeWhispererCodeScanIssueDetailsPanel(
     private val project: Project,
     issue: CodeWhispererCodeScanIssue,
-    private val defaultScope: CoroutineScope,
 ) : JPanel(BorderLayout()) {
     private val kit = HTMLEditorKit()
     private val doc = kit.createDefaultDocument()
-    private val amazonQCodeFixSession = AmazonQCodeFixSession(project)
     private val codeScanManager = CodeWhispererCodeScanManager.getInstance(project)
 
-    private suspend fun handleGenerateFix(issue: CodeWhispererCodeScanIssue, isRegenerate: Boolean = false) {
-        if (issue.ruleId == "sbom-software-assurance-services") {
-            logger.warn { "GenerateFix is not available for SAS findings." }
-            return
-        }
-        editorPane.text = getCodeScanIssueDetailsHtml(
-            issue, CodeScanIssueDetailsDisplayType.DetailsPane, CodeWhispererConstants.FixGenerationState.GENERATING,
-            project = project
-        )
-        editorPane.revalidate()
-        editorPane.repaint()
-        runInEdt {
-            editorPane.scrollToReference("fixLoadingSection")
-        }
-
-        val codeFixResponse: AmazonQCodeFixSession.CodeFixResponse = amazonQCodeFixSession.runCodeFixWorkflow(issue)
-        if (codeFixResponse.failureResponse != null) {
-            editorPane.apply {
-                text = getCodeScanIssueDetailsHtml(
-                    issue, CodeScanIssueDetailsDisplayType.DetailsPane, CodeWhispererConstants.FixGenerationState.FAILED,
-                    project = project
-                )
-                revalidate()
-                repaint()
-                runInEdt {
-                    scrollToReference("fixFailureSection")
-                }
-            }
-            CodeWhispererTelemetryService.getInstance().sendCodeScanIssueGenerateFix(
-                Component.Webview,
-                issue,
-                isRegenerate,
-                MetricResult.Failed,
-                codeFixResponse.failureResponse
-            )
-        } else {
-            val isReferenceAllowed = CodeWhispererSettings.getInstance().isIncludeCodeWithReference()
-            var suggestedFix = SuggestedFix(
-                code = "",
-                description = ""
-            )
-            codeFixResponse.getCodeFixJobResponse?.suggestedFix()?.let {
-                it.codeDiff()?.let { codeDiff ->
-                    // TODO: enable later
-                    if (it.references() == null || it.references()?.isEmpty() == true) {
-                        suggestedFix = SuggestedFix(
-                            code = codeDiff.split("\n").drop(2).joinToString("\n"), // drop first two comment lines
-                            description = it.description(),
-                            codeFixJobId = codeFixResponse.jobId,
-                            references = it.references(),
-                        )
-                    }
-                }
-            }
-
-            val showReferenceWarning = !isReferenceAllowed && suggestedFix.references.isNotEmpty()
-            if (suggestedFix.code.isNotEmpty() && !showReferenceWarning) {
-                issue.suggestedFixes = listOf(suggestedFix)
-                codeScanManager.updateIssue(issue)
-            }
-
-            editorPane.apply {
-                text = getCodeScanIssueDetailsHtml(
-                    issue, CodeScanIssueDetailsDisplayType.DetailsPane, project = project,
-                    showReferenceWarning = showReferenceWarning
-                )
-                revalidate()
-                repaint()
-                runInEdt {
-                    scrollToReference("codeFixActions")
-                }
-            }
-
-            buttonPane.apply {
-                removeAll()
-                add(explainIssueButton)
-                add(applyFixButton)
-                add(ignoreIssueButton)
-                add(ignoreIssuesButton)
-                add(Box.createHorizontalGlue())
-                revalidate()
-                repaint()
-            }
-            ApplicationManager.getApplication().executeOnPooledThread {
-                if (suggestedFix.code.isNotBlank()) {
-                    sendCodeFixGeneratedTelemetryToServiceAPI(issue, false)
-                }
-                CodeWhispererTelemetryService.getInstance().sendCodeScanIssueGenerateFix(
-                    Component.Webview,
-                    issue,
-                    isRegenerate,
-                    MetricResult.Succeeded,
-                    includesFix = suggestedFix.code.isNotBlank()
-                )
-            }
-        }
-    }
-
     private val editorPane = JEditorPane().apply {
         contentType = "text/html"
         putClientProperty(JEditorPane.HONOR_DISPLAY_PROPERTIES, true)

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

@@ -537,14 +537,17 @@ class CodeWhispererCodeScanManager(val project: Project) {
         ondemandScanIssues = ondemandScanIssues.filter { it.findingId != issue.findingId }
     }
 
-    fun addOnDemandIssues(issues: List<CodeWhispererCodeScanIssue>, scannedFiles: List<VirtualFile>, scope: CodeWhispererConstants.CodeAnalysisScope) = projectCoroutineScope(project).launch {
-        ondemandScanIssues = ondemandScanIssues + issues
-        renderResponseOnUIThread(
-            getCombinedScanIssues(),
-            scannedFiles,
-            scope
-        )
-    }
+    fun addOnDemandIssues(issues: List<CodeWhispererCodeScanIssue>, scannedFiles: List<VirtualFile>, scope: CodeWhispererConstants.CodeAnalysisScope) =
+        projectCoroutineScope(
+            project
+        ).launch {
+            ondemandScanIssues = ondemandScanIssues + issues
+            renderResponseOnUIThread(
+                getCombinedScanIssues(),
+                scannedFiles,
+                scope
+            )
+        }
 
     fun removeIssueByFindingId(issue: CodeWhispererCodeScanIssue, findingId: String) {
         scanNodesLookup[issue.file]?.forEach { node ->

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

@@ -3,12 +3,11 @@
 
 package software.aws.toolkits.jetbrains.services.codewhisperer.codescan.utils
 
-import com.google.gson.Gson
+import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.intellij.diff.DiffContentFactory
 import com.intellij.diff.DiffManager
 import com.intellij.diff.requests.SimpleDiffRequest
 import com.intellij.diff.util.DiffUserDataKeys
-import com.intellij.docker.agent.util.toJson
 import com.intellij.openapi.actionSystem.ActionManager
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.CommonDataKeys
@@ -244,17 +243,16 @@ fun applyFix(issue: CodeWhispererCodeScanIssue) {
 }
 
 private fun handleIssueCommand(issue: CodeWhispererCodeScanIssue, action: IssueCommandAction) {
-    val gson = Gson()
     val handleIssueCommandContext = mutableMapOf(
         "title" to issue.title,
         "description" to issue.description.markdown,
         "code" to issue.codeText,
         "fileName" to issue.file.name,
         "startLine" to issue.startLine.toString(),
         "endLine" to issue.endLine.toString(),
-        "recommendation" to gson.toJson(issue.recommendation).toString(),
-        "suggestedFixes" to gson.toJson(issue.suggestedFixes).toString(),
-        "codeSnippet" to gson.toJson(issue.codeSnippet).toString()
+        "recommendation" to jacksonObjectMapper().writeValueAsString(issue.recommendation),
+        "suggestedFixes" to jacksonObjectMapper().writeValueAsString(issue.suggestedFixes),
+        "codeSnippet" to jacksonObjectMapper().writeValueAsString(issue.codeSnippet)
     )
     val actionEvent = AnActionEvent.createFromInputEvent(
         null,

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

@@ -148,8 +148,10 @@ class ChatCommunicationManager(private val project: Project, private val cs: Cor
                 additionalMessages?.removeAll {
                     val messageId = it["messageId"] as? String
                     messageId != null &&
-                        (messageId.endsWith(CODE_REVIEW_FINDINGS_SUFFIX) ||
-                            messageId.endsWith(DISPLAY_FINDINGS_SUFFIX))
+                        (
+                            messageId.endsWith(CODE_REVIEW_FINDINGS_SUFFIX) ||
+                                messageId.endsWith(DISPLAY_FINDINGS_SUFFIX)
+                            )
                 }
             }