fix(amazonq): general code quality fixes for CodeReview and DisplayFindings tools

Author: blakelaz-amazon

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

@@ -113,10 +113,8 @@ 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
@@ -585,7 +583,7 @@ class BrowserConnector(
         }
     }
 
-    data class flareCodeScanIssue(
+    data class FlareCodeScanIssue(
         val startLine: Int,
         val endLine: Int,
         val comment: String?,
@@ -609,7 +607,7 @@ class BrowserConnector(
 
     data class AggregatedCodeScanIssue(
         val filePath: String,
-        val issues: List<flareCodeScanIssue>
+        val issues: List<FlareCodeScanIssue>
     )
 
     private fun showResult(
@@ -631,7 +629,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/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/commands/EditorContextCommand.kt

@@ -34,8 +34,8 @@ enum class EditorContextCommand(
         verb = "sendToPrompt",
         actionId = "aws.amazonq.sendToPrompt",
     ),
-    ExplainCodeScanIssue(
-        verb = "ExplainIssue",
-        actionId = "aws.amazonq.explainCodeScanIssue",
+    HandleCodeScanIssue(
+        verb = "HandleCodeScanIssue",
+        actionId = "aws.amazonq.handleCodeScanIssueCommand",
     ),
 }

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/controller/chat/userIntent/UserIntentRecognizer.kt

@@ -15,7 +15,7 @@ class UserIntentRecognizer {
         EditorContextCommand.Refactor -> UserIntent.SUGGEST_ALTERNATE_IMPLEMENTATION
         EditorContextCommand.Fix -> UserIntent.APPLY_COMMON_BEST_PRACTICES
         EditorContextCommand.Optimize -> UserIntent.IMPROVE_CODE
-        EditorContextCommand.ExplainCodeScanIssue -> UserIntent.EXPLAIN_CODE_SELECTION
+        EditorContextCommand.HandleCodeScanIssue -> UserIntent.EXPLAIN_CODE_SELECTION
         EditorContextCommand.GenerateUnitTests -> UserIntent.GENERATE_UNIT_TESTS
         EditorContextCommand.SendToPrompt -> null
     }

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

@@ -8,7 +8,6 @@ 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

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"),
 }
 
-val CODE_REVIEW_FINDINGS_SUFFIX = "_codeReviewFindings"
-val DISPLAY_FINDINGS_SUFFIX = "_displayFindings"
+const val CODE_REVIEW_FINDINGS_SUFFIX = "_codeReviewFindings"
+const val DISPLAY_FINDINGS_SUFFIX = "_displayFindings"