Merge pull request #7696 from singhAws/code-review-tool

fix(amazonq): handle suppress single finding, change icon

Author: BlakeLazarine

packages/amazonq/src/lsp/chat/messages.ts

@@ -95,6 +95,7 @@ import { decryptResponse, encryptRequest } from '../encryption'
 import { getCursorState } from '../utils'
 import { focusAmazonQPanel } from './commands'
 import { ChatMessage } from '@aws/language-server-runtimes/server-interface'
+import { CommentUtils } from 'aws-core-vscode/utils'
 
 export function registerActiveEditorChangeListener(languageClient: LanguageClient) {
     let debounceTimer: NodeJS.Timeout | undefined
@@ -701,7 +702,7 @@ async function handleCompleteResult<T extends ChatResult>(
 ) {
     const decryptedMessage = await decryptResponse<T>(result, encryptionKey)
 
-    handleSecurityFindings(decryptedMessage, languageClient)
+    await handleSecurityFindings(decryptedMessage, languageClient)
 
     void provider.webview?.postMessage({
         command: chatRequestType.method,
@@ -716,10 +717,10 @@ async function handleCompleteResult<T extends ChatResult>(
     disposable.dispose()
 }
 
-function handleSecurityFindings(
+async function handleSecurityFindings(
     decryptedMessage: { additionalMessages?: ChatMessage[] },
     languageClient: LanguageClient
-): void {
+): Promise<void> {
     if (decryptedMessage.additionalMessages === undefined || decryptedMessage.additionalMessages.length === 0) {
         return
     }
@@ -730,10 +731,18 @@ function handleSecurityFindings(
                 try {
                     const aggregatedCodeScanIssues: AggregatedCodeScanIssue[] = JSON.parse(message.body)
                     for (const aggregatedCodeScanIssue of aggregatedCodeScanIssues) {
+                        const document = await vscode.workspace.openTextDocument(aggregatedCodeScanIssue.filePath)
                         for (const issue of aggregatedCodeScanIssue.issues) {
-                            issue.visible = !CodeWhispererSettings.instance
+                            const isIssueTitleIgnored = CodeWhispererSettings.instance
                                 .getIgnoredSecurityIssues()
                                 .includes(issue.title)
+                            const isSingleIssueIgnored = CommentUtils.detectCommentAboveLine(
+                                document,
+                                issue.startLine,
+                                CodeWhispererConstants.amazonqIgnoreNextLine
+                            )
+
+                            issue.visible = !isIssueTitleIgnored && !isSingleIssueIgnored
                         }
                     }
                     initSecurityScanRender(aggregatedCodeScanIssues, undefined, CodeAnalysisScope.PROJECT)

packages/amazonq/src/lsp/client.ts

@@ -186,6 +186,7 @@ export async function startLanguageServer(
                         reroute: true,
                         modelSelection: true,
                         workspaceFilePath: vscode.workspace.workspaceFile?.fsPath,
+                        qCodeReviewInChat: true,
                     },
                     window: {
                         notifications: true,

packages/amazonq/test/unit/codewhisperer/service/securityIssueHoverProvider.test.ts

@@ -21,17 +21,41 @@ describe('securityIssueHoverProvider', () => {
         token = new vscode.CancellationTokenSource()
     })
 
-    function buildCommandLink(command: string, args: any[], label: string, tooltip: string): string {
-        return `[$(${command.includes('ignore') ? 'error' : 'comment'}) ${label}](command:${command}?${encodeURIComponent(JSON.stringify(args))} '${tooltip}')`
+    function buildCommandLink(
+        command: string,
+        commandIcon: string,
+        args: any[],
+        label: string,
+        tooltip: string
+    ): string {
+        return `[$(${commandIcon}) ${label}](command:${command}?${encodeURIComponent(JSON.stringify(args))} '${tooltip}')`
     }
 
     function buildExpectedContent(issue: any, fileName: string, description: string, severity?: string): string {
         const severityBadge = severity ? ` ![${severity}](severity-${severity.toLowerCase()}.svg)` : ' '
         const commands = [
-            buildCommandLink('aws.amazonq.explainIssue', [issue, fileName], 'Explain', 'Explain with Amazon Q'),
-            buildCommandLink('aws.amazonq.generateFix', [issue, fileName], 'Fix', 'Fix with Amazon Q'),
-            buildCommandLink('aws.amazonq.security.ignore', [issue, fileName, 'hover'], 'Ignore', 'Ignore Issue'),
-            buildCommandLink('aws.amazonq.security.ignoreAll', [issue, 'hover'], 'Ignore All', 'Ignore Similar Issues'),
+            buildCommandLink(
+                'aws.amazonq.explainIssue',
+                'comment',
+                [issue, fileName],
+                'Explain',
+                'Explain with Amazon Q'
+            ),
+            buildCommandLink('aws.amazonq.generateFix', 'wrench', [issue, fileName], 'Fix', 'Fix with Amazon Q'),
+            buildCommandLink(
+                'aws.amazonq.security.ignore',
+                'error',
+                [issue, fileName, 'hover'],
+                'Ignore',
+                'Ignore Issue'
+            ),
+            buildCommandLink(
+                'aws.amazonq.security.ignoreAll',
+                'error',
+                [issue, 'hover'],
+                'Ignore All',
+                'Ignore Similar Issues'
+            ),
         ]
         return `## title${severityBadge}\n${description}\n\n${commands.join('\n | ')}\n`
     }

packages/core/src/codewhisperer/service/securityIssueHoverProvider.ts

@@ -90,7 +90,7 @@ export class SecurityIssueHoverProvider implements vscode.HoverProvider {
         const generateFixCommand = this._getCommandMarkdown(
             'aws.amazonq.generateFix',
             [issue, filePath],
-            'comment',
+            'wrench',
             'Fix',
             'Fix with Amazon Q'
         )

packages/core/src/shared/utilities/index.ts

@@ -7,3 +7,4 @@ export { isExtensionInstalled, isExtensionActive } from './vsCodeUtils'
 export { VSCODE_EXTENSION_ID } from '../extensions'
 export * from './functionUtils'
 export * as messageUtils from './messages'
+export * as CommentUtils from './commentUtils'