CodeWhisperer: fix read operation is not wrapped in readAction (#3763)

Author: Will-ShaoHua

.changes/next-release/bugfix-1dc5ae0c-1b75-4665-aaf4-ade0960cddcd.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "CodeWhisperer: Run read operation in the background thread without runReadAction"
+}

jetbrains-core/src/software/aws/toolkits/jetbrains/services/codewhisperer/util/CodeWhispererFileCrawler.kt

@@ -3,6 +3,7 @@
 
 package software.aws.toolkits.jetbrains.services.codewhisperer.util
 
+import com.intellij.openapi.application.runReadAction
 import com.intellij.openapi.fileEditor.FileEditorManager
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.project.guessProjectDir
@@ -69,15 +70,17 @@ abstract class CodeWhispererFileCrawler : FileCrawler {
             val project = target.project
             val targetElements = keywordProducer(target)
 
-            return FileEditorManager.getInstance(project).openFiles
-                .filter { openedFile ->
-                    openedFile.name != target.virtualFile.name && openedFile.extension == target.virtualFile.extension
-                }
-                .mapNotNull { openedFile -> PsiManager.getInstance(project).findFile(openedFile) }
-                .maxByOrNull {
-                    val elementsToCheck = keywordProducer(it)
-                    countSubstringMatches(targetElements, elementsToCheck)
-                }?.virtualFile
+            return runReadAction {
+                FileEditorManager.getInstance(project).openFiles
+                    .filter { openedFile ->
+                        openedFile.name != target.virtualFile.name && openedFile.extension == target.virtualFile.extension
+                    }
+                    .mapNotNull { openedFile -> PsiManager.getInstance(project).findFile(openedFile) }
+                    .maxByOrNull {
+                        val elementsToCheck = keywordProducer(it)
+                        countSubstringMatches(targetElements, elementsToCheck)
+                    }?.virtualFile
+            }
         }
 
         /**

jetbrains-core/src/software/aws/toolkits/jetbrains/services/codewhisperer/util/JavaCodeWhispererFileCrawler.kt

@@ -112,13 +112,15 @@ object JavaCodeWhispererFileCrawler : CodeWhispererFileCrawler() {
      * check files in editors and pick one which has most substring matches to the target
      */
     private fun findRelevantFileFromEditors(psiFile: PsiFile): VirtualFile? = searchRelevantFileInEditors(psiFile) { myPsiFile ->
-        myPsiFile as PsiClassOwner
-        // (1)
-        val classAndMethod = myPsiFile.classes.mapNotNull { clazz ->
-            // class name itself + its method names
-            listOfNotNull(clazz.name) +
-                clazz.methods.mapNotNull { method -> method.name }
-        }.flatten()
+        if (myPsiFile !is PsiClassOwner) {
+            return@searchRelevantFileInEditors emptyList()
+        }
+
+        val classAndMethod = runReadAction {
+            myPsiFile.classes.mapNotNull { clazz ->
+                listOfNotNull(clazz.name) + clazz.methods.mapNotNull { method -> method.name }
+            }.flatten()
+        }
 
         classAndMethod
     }

jetbrains-core/src/software/aws/toolkits/jetbrains/services/codewhisperer/util/PythonCodeWhispererFileCrawler.kt

@@ -3,6 +3,7 @@
 
 package software.aws.toolkits.jetbrains.services.codewhisperer.util
 
+import com.intellij.openapi.application.runReadAction
 import com.intellij.openapi.module.ModuleUtilCore
 import com.intellij.openapi.project.rootManager
 import com.intellij.openapi.vfs.VfsUtil
@@ -51,16 +52,19 @@ object PythonCodeWhispererFileCrawler : CodeWhispererFileCrawler() {
      * check files in editors and pick one which has most substring matches to the target
      */
     private fun findRelevantFileFromEditors(psiFile: PsiFile): VirtualFile? = searchRelevantFileInEditors(psiFile) { myPsiFile ->
-        myPsiFile as PyFile
-        // (1)
-        val classAndMethod = myPsiFile.topLevelClasses.mapNotNull {
-            // class name itself + its method names
-            listOfNotNull(it.name) +
-                it.methods.mapNotNull { method -> method.name }
-        }.flatten()
+        if (myPsiFile !is PyFile) {
+            return@searchRelevantFileInEditors emptyList()
+        }
+
+        val classAndMethod = runReadAction {
+            myPsiFile.topLevelClasses.mapNotNull {
+                listOfNotNull(it.name) + it.methods.mapNotNull { method -> method.name }
+            }.flatten()
+        }
 
-        // (2)
-        val topLevelFunc = myPsiFile.topLevelFunctions.mapNotNull { it.name }
+        val topLevelFunc = runReadAction {
+            myPsiFile.topLevelFunctions.mapNotNull { it.name }
+        }
 
         classAndMethod + topLevelFunc
     }