Revert "Fix ProhibitedAnalysisException in KotestStructureViewExtension"

This reverts commit 81bd846.

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,7 +15,10 @@ import org.jetbrains.kotlin.psi.KtClassOrObject
 fun KtClassOrObject.getAllSuperClasses(): List<FqName> {
    return superTypeListEntries.mapNotNull { it.typeReference }
       .flatMap { ref ->
-         runReadAction {
+         // 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()

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

@@ -15,12 +15,17 @@ import org.jetbrains.kotlin.psi.KtClassOrObject
 fun KtClassOrObject.getAllSuperClasses(): List<FqName> {
    return superTypeListEntries.mapNotNull { it.typeReference }
       .flatMap { ref ->
-         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()
+         // 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()
+               }
             }
          }
       }

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

@@ -15,12 +15,17 @@ import org.jetbrains.kotlin.psi.KtClassOrObject
 fun KtClassOrObject.getAllSuperClasses(): List<FqName> {
    return superTypeListEntries.mapNotNull { it.typeReference }
       .flatMap { ref ->
-         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()
+         // 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()
+               }
             }
          }
       }

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

@@ -1,7 +1,6 @@
 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
@@ -16,9 +15,6 @@ 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,14 +25,11 @@ class KotestStructureViewExtension : StructureViewExtension {
    }
 
    override fun getChildren(parent: PsiElement): Array<StructureViewTreeElement> {
-      if (ApplicationManager.getApplication().isDispatchThread) {
-         return emptyArray()
-      }
+      if (DumbService.isDumb(parent.project)) return emptyArray()
       val ktClassOrObject = parent as? KtClassOrObject ?: return emptyArray()
       val spec = ktClassOrObject.specStyle() ?: return emptyArray()
       val tests = spec.tests(parent, false)
-      val children = tests.map { KotestTestStructureViewTreeElement(it) }
-      return children.toTypedArray()
+      return tests.map { KotestTestStructureViewTreeElement(it) }.toTypedArray()
    }
 
    class KotestTestStructureViewTreeElement(private val testElement: TestElement) : StructureViewTreeElement {