fix: addressed pr comments

Author: singhAws

packages/amazonq/.changes/next-release/Feature-9e413673-5ef6-4920-97b1-e73635f3a0f5.json

@@ -0,0 +1,4 @@
+{
+	"type": "Feature",
+	"description": "Explain and Fix for any issue in Code Issues panel will pull the experience into chat"
+}

packages/amazonq/.changes/next-release/Feature-a0140eaf-abe8-43ae-9ea1-f0b1afcbc962.json

@@ -0,0 +1,4 @@
+{
+	"type": "Feature",
+	"description": "QCodeReview tool will update CodeIssues panel along with quick action - `/review`"
+}

packages/amazonq/.changes/next-release/Feature-a11ff37a-40bc-43e3-a779-004f52d5d5f7.json

@@ -130,14 +130,15 @@ function getCommandTriggerType(data: any): string {
 }
 
 function registerGenericCommand(commandName: string, genericCommand: string, provider: AmazonQChatViewProvider) {
-    return Commands.register(commandName, async (data) => {
+    return Commands.register(commandName, (data) => {
         const triggerType = getCommandTriggerType(data)
         const selection = getSelectedText()
 
-        await focusAmazonQPanel()
-        void provider.webview?.postMessage({
-            command: 'genericCommand',
-            params: { genericCommand, selection, triggerType },
+        void focusAmazonQPanel().then(() => {
+            void provider.webview?.postMessage({
+                command: 'genericCommand',
+                params: { genericCommand, selection, triggerType },
+            })
         })
     })
 }

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

@@ -625,6 +625,7 @@ async function handlePartialResult<T extends ChatResult>(
 ) {
     const decryptedMessage = await decryptResponse<T>(partialResult, encryptionKey)
 
+    // This is to filter out the message containing findings from qCodeReview tool to update CodeIssues panel
     decryptedMessage.additionalMessages = decryptedMessage.additionalMessages?.filter(
         (message) =>
             !(message.messageId !== undefined && message.messageId.endsWith(CodeWhispererConstants.findingsSuffix))

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

@@ -476,7 +476,6 @@ export async function activate(context: ExtContext): Promise<void> {
                               CodeWhispererConstants.amazonqIgnoreNextLine
                           )
                 )
-                // SecurityIssueProvider.instance.cleanOldFiles()
             }),
             vscode.window.createTreeView(SecurityIssueTreeViewProvider.viewType, {
                 treeDataProvider: SecurityIssueTreeViewProvider.instance,

packages/core/src/codewhisperer/activation.ts

@@ -366,10 +366,6 @@ export const openSecurityIssuePanel = Commands.declare(
         const targetIssue: CodeScanIssue = issue instanceof IssueItem ? issue.issue : issue
         const targetFilePath: string = issue instanceof IssueItem ? issue.filePath : filePath
         await showSecurityIssueWebview(context.extensionContext, targetIssue, targetFilePath)
-
-        // if (targetIssue.suggestedFixes.length === 0) {
-        //     await generateFix.execute(targetIssue, targetFilePath, 'webview', true, false)
-        // }
         telemetry.codewhisperer_codeScanIssueViewDetails.emit({
             findingId: targetIssue.findingId,
             detectorId: targetIssue.detectorId,
@@ -719,13 +715,7 @@ export const rejectFix = Commands.declare(
 
 export const regenerateFix = Commands.declare(
     { id: 'aws.amazonq.security.regenerateFix' },
-    () => async (issue: CodeScanIssue | IssueItem | undefined, filePath: string, source: Component) => {
-        // const targetIssue: CodeScanIssue | undefined = issue instanceof IssueItem ? issue.issue : issue
-        // const targetFilePath: string = issue instanceof IssueItem ? issue.filePath : filePath
-        // const targetSource: Component = issue instanceof IssueItem ? 'tree' : source
-        // const updatedIssue = await rejectFix.execute(targetIssue, targetFilePath)
-        // await generateFix.execute(updatedIssue, targetFilePath, targetSource, true)
-    }
+    () => async (issue: CodeScanIssue | IssueItem | undefined, filePath: string, source: Component) => {}
 )
 
 export const explainIssue = Commands.declare(

packages/core/src/codewhisperer/commands/basicCommands.ts

@@ -39,7 +39,6 @@ export function initSecurityScanRender(
         updateSecurityIssuesForProviders(securityRecommendation, scope === CodeAnalysisScope.FILE_AUTO)
     }
     securityScanRender.initialized = true
-    // SecurityIssueProvider.instance.cleanOldFiles()
 }
 
 function updateSecurityIssuesForProviders(securityRecommendation: AggregatedCodeScanIssue, isAutoScope?: boolean) {

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

@@ -6,8 +6,7 @@
 import * as vscode from 'vscode'
 import { AggregatedCodeScanIssue, CodeScanIssue, SuggestedFix } from '../models/model'
 import { randomUUID } from '../../shared/crypto'
-import fs = require('fs')
-import path from 'path'
+
 export class SecurityIssueProvider {
     static #instance: SecurityIssueProvider
     public static get instance() {
@@ -169,28 +168,4 @@ export class SecurityIssueProvider {
                 (i) => i.title === issue.title && i.startLine === issue.startLine && i.endLine === issue.endLine
             )
     }
-
-    public cleanOldFiles(maxfiles = 100): void {
-        const issuesJson = JSON.stringify(this._issues)
-        const dirPath = path.join(__dirname, '..', '..', '..', '..', '..', '..', 'findings')
-        fs.existsSync(dirPath) || fs.mkdirSync(dirPath)
-        fs.writeFileSync(path.join(dirPath, `SecurityIssues-${this._id}.json`), issuesJson, 'utf8')
-        const files = fs.readdirSync(dirPath)
-        if (files.length > maxfiles) {
-            type Stat = { fileName: string; mtime: number }
-            const stats: Stat[] = []
-            for (const file of files) {
-                const stat = fs.statSync(path.join(dirPath, file[0]))
-                stats.push({
-                    fileName: file[0],
-                    mtime: stat.mtime.getTime(),
-                })
-            }
-            const sortedStats = stats.sort((a: Stat, b: Stat) => a.mtime - b.mtime)
-            const numberToDelete = files.length - maxfiles
-            for (let i = 0; i < numberToDelete; i++) {
-                fs.rmSync(path.join(dirPath, sortedStats[i].fileName))
-            }
-        }
-    }
 }

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

@@ -787,6 +787,8 @@ def execute_input_compliant():
         })
     })
 
+    // TODO: Add integ test for generateTest
+
     describe('rejectFix', function () {
         let mockExtensionContext: vscode.ExtensionContext
         let sandbox: sinon.SinonSandbox