From e8fcb86c8a2f92d621c28f2852419795892d5fad Mon Sep 17 00:00:00 2001 From: Vladimir Dolzhenko Date: Mon, 14 Nov 2022 10:45:34 +0100 Subject: [PATCH] [kotlin] OCB has to be triggered on project reimport #KTIJ-23496 Fixed GitOrigin-RevId: 272915d2cc0c98feceaba39393eccf55b67f424d --- .../gradleJava/scripting/roots/GradleBuildRootsManager.kt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/scripting/roots/GradleBuildRootsManager.kt b/plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/scripting/roots/GradleBuildRootsManager.kt index 59719a6cb08f..a1348d257d36 100644 --- a/plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/scripting/roots/GradleBuildRootsManager.kt +++ b/plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/scripting/roots/GradleBuildRootsManager.kt @@ -15,6 +15,7 @@ import com.intellij.psi.PsiManager import com.intellij.ui.EditorNotifications import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.launch +import org.jetbrains.kotlin.idea.caches.trackers.KotlinCodeBlockModificationListener import org.jetbrains.kotlin.idea.core.KotlinPluginDisposable import org.jetbrains.kotlin.idea.core.script.ScriptConfigurationManager import org.jetbrains.kotlin.idea.core.script.configuration.CompositeScriptConfigurationManager @@ -429,9 +430,12 @@ class GradleBuildRootsManager(val project: Project) : GradleBuildRootsLocator(pr } if (restartAnalyzer) { + KotlinCodeBlockModificationListener.getInstance(project).incModificationCount() // this required only for "pause" state - val ktFile = PsiManager.getInstance(project).findFile(it) - if (ktFile != null) DaemonCodeAnalyzer.getInstance(project).restart(ktFile) + PsiManager.getInstance(project).findFile(it)?.let { ktFile -> + DaemonCodeAnalyzer.getInstance(project).restart(ktFile) + } + } EditorNotifications.getInstance(project).updateAllNotifications()