Add Q changelogs. Fix project root issue with codescan (#4398)

Author: ashishrp-aws

.changes/next-release/feature-6a7485b3-57cb-430d-8ff5-4caaa0392b1c.json

@@ -0,0 +1,4 @@
+{
+  "type" : "feature",
+  "description" : "Amazon Q: Security scans can now run on all files in the project"
+}

.changes/next-release/feature-7bef8821-56c1-49ca-b21a-e8cbed4b5a06.json

@@ -0,0 +1,4 @@
+{
+  "type" : "feature",
+  "description" : "Amazon Q: Send security issue to chat for explanation and fix"
+}

.changes/next-release/feature-e764fbd7-c6b5-4435-8d3d-a7d54f856355.json

@@ -0,0 +1,4 @@
+{
+  "type" : "feature",
+  "description" : "Amazon Q: Security scans can now run automatically when file changes are made"
+}

plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/CodeWhispererCodeScanManager.kt

@@ -435,6 +435,10 @@ class CodeWhispererCodeScanManager(val project: Project) {
         ?: error(message("codewhisperer.codescan.problems_window_not_found"))
 
     private fun reset() = runInEdt {
+        // clear the codeScanTreeNodeRoot
+        synchronized(codeScanTreeNodeRoot) {
+            codeScanTreeNodeRoot.removeAllChildren()
+        }
         // Remove previous document listeners before starting a new scan.
         fileNodeLookup.clear()
         // Erase all range highlighter before cleaning up.
@@ -454,27 +458,13 @@ class CodeWhispererCodeScanManager(val project: Project) {
             val editorFactory = EditorFactory.getInstance()
             editorFactory.eventMulticaster.addDocumentListener(documentListener, project)
             editorFactory.addEditorFactoryListener(fileListener, project)
+            EditorFactory.getInstance().eventMulticaster.addEditorMouseMotionListener(
+                editorMouseListener,
+                codeScanIssuesContent
+            )
         }
     }
 
-    private fun addListeners() {
-        fileNodeLookup.keys.forEach { file ->
-            runInEdt {
-                val document = FileDocumentManager.getInstance().getDocument(file)
-                if (document == null) {
-                    LOG.error { message("codewhisperer.codescan.file_not_found", file.path) }
-                    return@runInEdt
-                }
-                document.addDocumentListener(documentListener, codeScanIssuesContent)
-            }
-        }
-        EditorFactory.getInstance().eventMulticaster.removeEditorMouseMotionListener(editorMouseListener)
-        EditorFactory.getInstance().eventMulticaster.addEditorMouseMotionListener(
-            editorMouseListener,
-            codeScanIssuesContent
-        )
-    }
-
     private fun beforeCodeScan() {
         addCodeScanUI(setSelected = true)
         // Show in progress indicator
@@ -518,7 +508,17 @@ class CodeWhispererCodeScanManager(val project: Project) {
     private fun createCodeScanIssuesTree(codeScanIssues: List<CodeWhispererCodeScanIssue>): DefaultMutableTreeNode {
         LOG.debug { "Rendering response from the scan API" }
 
-        codeScanTreeNodeRoot.removeAllChildren()
+        synchronized(codeScanTreeNodeRoot) {
+            codeScanTreeNodeRoot.removeAllChildren()
+        }
+        // clear file node lookup and scan node lookup
+        synchronized(fileNodeLookup) {
+            fileNodeLookup.clear()
+        }
+        synchronized(scanNodesLookup) {
+            scanNodesLookup.clear()
+        }
+
         codeScanIssues.forEach { issue ->
             val fileNode = synchronized(fileNodeLookup) {
                 fileNodeLookup.getOrPut(issue.file) {
@@ -536,8 +536,6 @@ class CodeWhispererCodeScanManager(val project: Project) {
                 mutableListOf()
             }.add(scanNode)
         }
-        // Add document and editor listeners to the documents having scan issues.
-        addListeners()
         return codeScanTreeNodeRoot
     }
 
@@ -559,10 +557,14 @@ class CodeWhispererCodeScanManager(val project: Project) {
             }
         }
         // Remove the old scan nodes from the file node.
-        fileNode.removeAllChildren()
+        synchronized(fileNode) {
+            fileNode.removeAllChildren()
+        }
         // Remove the entry for the file from the scan nodes lookup.
-        if (scanNodesLookup.containsKey(file)) {
-            scanNodesLookup.remove(file)
+        synchronized(scanNodesLookup) {
+            if (scanNodesLookup.containsKey(file)) {
+                scanNodesLookup.remove(file)
+            }
         }
 
         // Add new issues to the file node.
@@ -579,8 +581,6 @@ class CodeWhispererCodeScanManager(val project: Project) {
             fileNodeLookup.remove(file)
         }
 
-        // Add document and editor listeners to the documents having scan issues.
-        addListeners()
         return codeScanTreeNodeRoot
     }
 
@@ -606,7 +606,7 @@ class CodeWhispererCodeScanManager(val project: Project) {
                 codeScanIssuesContent.displayName =
                     message("codewhisperer.codescan.scan_display_with_issues", totalIssuesCount, INACTIVE_TEXT_COLOR)
             }
-            codeScanResultsPanel.updateAndDisplayScanResults(codeScanTreeModel, scannedFiles, isProjectTruncated)
+            codeScanResultsPanel.updateAndDisplayScanResults(codeScanTreeModel, scannedFiles, isProjectTruncated, scope)
         }
     }
 

plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/CodeWhispererCodeScanResultsView.kt

@@ -21,6 +21,7 @@ import software.aws.toolkits.jetbrains.services.codewhisperer.codescan.listeners
 import software.aws.toolkits.jetbrains.services.codewhisperer.layout.CodeWhispererLayoutConfig
 import software.aws.toolkits.jetbrains.services.codewhisperer.layout.CodeWhispererLayoutConfig.addHorizontalGlue
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererColorUtil.INACTIVE_TEXT_COLOR
+import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants
 import software.aws.toolkits.resources.message
 import java.awt.BorderLayout
 import java.awt.Component
@@ -118,7 +119,12 @@ internal class CodeWhispererCodeScanResultsView(private val project: Project) :
     /**
      * Updates the [codeScanTree] with the new tree model root and displays the same on the UI.
      */
-    fun updateAndDisplayScanResults(scanTreeModel: CodeWhispererCodeScanTreeModel, scannedFiles: List<VirtualFile>, isProjectTruncated: Boolean) {
+    fun updateAndDisplayScanResults(
+        scanTreeModel: CodeWhispererCodeScanTreeModel,
+        scannedFiles: List<VirtualFile>,
+        isProjectTruncated: Boolean,
+        scope: CodeWhispererConstants.CodeAnalysisScope
+    ) {
         codeScanTree.apply {
             model = scanTreeModel
             repaint()
@@ -142,7 +148,9 @@ internal class CodeWhispererCodeScanResultsView(private val project: Project) :
             repaint()
         }
 
-        changeInfoLabelToDisplayScanCompleted(scannedFiles.size, isProjectTruncated)
+        if (scope == CodeWhispererConstants.CodeAnalysisScope.PROJECT) {
+            changeInfoLabelToDisplayScanCompleted(scannedFiles.size, isProjectTruncated)
+        }
     }
 
     fun setStoppingCodeScan() {

plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/sessionconfig/CodeScanSessionConfig.kt

@@ -40,7 +40,9 @@ class CodeScanSessionConfig(
     private val project: Project,
     private val scope: CodeAnalysisScope
 ) {
-    var projectRoot = project.guessProjectDir() ?: error("Cannot guess base directory for project ${project.name}")
+    var projectRoot = project.basePath?.let { Path.of(it) }?.toFile()?.toVirtualFile() ?: run {
+        project.guessProjectDir() ?: error("Cannot guess base directory for project ${project.name}")
+    }
         private set
 
     private var isProjectTruncated = false