From 726430b3f8f9451358cee45fcc6ee9dc73892694 Mon Sep 17 00:00:00 2001 From: Blake Lazarine Date: Tue, 30 Sep 2025 11:13:35 -0700 Subject: [PATCH 1/3] fix(amazonq): remove findings message from chat when all issues ignored --- ...-70bc0500-d30a-4cc9-99b9-49ab3fd3f84b.json | 4 +++ .../amazonq/webview/BrowserConnector.kt | 26 ++++++++----------- 2 files changed, 15 insertions(+), 15 deletions(-) create mode 100644 .changes/next-release/bugfix-70bc0500-d30a-4cc9-99b9-49ab3fd3f84b.json diff --git a/.changes/next-release/bugfix-70bc0500-d30a-4cc9-99b9-49ab3fd3f84b.json b/.changes/next-release/bugfix-70bc0500-d30a-4cc9-99b9-49ab3fd3f84b.json new file mode 100644 index 00000000000..3a20ce2e74a --- /dev/null +++ b/.changes/next-release/bugfix-70bc0500-d30a-4cc9-99b9-49ab3fd3f84b.json @@ -0,0 +1,4 @@ +{ + "type" : "bugfix", + "description" : "remove findings message from chat even when all issues are ignored" +} \ No newline at end of file diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/BrowserConnector.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/BrowserConnector.kt index 93df86fdad5..95ac089f7cd 100644 --- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/BrowserConnector.kt +++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/BrowserConnector.kt @@ -674,22 +674,18 @@ class BrowserConnector( } } - if (mappedFindings.isNotEmpty()) { - CodeWhispererCodeScanManager.getInstance(project) - .addOnDemandIssues( - mappedFindings, - scannedFiles, - CodeWhispererConstants.CodeAnalysisScope.AGENTIC - ) - CodeWhispererCodeScanManager.getInstance(project).showCodeScanUI() - - // Remove findings messages from response payload - val rootNode = serializer.objectMapper.readTree(responsePayload) as ObjectNode - rootNode.remove("additionalMessages") - return serializer.objectMapper.writeValueAsString(rootNode) - } + CodeWhispererCodeScanManager.getInstance(project) + .addOnDemandIssues( + mappedFindings, + scannedFiles, + CodeWhispererConstants.CodeAnalysisScope.AGENTIC + ) + CodeWhispererCodeScanManager.getInstance(project).showCodeScanUI() - return responsePayload + // Remove findings messages from response payload + val rootNode = serializer.objectMapper.readTree(responsePayload) as ObjectNode + rootNode.remove("additionalMessages") + return serializer.objectMapper.writeValueAsString(rootNode) } catch (e: Exception) { LOG.error(e) { "Failed to parse findings message" } return responsePayload From e7aa552f79a6b7f4628b4d396855dc3acef72d0f Mon Sep 17 00:00:00 2001 From: Blake Lazarine Date: Tue, 30 Sep 2025 12:04:17 -0700 Subject: [PATCH 2/3] fix(amazonq): fix unit tests --- .../services/amazonq/webview/BrowserConnector.kt | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/BrowserConnector.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/BrowserConnector.kt index 95ac089f7cd..818f776aba4 100644 --- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/BrowserConnector.kt +++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/BrowserConnector.kt @@ -674,14 +674,16 @@ class BrowserConnector( } } - CodeWhispererCodeScanManager.getInstance(project) - .addOnDemandIssues( - mappedFindings, - scannedFiles, - CodeWhispererConstants.CodeAnalysisScope.AGENTIC - ) - CodeWhispererCodeScanManager.getInstance(project).showCodeScanUI() + if (mappedFindings.isNotEmpty()) { + CodeWhispererCodeScanManager.getInstance(project) + .addOnDemandIssues( + mappedFindings, + scannedFiles, + CodeWhispererConstants.CodeAnalysisScope.AGENTIC + ) + CodeWhispererCodeScanManager.getInstance(project).showCodeScanUI() + } // Remove findings messages from response payload val rootNode = serializer.objectMapper.readTree(responsePayload) as ObjectNode rootNode.remove("additionalMessages") From 65cb18688762858294bd7cac0301e484cb296823 Mon Sep 17 00:00:00 2001 From: Blake Lazarine Date: Tue, 30 Sep 2025 12:59:52 -0700 Subject: [PATCH 3/3] fix(amazonq): fix detekt --- .../jetbrains/services/amazonq/webview/BrowserConnector.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/BrowserConnector.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/BrowserConnector.kt index 818f776aba4..a8a29033859 100644 --- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/BrowserConnector.kt +++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/BrowserConnector.kt @@ -674,7 +674,6 @@ class BrowserConnector( } } - if (mappedFindings.isNotEmpty()) { CodeWhispererCodeScanManager.getInstance(project) .addOnDemandIssues(