feat(#161): Use async wrapper for editor build to avoid internal api …

…usage
timo-reymann · Oct 6, 2023 · e41f3a8 · e41f3a8
1 parent af7c7ea
commit e41f3a8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 31 deletions.
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/src/main/kotlin/de/timo_reymann/mjml_support/editor/provider/SplitTextEditorProvider.kt b/src/main/kotlin/de/timo_reymann/mjml_support/editor/provider/SplitTextEditorProvider.kt
@@ -1,13 +1,9 @@
 package de.timo_reymann.mjml_support.editor.provider
 
-import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.fileEditor.*
-import com.intellij.openapi.progress.runBlockingMaybeCancellable
-import com.intellij.openapi.progress.runWithModalProgressBlocking
 import com.intellij.openapi.project.DumbAware
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.vfs.VirtualFile
-import de.timo_reymann.mjml_support.bundle.MjmlBundle
 import de.timo_reymann.mjml_support.editor.ui.MjmlFileEditorState
 import org.jdom.Element
 
@@ -90,34 +86,14 @@ abstract class SplitTextEditorProvider(
         private const val SECOND_EDITOR = "second_editor"
         private const val SPLIT_LAYOUT = "split_layout"
 
-        private fun runsInProjectView() = !ApplicationManager.getApplication().isDispatchThread
-        private fun runsInEDT() = ApplicationManager.getApplication().isWriteAccessAllowed
-
         fun getBuilderFromEditorProvider(
             provider: FileEditorProvider, project: Project, file: VirtualFile
         ): AsyncFileEditorProvider.Builder {
-            // in case the provider doesn't provide async functionality -> wrap and create editor
-            if (provider !is AsyncFileEditorProvider) {
-                return object : AsyncFileEditorProvider.Builder() {
-                    override fun build(): FileEditor {
-                        return provider.createEditor(project, file)
-                    }
-                }
-            }
-
-            // called with write context
-            if (runsInProjectView() || runsInEDT()) {
-                return runBlockingMaybeCancellable {
-                    provider.createEditorBuilder(project, file)
+            return object : AsyncFileEditorProvider.Builder() {
+                override fun build(): FileEditor {
+                    return provider.createEditor(project, file)
                 }
             }
-
-            // called from a context without write lock
-            return runWithModalProgressBlocking(
-                project, MjmlBundle.message("mjml_preview.opening_editor", file.name)
-            ) {
-                provider.createEditorBuilder(project, file)
-            }
         }
     }
 }