refactor: use coroutines instead

Author: xepozz

src/main/kotlin/com/github/xepozz/php_dump/Utils.kt

@@ -1,27 +1,8 @@
 package com.github.xepozz.php_dump
 
-import com.intellij.ide.plugins.PluginManagerCore.isUnitTestMode
 import com.intellij.openapi.Disposable
-import com.intellij.openapi.application.ModalityState
-import com.intellij.openapi.application.ReadAction
 import com.intellij.openapi.components.Service
 import com.intellij.openapi.project.Project
-import com.intellij.util.concurrency.AppExecutorUtil
-import java.util.concurrent.Callable
-
-
-inline fun <R> Project.nonBlocking(crossinline block: () -> R, crossinline uiContinuation: (R) -> Unit) {
-    if (isUnitTestMode) {
-        val result = block()
-        uiContinuation(result)
-    } else {
-        ReadAction.nonBlocking(Callable { block() })
-            .inSmartMode(this)
-            .expireWith(DumpPluginDisposable.getInstance(this))
-            .finishOnUiThread(ModalityState.current()) { uiContinuation(it) }
-            .submit(AppExecutorUtil.getAppExecutorService())
-    }
-}
 
 @Service(Service.Level.PROJECT)
 class DumpPluginDisposable : Disposable {

src/main/kotlin/com/github/xepozz/php_dump/panel/OpcacheSettingsPanel.kt

@@ -3,7 +3,6 @@ package com.github.xepozz.php_dump.panel
 import com.github.xepozz.php_dump.actions.CollapseTreeAction
 import com.github.xepozz.php_dump.actions.ExpandTreeAction
 import com.github.xepozz.php_dump.actions.RefreshAction
-import com.github.xepozz.php_dump.nonBlocking
 import com.github.xepozz.php_dump.services.OpcacheSettingsTreeDumperService
 import com.github.xepozz.php_dump.stubs.any_tree.AnyNodeList
 import com.github.xepozz.php_dump.stubs.any_tree.AnyRootNode
@@ -24,7 +23,9 @@ import com.intellij.ui.tree.AsyncTreeModel
 import com.intellij.ui.tree.StructureTreeModel
 import com.intellij.ui.treeStructure.Tree
 import com.intellij.util.ui.tree.TreeUtil
-import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 import java.awt.BorderLayout
 import java.awt.GridLayout
 import javax.swing.JPanel
@@ -36,6 +37,7 @@ import javax.swing.tree.DefaultTreeModel
 class OpcacheSettingsPanel(private val project: Project) :
     SimpleToolWindowPanel(false, false),
     RefreshablePanel, Disposable {
+    val fileEditorManager = FileEditorManager.getInstance(project)
     private val progressBar = JProgressBar()
 
     private val treeModel = StructureTreeModel(TokensTreeStructure(RootNode(null)), this)
@@ -90,12 +92,12 @@ class OpcacheSettingsPanel(private val project: Project) :
     }
 
     private fun refreshData() {
-        progressBar.setIndeterminate(true)
-        progressBar.isVisible = true
-        tree.emptyText.text = "Loading..."
+        CoroutineScope(Dispatchers.IO).launch {
+            progressBar.setIndeterminate(true)
+            progressBar.isVisible = true
+            tree.emptyText.text = "Loading..."
 
-
-        project.nonBlocking({ getViewData() }) { result ->
+            val result = getViewData()
             tree.emptyText.text = "Nothing to show"
             rebuildTree(result)
 
@@ -113,12 +115,12 @@ class OpcacheSettingsPanel(private val project: Project) :
         TreeUtil.expandAll(tree)
     }
 
-    private fun getViewData(): AnyNodeList {
+    private suspend fun getViewData(): AnyNodeList {
         val result = AnyNodeList()
-        val editor = FileEditorManager.getInstance(project).selectedTextEditor ?: return result
+        val editor = fileEditorManager.selectedTextEditor ?: return result
         val virtualFile = editor.virtualFile ?: return result
 
-        return runBlocking { service.dump(virtualFile) } as? AnyNodeList ?: result
+        return service.dump(virtualFile) as? AnyNodeList ?: result
     }
 
     override fun refresh(project: Project, type: RefreshType) {

src/main/kotlin/com/github/xepozz/php_dump/panel/TokenTreePanel.kt

@@ -3,7 +3,6 @@ package com.github.xepozz.php_dump.panel
 import com.github.xepozz.php_dump.actions.CollapseTreeAction
 import com.github.xepozz.php_dump.actions.ExpandTreeAction
 import com.github.xepozz.php_dump.actions.RefreshAction
-import com.github.xepozz.php_dump.nonBlocking
 import com.github.xepozz.php_dump.services.TokensTreeDumperService
 import com.github.xepozz.php_dump.stubs.token_object.TokensList
 import com.github.xepozz.php_dump.tree.RootNode
@@ -29,7 +28,9 @@ import com.intellij.ui.tree.AsyncTreeModel
 import com.intellij.ui.tree.StructureTreeModel
 import com.intellij.ui.treeStructure.Tree
 import com.intellij.util.ui.tree.TreeUtil
-import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 import java.awt.BorderLayout
 import java.awt.GridLayout
 import javax.swing.JPanel
@@ -42,6 +43,7 @@ import javax.swing.tree.TreePath
 class TokenTreePanel(private val project: Project) :
     SimpleToolWindowPanel(false, false),
     RefreshablePanel, Disposable {
+    val fileEditorManager = FileEditorManager.getInstance(project)
     private val progressBar = JProgressBar()
 
     private val treeModel = StructureTreeModel(TokensTreeStructure(RootNode(null)), this)
@@ -132,12 +134,12 @@ class TokenTreePanel(private val project: Project) :
     }
 
     private fun refreshData() {
-        progressBar.setIndeterminate(true)
-        progressBar.isVisible = true
-        tree.emptyText.text = "Loading..."
+        CoroutineScope(Dispatchers.IO).launch {
+            progressBar.setIndeterminate(true)
+            progressBar.isVisible = true
+            tree.emptyText.text = "Loading..."
 
-
-        project.nonBlocking({ getViewData() }) { result ->
+            val result = getViewData()
             tree.emptyText.text = "Nothing to show"
             rebuildTree(result)
 
@@ -155,12 +157,12 @@ class TokenTreePanel(private val project: Project) :
         TreeUtil.expandAll(tree)
     }
 
-    private fun getViewData(): TokensList {
+    private suspend fun getViewData(): TokensList {
         val result = TokensList()
-        val editor = FileEditorManager.getInstance(project).selectedTextEditor ?: return result
+        val editor = fileEditorManager.selectedTextEditor ?: return result
         val virtualFile = editor.virtualFile ?: return result
 
-        val runBlocking = runBlocking { service.dump(virtualFile) }
+        val runBlocking = service.dump(virtualFile)
 //        println("result is $runBlocking")
 
         return runBlocking as? TokensList ?: result

src/main/kotlin/com/github/xepozz/php_dump/panel/TokensTerminalPanel.kt

@@ -18,7 +18,6 @@ import com.intellij.openapi.ui.SimpleToolWindowPanel
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.runBlocking
 import java.awt.BorderLayout
 import java.awt.GridLayout
 import java.awt.event.ComponentAdapter
@@ -95,7 +94,7 @@ class TokensTerminalPanel(
         val virtualFile = editor.virtualFile ?: return
 
         CoroutineScope(Dispatchers.IO).launch {
-            val result = runBlocking { service.dump(virtualFile) }
+            val result = service.dump(virtualFile)
 
             consoleView.clear()
             consoleView.print(result as? String ?: "No output", ConsoleViewContentType.NORMAL_OUTPUT)

src/main/kotlin/com/github/xepozz/php_dump/services/OpcacheSettingsTreeDumperService.kt

@@ -67,7 +67,7 @@ class OpcacheSettingsTreeDumperService(var project: Project) : DumperServiceInte
             }
 //            println("result tree: $tree")
 
-            return@withContext tree
+            tree
         }
     }
 }

src/main/kotlin/com/github/xepozz/php_dump/services/OpcodesDumperService.kt

@@ -17,12 +17,12 @@ import kotlinx.coroutines.withContext
 @Service(Service.Level.PROJECT)
 class OpcodesDumperService(var project: Project) : DumperServiceInterface {
     val state = PhpDumpSettingsService.getInstance(project)
-    override suspend fun dump(file: String): Any? {
-        val interpretersManager = PhpInterpretersManagerImpl.getInstance(project)
-        val interpreter = PhpProjectConfigurationFacade.getInstance(project).interpreter
-            ?: interpretersManager.interpreters.firstOrNull() ?: return null
+    val interpretersManager = PhpInterpretersManagerImpl.getInstance(project)
+    val interpreter = PhpProjectConfigurationFacade.getInstance(project).interpreter
+        ?: interpretersManager.interpreters.firstOrNull()
 
-        val interpreterPath = interpreter.pathToPhpExecutable ?: return null
+    override suspend fun dump(file: String): Any? {
+        val interpreterPath = interpreter?.pathToPhpExecutable ?: return null
         val debugLevel = state.debugLevel.value
         val preloadFile = state.preloadFile
         val command = GeneralCommandLine(buildList {
@@ -63,7 +63,7 @@ class OpcodesDumperService(var project: Project) : DumperServiceInterface {
             }, listOf("-dopcache.enable_cli=1"))
 
 
-            return@withContext output.toString()
+            output.toString()
         }
     }
 }

src/main/kotlin/com/github/xepozz/php_dump/services/TokensDumperService.kt

@@ -15,7 +15,7 @@ import kotlinx.coroutines.withContext
 class TokensDumperService(var project: Project) : DumperServiceInterface {
     val state = PhpDumpSettingsService.getInstance(project)
 
-    override suspend fun dump(file: String): Any? {
+    override suspend fun dump(file: String): Any {
         val phpSnippet = if (state.tokensObject) {
             // language=injectablephp
             $$"""
@@ -65,7 +65,7 @@ class TokensDumperService(var project: Project) : DumperServiceInterface {
                 }
             })
 
-            return@withContext output.toString()
+            output.toString()
         }
     }
 }

src/main/kotlin/com/github/xepozz/php_dump/services/TokensTreeDumperService.kt

@@ -50,7 +50,7 @@ class TokensTreeDumperService(var project: Project) : DumperServiceInterface {
             val tree = TokenParser.parseTokens(jsonString)
 //            println("result tree: $tree")
 
-            return@withContext tree
+            tree
         }
     }
 }