feat: simplify panels

Author: xepozz

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

@@ -2,9 +2,6 @@ package com.github.xepozz.php_dump
 
 import com.github.xepozz.php_dump.panel.OpcodesTerminalPanel
 import com.github.xepozz.php_dump.panel.TokensTerminalPanel
-import com.github.xepozz.php_dump.services.OpcodesDumperService
-import com.github.xepozz.php_dump.services.TokensDumperService
-import com.intellij.execution.filters.TextConsoleBuilderFactory
 import com.intellij.openapi.project.DumbAware
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.wm.ToolWindow
@@ -20,24 +17,8 @@ open class CompositeWindowFactory : ToolWindowFactory, DumbAware {
         val contentFactory = ContentFactory.getInstance()
         val contentManager = toolWindow.contentManager
 
-        val opcodesTerminalLayout = run {
-            val consoleView = TextConsoleBuilderFactory.getInstance().createBuilder(project).console
-
-            val service = toolWindow.project.getService(OpcodesDumperService::class.java)
-            service.consoleView = consoleView
-
-            OpcodesTerminalPanel(consoleView.component)
-        }
-
-        val tokensTerminalLayout = run {
-            val consoleView = TextConsoleBuilderFactory.getInstance().createBuilder(project).console
-
-            val service = toolWindow.project.getService(TokensDumperService::class.java)
-            service.consoleView = consoleView
-
-            TokensTerminalPanel(consoleView.component)
-        }
-
+        val opcodesTerminalLayout = OpcodesTerminalPanel(project)
+        val tokensTerminalLayout = TokensTerminalPanel(project)
 
         contentFactory.apply {
             this.createContent(opcodesTerminalLayout, "Opcodes", false).apply {

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

@@ -2,6 +2,7 @@ package com.github.xepozz.php_dump.panel
 
 import com.github.xepozz.php_dump.actions.RunDumpCommandAction
 import com.github.xepozz.php_dump.services.OpcodesDumperService
+import com.intellij.execution.filters.TextConsoleBuilderFactory
 import com.intellij.openapi.actionSystem.ActionManager
 import com.intellij.openapi.actionSystem.DefaultActionGroup
 import com.intellij.openapi.fileEditor.FileEditorManager
@@ -15,9 +16,18 @@ import javax.swing.JComponent
 import javax.swing.JPanel
 
 class OpcodesTerminalPanel(
-    val terminalViewComponent: JComponent,
+    val project: Project,
 ) : SimpleToolWindowPanel(false, false), RefreshablePanel {
+    val viewComponent: JComponent
+    val service: OpcodesDumperService
+
     init {
+        val consoleView = TextConsoleBuilderFactory.getInstance().createBuilder(project).console
+        viewComponent = consoleView.component
+
+        service = project.getService(OpcodesDumperService::class.java)
+        service.consoleView = consoleView
+
         createToolBar()
         createContent()
     }
@@ -39,11 +49,11 @@ class OpcodesTerminalPanel(
 
     private fun createContent() {
         val responsivePanel = JPanel(BorderLayout())
-        responsivePanel.add(terminalViewComponent, BorderLayout.CENTER)
+        responsivePanel.add(viewComponent, BorderLayout.CENTER)
         responsivePanel.addComponentListener(object : ComponentAdapter() {
             override fun componentResized(e: ComponentEvent?) {
-                terminalViewComponent.revalidate()
-                terminalViewComponent.repaint()
+                viewComponent.revalidate()
+                viewComponent.repaint()
             }
         })
 
@@ -54,6 +64,6 @@ class OpcodesTerminalPanel(
         val editor = FileEditorManager.getInstance(project).selectedTextEditor ?: return
         val virtualFile = editor.virtualFile ?: return
 
-        OpcodesDumperService.dump(virtualFile, project)
+        service.dump(virtualFile.path)
     }
 }

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

@@ -2,6 +2,7 @@ package com.github.xepozz.php_dump.panel
 
 import com.github.xepozz.php_dump.actions.RunDumpTokensCommandAction
 import com.github.xepozz.php_dump.services.TokensDumperService
+import com.intellij.execution.filters.TextConsoleBuilderFactory
 import com.intellij.openapi.actionSystem.ActionManager
 import com.intellij.openapi.actionSystem.DefaultActionGroup
 import com.intellij.openapi.fileEditor.FileEditorManager
@@ -15,9 +16,18 @@ import javax.swing.JComponent
 import javax.swing.JPanel
 
 class TokensTerminalPanel(
-    val terminalViewComponent: JComponent,
+    val project: Project,
 ) : SimpleToolWindowPanel(false, false), RefreshablePanel {
+    var viewComponent: JComponent
+    var service: TokensDumperService
+
     init {
+        val consoleView = TextConsoleBuilderFactory.getInstance().createBuilder(project).console
+        viewComponent = consoleView.component
+
+        service = project.getService(TokensDumperService::class.java)
+        service.consoleView = consoleView
+
         createToolBar()
         createContent()
     }
@@ -39,11 +49,11 @@ class TokensTerminalPanel(
 
     private fun createContent() {
         val responsivePanel = JPanel(BorderLayout())
-        responsivePanel.add(terminalViewComponent, BorderLayout.CENTER)
+        responsivePanel.add(viewComponent, BorderLayout.CENTER)
         responsivePanel.addComponentListener(object : ComponentAdapter() {
             override fun componentResized(e: ComponentEvent?) {
-                terminalViewComponent.revalidate()
-                terminalViewComponent.repaint()
+                viewComponent.revalidate()
+                viewComponent.repaint()
             }
         })
 
@@ -54,6 +64,6 @@ class TokensTerminalPanel(
         val editor = FileEditorManager.getInstance(project).selectedTextEditor ?: return
         val virtualFile = editor.virtualFile ?: return
 
-        TokensDumperService.dump(virtualFile, project)
+        service.dump(virtualFile.path)
     }
 }

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

@@ -35,7 +35,7 @@ class OpcodesDumperService(var project: Project) : Disposable {
         consoleView?.dispose()
     }
 
-    fun dump(file: String, callback: () -> Unit = {}) {
+    fun dump(file: String) {
         val interpretersManager = PhpInterpretersManagerImpl.getInstance(project)
         val interpreter = PhpProjectConfigurationFacade.getInstance(project).interpreter
             ?: interpretersManager.interpreters.firstOrNull() ?: return
@@ -69,7 +69,6 @@ class OpcodesDumperService(var project: Project) : Disposable {
 
         CoroutineScope(Dispatchers.IO).launch {
             executeCommand(commandArgs)
-            callback()
         }
     }
 

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

@@ -35,7 +35,7 @@ class TokensDumperService(var project: Project) : Disposable {
         consoleView?.dispose()
     }
 
-    fun dump(file: String, callback: () -> Unit = {}) {
+    fun dump(file: String) {
         val interpretersManager = PhpInterpretersManagerImpl.getInstance(project)
         val interpreter = PhpProjectConfigurationFacade.getInstance(project).interpreter
             ?: interpretersManager.interpreters.firstOrNull() ?: return
@@ -81,7 +81,6 @@ class TokensDumperService(var project: Project) : Disposable {
 
         CoroutineScope(Dispatchers.IO).launch {
             executeCommand(commandArgs)
-            callback()
         }
     }