patch

Author: Will-ShaoHua

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/startup/AmazonQStartupActivity.kt

@@ -47,26 +47,24 @@ class AmazonQStartupActivity : ProjectActivity {
         // Automatically start the project context LSP after some delay when average CPU load is below 30%.
         // The CPU load requirement is to avoid competing with native JetBrains indexing and other CPU expensive OS processes
         // In the future we will decouple LSP start and indexing start to let LSP perform other tasks.
-        if (CodeWhispererSettings.getInstance().isProjectContextEnabled()) {
-            val startLspIndexingDuration = Duration.ofMinutes(30)
-            project.waitForSmartMode()
-            try {
-                withTimeout(startLspIndexingDuration) {
-                    while (true) {
-                        val cpuUsage = ManagementFactory.getOperatingSystemMXBean().systemLoadAverage
-                        if (cpuUsage > 0 && cpuUsage < 30) {
-                            ProjectContextController.getInstance(project = project)
-                            break
-                        } else {
-                            delay(60_000) // Wait for 60 seconds
-                        }
+        val startLspIndexingDuration = Duration.ofMinutes(30)
+        project.waitForSmartMode()
+        try {
+            withTimeout(startLspIndexingDuration) {
+                while (true) {
+                    val cpuUsage = ManagementFactory.getOperatingSystemMXBean().systemLoadAverage
+                    if (cpuUsage > 0 && cpuUsage < 30) {
+                        ProjectContextController.getInstance(project = project)
+                        break
+                    } else {
+                        delay(60_000) // Wait for 60 seconds
                     }
                 }
-            } catch (e: TimeoutCancellationException) {
-                LOG.warn { "Failed to start LSP server due to time out" }
-            } catch (e: Exception) {
-                LOG.warn { "Failed to start LSP server" }
             }
+        } catch (e: TimeoutCancellationException) {
+            LOG.warn { "Failed to start LSP server due to time out" }
+        } catch (e: Exception) {
+            LOG.warn { "Failed to start LSP server" }
         }
     }
 

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/project/ProjectContextController.kt

@@ -8,6 +8,11 @@ import com.intellij.openapi.components.Service
 import com.intellij.openapi.components.service
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.Disposer
+import com.intellij.openapi.vfs.VirtualFileManager
+import com.intellij.openapi.vfs.newvfs.BulkFileListener
+import com.intellij.openapi.vfs.newvfs.events.VFileCreateEvent
+import com.intellij.openapi.vfs.newvfs.events.VFileDeleteEvent
+import com.intellij.openapi.vfs.newvfs.events.VFileEvent
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import software.aws.toolkits.core.utils.getLogger
@@ -24,6 +29,18 @@ class ProjectContextController(private val project: Project, private val cs: Cor
                 encoderServer.downloadArtifactsAndStartServer()
             }
         }
+
+        project.messageBus.connect(this).subscribe(VirtualFileManager.VFS_CHANGES, object : BulkFileListener {
+            override fun after(events: MutableList<out VFileEvent>) {
+                events.forEach {
+                    if (it is VFileCreateEvent) {
+                        println("create")
+                    } else if (it is VFileDeleteEvent) {
+                        println("delete")
+                    }
+                }
+            }
+        })
     }
 
     enum class IndexUpdateMode(val value: String) {

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/project/ProjectContextEditorListener.kt

@@ -2,15 +2,15 @@
 // SPDX-License-Identifier: Apache-2.0
 
 package software.aws.toolkits.jetbrains.services.amazonq.project
-import com.intellij.openapi.fileEditor.FileEditorManager
+import com.intellij.openapi.fileEditor.FileEditorManagerEvent
 import com.intellij.openapi.fileEditor.FileEditorManagerListener
-import com.intellij.openapi.vfs.VirtualFile
-import software.aws.toolkits.jetbrains.settings.CodeWhispererSettings
 
 class ProjectContextEditorListener : FileEditorManagerListener {
-    override fun fileClosed(source: FileEditorManager, file: VirtualFile) {
-        if (CodeWhispererSettings.getInstance().isProjectContextEnabled()) {
-            ProjectContextController.getInstance(source.project).updateIndex(file.path)
-        }
+    override fun selectionChanged(event: FileEditorManagerEvent) {
+        val project = event.manager.project
+        val oldFile = event.oldFile ?: return
+
+        // TODO: should run under BGT
+        ProjectContextController.getInstance(project).updateIndex(listOf(oldFile.path), "update")
     }
 }