feat: refresh active tab instead of a fixed one

xepozz · xepozz · commit 46a62d01dc81 · 2025-06-22T12:40:54.000+03:00
diff --git a/src/main/kotlin/com/github/xepozz/php_dump/actions/RunDumpCommandAction.kt b/src/main/kotlin/com/github/xepozz/php_dump/actions/RunDumpCommandAction.kt
@@ -5,29 +5,17 @@ import com.intellij.icons.AllIcons
 import com.intellij.openapi.actionSystem.ActionUpdateThread
 import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
-import com.intellij.openapi.editor.EditorFactory
 import com.intellij.openapi.fileEditor.FileEditorManager
 
 class RunDumpCommandAction() : AnAction("Dump Opcodes in Terminal", null, AllIcons.Actions.Execute) {
     override fun actionPerformed(e: AnActionEvent) {
         val project = e.project ?: return
         println("project $project")
-        val basePath = project.basePath ?: return
-        println("basePath $basePath")
-        val editorFactory = EditorFactory.getInstance()
-        val editors = editorFactory.allEditors
-        println("editors $editors")
-
         val editor = FileEditorManager.getInstance(project).selectedTextEditor ?: return
         val file = editor.virtualFile ?: return
         println("file $file")
 
-        val service = project.getService(OpcodesDumperService::class.java)
-
-        service.dump(file.path, {
-            println("dumping $basePath")
-        });
-
+        OpcodesDumperService.dump(file, project)
     }
 
     override fun getActionUpdateThread() = ActionUpdateThread.BGT
diff --git a/src/main/kotlin/com/github/xepozz/php_dump/actions/RunDumpTokensCommandAction.kt b/src/main/kotlin/com/github/xepozz/php_dump/actions/RunDumpTokensCommandAction.kt
@@ -5,29 +5,17 @@ import com.intellij.icons.AllIcons
 import com.intellij.openapi.actionSystem.ActionUpdateThread
 import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
-import com.intellij.openapi.editor.EditorFactory
 import com.intellij.openapi.fileEditor.FileEditorManager
 
 class RunDumpTokensCommandAction() : AnAction("Dump Tokens in Terminal", null, AllIcons.Actions.Execute) {
     override fun actionPerformed(e: AnActionEvent) {
         val project = e.project ?: return
         println("project $project")
-        val basePath = project.basePath ?: return
-        println("basePath $basePath")
-        val editorFactory = EditorFactory.getInstance()
-        val editors = editorFactory.allEditors
-        println("editors $editors")
-
         val editor = FileEditorManager.getInstance(project).selectedTextEditor ?: return
         val file = editor.virtualFile ?: return
         println("file $file")
 
-        val service = project.getService(TokensDumperService::class.java)
-
-        service.dump(file.path, {
-            println("dumping $basePath")
-        })
-
+        TokensDumperService.dump(file, project)
     }
 
     override fun getActionUpdateThread() = ActionUpdateThread.BGT
diff --git a/src/main/kotlin/com/github/xepozz/php_dump/panel/OpcodesTerminalPanel.kt b/src/main/kotlin/com/github/xepozz/php_dump/panel/OpcodesTerminalPanel.kt
@@ -1,8 +1,11 @@
 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.openapi.actionSystem.ActionManager
 import com.intellij.openapi.actionSystem.DefaultActionGroup
+import com.intellij.openapi.fileEditor.FileEditorManager
+import com.intellij.openapi.project.Project
 import com.intellij.openapi.ui.SimpleToolWindowPanel
 import java.awt.BorderLayout
 import java.awt.GridLayout
@@ -13,7 +16,7 @@ import javax.swing.JPanel
 
 class OpcodesTerminalPanel(
     val terminalViewComponent: JComponent,
-) : SimpleToolWindowPanel(false, false) {
+) : SimpleToolWindowPanel(false, false), RefreshablePanel {
     init {
         createToolBar()
         createContent()
@@ -46,4 +49,11 @@ class OpcodesTerminalPanel(
 
         setContent(responsivePanel)
     }
+
+    override fun refresh(project: Project) {
+        val editor = FileEditorManager.getInstance(project).selectedTextEditor ?: return
+        val virtualFile = editor.virtualFile ?: return
+
+        OpcodesDumperService.dump(virtualFile, project)
+    }
 }
diff --git a/src/main/kotlin/com/github/xepozz/php_dump/panel/RefreshablePanel.kt b/src/main/kotlin/com/github/xepozz/php_dump/panel/RefreshablePanel.kt
@@ -0,0 +1,7 @@
+package com.github.xepozz.php_dump.panel
+
+import com.intellij.openapi.project.Project
+
+interface RefreshablePanel {
+    fun refresh(project: Project)
+}
diff --git a/src/main/kotlin/com/github/xepozz/php_dump/panel/TokensTerminalPanel.kt b/src/main/kotlin/com/github/xepozz/php_dump/panel/TokensTerminalPanel.kt
@@ -1,8 +1,11 @@
 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.openapi.actionSystem.ActionManager
 import com.intellij.openapi.actionSystem.DefaultActionGroup
+import com.intellij.openapi.fileEditor.FileEditorManager
+import com.intellij.openapi.project.Project
 import com.intellij.openapi.ui.SimpleToolWindowPanel
 import java.awt.BorderLayout
 import java.awt.GridLayout
@@ -13,7 +16,7 @@ import javax.swing.JPanel
 
 class TokensTerminalPanel(
     val terminalViewComponent: JComponent,
-) : SimpleToolWindowPanel(false, false) {
+) : SimpleToolWindowPanel(false, false), RefreshablePanel {
     init {
         createToolBar()
         createContent()
@@ -46,4 +49,11 @@ class TokensTerminalPanel(
 
         setContent(responsivePanel)
     }
+
+    override fun refresh(project: Project) {
+        val editor = FileEditorManager.getInstance(project).selectedTextEditor ?: return
+        val virtualFile = editor.virtualFile ?: return
+
+        TokensDumperService.dump(virtualFile, project)
+    }
 }
diff --git a/src/main/kotlin/com/github/xepozz/php_dump/services/OpcodesDumperService.kt b/src/main/kotlin/com/github/xepozz/php_dump/services/OpcodesDumperService.kt
@@ -11,24 +11,31 @@ import com.intellij.openapi.Disposable
 import com.intellij.openapi.components.Service
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.Key
-import com.intellij.ui.jcef.JBCefBrowser
+import com.intellij.openapi.vfs.VirtualFile
 import com.jetbrains.php.config.PhpProjectConfigurationFacade
 import com.jetbrains.php.config.interpreters.PhpInterpretersManagerImpl
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import kotlin.math.log
 
 @Service(Service.Level.PROJECT)
 class OpcodesDumperService(var project: Project) : Disposable {
     var consoleView: ConsoleView? = null
 
+    companion object {
+        fun dump(file: VirtualFile, project: Project) {
+            val service = project.getService(OpcodesDumperService::class.java)
+
+            service.dump(file.path)
+        }
+    }
+
     override fun dispose() {
         consoleView?.dispose()
     }
 
-    fun dump(file: String, callback: () -> Unit) {
+    fun dump(file: String, callback: () -> Unit = {}) {
         val interpretersManager = PhpInterpretersManagerImpl.getInstance(project)
         val interpreter = PhpProjectConfigurationFacade.getInstance(project).interpreter
             ?: interpretersManager.interpreters.firstOrNull() ?: return
diff --git a/src/main/kotlin/com/github/xepozz/php_dump/services/TokensDumperService.kt b/src/main/kotlin/com/github/xepozz/php_dump/services/TokensDumperService.kt
@@ -11,6 +11,7 @@ import com.intellij.openapi.Disposable
 import com.intellij.openapi.components.Service
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.Key
+import com.intellij.openapi.vfs.VirtualFile
 import com.jetbrains.php.config.PhpProjectConfigurationFacade
 import com.jetbrains.php.config.interpreters.PhpInterpretersManagerImpl
 import kotlinx.coroutines.CoroutineScope
@@ -22,11 +23,19 @@ import kotlinx.coroutines.withContext
 class TokensDumperService(var project: Project) : Disposable {
     var consoleView: ConsoleView? = null
 
+    companion object {
+        fun dump(file: VirtualFile, project: Project) {
+            val service = project.getService(TokensDumperService::class.java)
+
+            service.dump(file.path)
+        }
+    }
+
     override fun dispose() {
         consoleView?.dispose()
     }
 
-    fun dump(file: String, callback: () -> Unit) {
+    fun dump(file: String, callback: () -> Unit = {}) {
         val interpretersManager = PhpInterpretersManagerImpl.getInstance(project)
         val interpreter = PhpProjectConfigurationFacade.getInstance(project).interpreter
             ?: interpretersManager.interpreters.firstOrNull() ?: return
diff --git a/src/main/kotlin/com/github/xepozz/php_dump/startup/ProjectFileEditorListener.kt b/src/main/kotlin/com/github/xepozz/php_dump/startup/ProjectFileEditorListener.kt
@@ -1,9 +1,10 @@
 package com.github.xepozz.php_dump.startup
 
-import com.github.xepozz.php_dump.services.OpcodesDumperService
+import com.github.xepozz.php_dump.panel.RefreshablePanel
 import com.intellij.openapi.fileEditor.FileEditorManagerEvent
 import com.intellij.openapi.fileEditor.FileEditorManagerListener
 import com.intellij.openapi.project.Project
+import com.intellij.openapi.wm.ToolWindowManager
 
 class ProjectFileEditorListener(val project: Project) : FileEditorManagerListener {
 //    override fun fileClosed(source: FileEditorManager, file: VirtualFile) {
@@ -19,12 +20,15 @@ class ProjectFileEditorListener(val project: Project) : FileEditorManagerListene
         super.selectionChanged(event)
         println("selection changed $event")
 
-        val virtualFile = event.newFile ?: return
+        val toolWindowManager = ToolWindowManager.getInstance(project)
+        val toolWindow = toolWindowManager.getToolWindow("PHP Dump")
 
-        val service = project.getService(OpcodesDumperService::class.java)
+        toolWindow
+            ?.component
+            ?.components
+            ?.mapNotNull { it as? RefreshablePanel }
+            ?.forEach { it.refresh(project) }
+            ?: return
 
-        service.dump(virtualFile.path) {
-            println("dump in selection changed ")
-        }
     }
 }
