improve-navigation-change-service

Author: shalom938

jvm-common/src/main/kotlin/org/digma/intellij/plugin/idea/navigation/NavigationDiscoveryChangeService.kt

@@ -1,6 +1,7 @@
 package org.digma.intellij.plugin.idea.navigation
 
 import com.intellij.openapi.Disposable
+import com.intellij.openapi.application.readAction
 import com.intellij.openapi.components.Service
 import com.intellij.openapi.diagnostic.Logger
 import com.intellij.openapi.project.Project
@@ -24,7 +25,6 @@ import kotlinx.coroutines.launch
 import kotlinx.datetime.Clock
 import kotlinx.datetime.Instant
 import org.digma.intellij.plugin.common.isProjectValid
-import org.digma.intellij.plugin.common.runInReadAccessWithResult
 import org.digma.intellij.plugin.errorreporting.ErrorReporter
 import org.digma.intellij.plugin.idea.psi.isJvmSupportedFile
 import org.digma.intellij.plugin.log.Log
@@ -483,12 +483,12 @@ class NavigationDiscoveryChangeService(private val project: Project, private val
 
 
     private interface ItemProcessor<T> {
-        fun process(item: T)
+        suspend fun process(item: T)
     }
 
 
     private inner class FileEventsProcessor : ItemProcessor<VFileEvent> {
-        override fun process(item: VFileEvent) {
+        override suspend fun process(item: VFileEvent) {
 
             try {
 
@@ -554,7 +554,7 @@ class NavigationDiscoveryChangeService(private val project: Project, private val
 
 
     private inner class ChangedFileProcessor : ItemProcessor<String> {
-        override fun process(item: String) {
+        override suspend fun process(item: String) {
 
             try {
 
@@ -572,9 +572,10 @@ class NavigationDiscoveryChangeService(private val project: Project, private val
     }
 
 
-    private fun updateNavigation(project: Project, file: VirtualFile) {
+    private suspend fun updateNavigation(project: Project, file: VirtualFile) {
         if (isValidRelevantFile(project, file)) {
-            val psiFile = runInReadAccessWithResult {
+
+            val psiFile = readAction {
                 PsiManager.getInstance(project).findFile(file)
             }
             psiFile?.let {

jvm-common/src/main/kotlin/org/digma/intellij/plugin/idea/navigation/navigationUtils.kt

@@ -1,18 +1,17 @@
 package org.digma.intellij.plugin.idea.navigation
 
+import com.intellij.openapi.application.readAction
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.roots.ProjectFileIndex
 import com.intellij.openapi.util.Computable
 import com.intellij.openapi.vfs.VirtualFile
-import org.digma.intellij.plugin.common.ReadActions
 import org.digma.intellij.plugin.common.executeCatchingIgnorePCE
 import org.digma.intellij.plugin.common.executeCatchingWithResultIgnorePCE
 import org.digma.intellij.plugin.common.isProjectValid
 import org.digma.intellij.plugin.common.isValidVirtualFile
 import org.digma.intellij.plugin.common.runWIthRetryIgnorePCE
 import org.digma.intellij.plugin.common.runWIthRetryWithResultIgnorePCE
 import org.digma.intellij.plugin.idea.navigation.model.NavigationProcessContext
-import java.util.function.Supplier
 
 
 fun executeCatchingWithRetry(
@@ -53,7 +52,7 @@ fun isRelevantFile(project: Project, file: VirtualFile?): Boolean {
 
 //this method checks isInContent which needs read access. don't call it from EDT events like
 // onChange in psi tree listeners because it will cause short freezes, only call it on background processing
-fun isValidRelevantFile(project: Project, file: VirtualFile?): Boolean {
+suspend fun isValidRelevantFile(project: Project, file: VirtualFile?): Boolean {
     return isRelevantFile(project, file) &&
             isValidVirtualFile(file) &&
             file != null &&
@@ -63,8 +62,8 @@ fun isValidRelevantFile(project: Project, file: VirtualFile?): Boolean {
 
 //don't call this method on EDT events like onChange in psi tree listeners because it will
 // cause short freezes, only call it on background processing
-fun isInContent(project: Project, file: VirtualFile): Boolean {
-    return ReadActions.ensureReadAction(Supplier {
+suspend fun isInContent(project: Project, file: VirtualFile): Boolean {
+    return readAction {
         ProjectFileIndex.getInstance(project).isInContent(file)
-    })
+    }
 }