Fix ProhibitedAnalysisException in KotestStructureViewExtension

Author: sksamuel

src/IC-242/kotlin/io/kotest/plugin/intellij/psi/superClasses.kt

@@ -1,8 +1,8 @@
 package io.kotest.plugin.intellij.psi
 
+import com.intellij.openapi.application.runReadAction
 import org.jetbrains.kotlin.analysis.api.analyze
 import org.jetbrains.kotlin.analysis.api.permissions.KaAllowAnalysisOnEdt
-import org.jetbrains.kotlin.analysis.api.permissions.allowAnalysisOnEdt
 import org.jetbrains.kotlin.analysis.api.types.symbol
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.StandardClassIds
@@ -15,10 +15,7 @@ import org.jetbrains.kotlin.psi.KtClassOrObject
 fun KtClassOrObject.getAllSuperClasses(): List<FqName> {
    return superTypeListEntries.mapNotNull { it.typeReference }
       .flatMap { ref ->
-         // SurroundSelectionWithFunctionIntention.isAvailable is called in EDT before the intention is applied
-         // unfortunately API to avoid this was introduced in 23.2 only
-         // this we need to move intentions to the facade or accept EDT here until 23.2- are still supported
-         allowAnalysisOnEdt {
+         runReadAction {
             analyze(this) {
                val kaType = ref.type
                val superTypes = (kaType.allSupertypes(false) + kaType).toList()

src/IC-243/kotlin/io/kotest/plugin/intellij/psi/superClasses.kt

@@ -15,17 +15,12 @@ import org.jetbrains.kotlin.psi.KtClassOrObject
 fun KtClassOrObject.getAllSuperClasses(): List<FqName> {
    return superTypeListEntries.mapNotNull { it.typeReference }
       .flatMap { ref ->
-         // SurroundSelectionWithFunctionIntention.isAvailable is called in EDT before the intention is applied
-         // unfortunately API to avoid this was introduced in 23.2 only
-         // this we need to move intentions to the facade or accept EDT here until 23.2- are still supported
-         allowAnalysisOnEdt {
-            analyze(this) {
-               val kaType = ref.type
-               val superTypes = (kaType.allSupertypes(false) + kaType).toList()
-               superTypes.mapNotNull {
-                  val classId = it.symbol?.classId?.takeIf { id -> id != StandardClassIds.Any }
-                  classId?.asSingleFqName()
-               }
+         analyze(this) {
+            val kaType = ref.type
+            val superTypes = (kaType.allSupertypes(false) + kaType).toList()
+            superTypes.mapNotNull {
+               val classId = it.symbol?.classId?.takeIf { id -> id != StandardClassIds.Any }
+               classId?.asSingleFqName()
             }
          }
       }

src/IC-251/kotlin/io/kotest/plugin/intellij/psi/superClasses.kt

@@ -15,17 +15,12 @@ import org.jetbrains.kotlin.psi.KtClassOrObject
 fun KtClassOrObject.getAllSuperClasses(): List<FqName> {
    return superTypeListEntries.mapNotNull { it.typeReference }
       .flatMap { ref ->
-         // SurroundSelectionWithFunctionIntention.isAvailable is called in EDT before the intention is applied
-         // unfortunately API to avoid this was introduced in 23.2 only
-         // this we need to move intentions to the facade or accept EDT here until 23.2- are still supported
-         allowAnalysisOnEdt {
-            analyze(this) {
-               val kaType = ref.type
-               val superTypes = (kaType.allSupertypes(false) + kaType).toList()
-               superTypes.mapNotNull {
-                  val classId = it.symbol?.classId?.takeIf { id -> id != StandardClassIds.Any }
-                  classId?.asSingleFqName()
-               }
+         analyze(this) {
+            val kaType = ref.type
+            val superTypes = (kaType.allSupertypes(false) + kaType).toList()
+            superTypes.mapNotNull {
+               val classId = it.symbol?.classId?.takeIf { id -> id != StandardClassIds.Any }
+               classId?.asSingleFqName()
             }
          }
       }

src/main/kotlin/io/kotest/plugin/intellij/intentions/SurroundSelectionWithFunctionIntention.kt

@@ -1,6 +1,7 @@
 package io.kotest.plugin.intellij.intentions
 
 import com.intellij.codeInsight.intention.PsiElementBaseIntentionAction
+import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.TextRange
@@ -15,6 +16,9 @@ import org.jetbrains.kotlin.resolve.ImportPath
 abstract class SurroundSelectionWithFunctionIntention : PsiElementBaseIntentionAction() {
 
    override fun isAvailable(project: Project, editor: Editor?, element: PsiElement): Boolean {
+      if (ApplicationManager.getApplication().isDispatchThread) {
+         return false
+      }
       return try {
          editor?.selectionModel?.hasSelection() == true && element.isContainedInSpec()
       } catch (e: Exception) {

src/main/kotlin/io/kotest/plugin/intellij/structure/KotestStructureViewExtension.kt

@@ -5,8 +5,8 @@ import com.intellij.ide.structureView.StructureViewExtension
 import com.intellij.ide.structureView.StructureViewTreeElement
 import com.intellij.ide.util.treeView.smartTree.TreeElement
 import com.intellij.navigation.ItemPresentation
+import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.editor.Editor
-import com.intellij.openapi.project.DumbService
 import com.intellij.psi.NavigatablePsiElement
 import com.intellij.psi.PsiElement
 import io.kotest.plugin.intellij.Test
@@ -25,11 +25,14 @@ class KotestStructureViewExtension : StructureViewExtension {
    }
 
    override fun getChildren(parent: PsiElement): Array<StructureViewTreeElement> {
-      if (DumbService.isDumb(parent.project)) return emptyArray()
+      if (ApplicationManager.getApplication().isDispatchThread) {
+         return emptyArray()
+      }
       val ktClassOrObject = parent as? KtClassOrObject ?: return emptyArray()
       val spec = ktClassOrObject.specStyle() ?: return emptyArray()
       val tests = spec.tests(parent, false)
-      return tests.map { KotestTestStructureViewTreeElement(it) }.toTypedArray()
+      val children = tests.map { KotestTestStructureViewTreeElement(it) }
+      return children.toTypedArray()
    }
 
    class KotestTestStructureViewTreeElement(private val testElement: TestElement) : StructureViewTreeElement {