feat: support raw/json modes in custom panels

xepozz · xepozz · commit 5658672d4605 · 2025-12-11T14:33:23.000+04:00
diff --git a/src/main/kotlin/com/github/xepozz/php_dump/notification/NotificationUtil.kt b/src/main/kotlin/com/github/xepozz/php_dump/notification/NotificationUtil.kt
@@ -0,0 +1,30 @@
+package com.github.xepozz.php_dump.notification
+
+import com.github.xepozz.php_dump.PhpDumpIcons
+import com.intellij.notification.NotificationGroupManager
+import com.intellij.notification.NotificationType
+import com.intellij.openapi.actionSystem.AnAction
+import com.intellij.openapi.project.Project
+
+object NotificationUtil {
+    fun sendNotification(
+        project: Project,
+        title: String,
+        message: String,
+        actions: Collection<AnAction> = emptyList(),
+    ) {
+        val notification = NotificationGroupManager.getInstance()
+            .getNotificationGroup("PHP Dump Errors")
+            .createNotification(
+                title,
+                message,
+                NotificationType.ERROR,
+            )
+        notification.isImportant = true
+        notification.icon = PhpDumpIcons.POT
+
+        notification.addActions(actions)
+
+        notification.notify(project)
+    }
+}
diff --git a/src/main/kotlin/com/github/xepozz/php_dump/services/CustomDumpResult.kt b/src/main/kotlin/com/github/xepozz/php_dump/services/CustomDumpResult.kt
@@ -0,0 +1,9 @@
+package com.github.xepozz.php_dump.services
+
+import com.github.xepozz.php_dump.stubs.token_object.TokensList
+
+data class CustomDumpResult(
+    var tokens: TokensList = TokensList(),
+    var raw: String = "",
+    var error: Throwable? = null,
+)
diff --git a/src/main/kotlin/com/github/xepozz/php_dump/services/CustomTreeDumperService.kt b/src/main/kotlin/com/github/xepozz/php_dump/services/CustomTreeDumperService.kt
@@ -1,10 +1,9 @@
 package com.github.xepozz.php_dump.services
 
-import com.github.xepozz.php_dump.StringBufferProcessAdapter
 import com.github.xepozz.php_dump.command.PathMapper
 import com.github.xepozz.php_dump.command.PhpCommandExecutor
 import com.github.xepozz.php_dump.stubs.token_object.TokenParser
-import com.github.xepozz.php_dump.stubs.token_object.TokensList
+import com.intellij.execution.process.CapturingProcessAdapter
 import com.intellij.openapi.components.Service
 import com.intellij.openapi.project.Project
 import kotlinx.coroutines.Dispatchers
@@ -14,29 +13,34 @@ import kotlinx.coroutines.withContext
 class CustomTreeDumperService(var project: Project) : DumperServiceInterface {
     var phpSnippet: String? = null
 
-    override suspend fun dump(file: String): Any {
-        val phpSnippet = phpSnippet ?: return TokensList()
+    override suspend fun dump(file: String): CustomDumpResult {
+        val phpSnippet = phpSnippet ?: return CustomDumpResult()
 
         val localFile = PathMapper.map(project, file)
 
         return withContext(Dispatchers.IO) {
-            val output = StringBuilder()
+            val capture = CapturingProcessAdapter()
 
             PhpCommandExecutor.execute(
                 localFile,
                 phpSnippet,
                 project,
-                StringBufferProcessAdapter(output),
+                capture,
             )
 
+            val result = CustomDumpResult()
 
-            val jsonString = output.toString()
+            result.raw = capture.output.stdout
 //            println("jsonString: $jsonString")
 
-            val tree = TokenParser.parseTokens(jsonString)
-//            println("result tree: $tree")
+            try {
+                val tree = TokenParser.parseTokens(result.raw)
+                result.tokens = tree
+            } catch (e: Throwable) {
+                result.error = e
+            }
 
-            tree
+            result
         }
     }
 }
diff --git a/src/main/kotlin/com/github/xepozz/php_dump/services/EditorProvider.kt b/src/main/kotlin/com/github/xepozz/php_dump/services/EditorProvider.kt
@@ -6,33 +6,44 @@ import com.intellij.openapi.editor.EditorFactory
 import com.intellij.openapi.editor.ex.EditorEx
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.Key
+import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.psi.PsiDocumentManager
 import com.intellij.psi.PsiManager
 import com.intellij.testFramework.LightVirtualFile
 
 @Service(Service.Level.PROJECT)
 class EditorProvider(var project: Project) {
     companion object {
-        val editorId = Key.create<Boolean>("opcodes.editor.id")
+        val opcodesEditorId = Key.create<Boolean>("opcodes.editor.id")
     }
 
     val documentManager = PsiDocumentManager.getInstance(project)
     val editorFactory = EditorFactory.getInstance()
 
-    var editor: EditorEx? = null
+    var editors = mutableMapOf<Key<*>, EditorEx>()
+    var editorsByFile = mutableMapOf<VirtualFile, EditorEx>()
+    var virtualFilesByEditorId = mutableMapOf<Key<*>, VirtualFile>()
 
-    fun getOrCreateEditor(): EditorEx = synchronized(this) {
-        editor?.let { return it }
+    fun getOrCreateEditor(editorId: Key<Boolean>): EditorEx =
+        synchronized(this) {
+            editors.getOrPut(editorId) {
+                val virtualFile = virtualFilesByEditorId.getOrPut(editorId) {
+                    LightVirtualFile("opcodes.phpop", PHPOpFileType.INSTANCE, "")
+                }
+                createEditor(virtualFile)
+            }
+        }
 
-        val virtualFile = LightVirtualFile(
-            "opcodes.phpop",
-            PHPOpFileType.INSTANCE,
-            ""
-        )
+    fun getOrCreateEditorFor(virtualFile: VirtualFile): EditorEx =
+        synchronized(this) {
+            editorsByFile.getOrPut(virtualFile) { createEditor(virtualFile) }
+        }
+
+    private fun createEditor(virtualFile: VirtualFile): EditorEx {
         val psiFile = PsiManager.getInstance(project).findFile(virtualFile)!!
         val document = documentManager.getDocument(psiFile)!!
 
-        return@synchronized (editorFactory.createEditor(document, project, virtualFile, false) as EditorEx)
+        return (editorFactory.createEditor(document, project, virtualFile, false) as EditorEx)
             .apply {
                 settings.apply {
                     isBlinkCaret = true
@@ -45,9 +56,6 @@ class EditorProvider(var project: Project) {
                 }
 
                 setCaretEnabled(true)
-                putUserData(editorId, true)
-
-                editor = this
             }
     }
 }
diff --git a/src/main/kotlin/com/github/xepozz/php_dump/services/TokensTreeDumperService.kt b/src/main/kotlin/com/github/xepozz/php_dump/services/TokensTreeDumperService.kt
@@ -1,9 +1,9 @@
 package com.github.xepozz.php_dump.services
 
-import com.github.xepozz.php_dump.StringBufferProcessAdapter
 import com.github.xepozz.php_dump.command.PathMapper
 import com.github.xepozz.php_dump.command.PhpCommandExecutor
 import com.github.xepozz.php_dump.stubs.token_object.TokenParser
+import com.intellij.execution.process.CapturingProcessAdapter
 import com.intellij.openapi.components.Service
 import com.intellij.openapi.project.Project
 import kotlinx.coroutines.Dispatchers
@@ -31,17 +31,16 @@ class TokensTreeDumperService(var project: Project) : DumperServiceInterface {
         val localFile = PathMapper.map(project, file)
 
         return withContext(Dispatchers.IO) {
-            val output = StringBuilder()
+            val capture = CapturingProcessAdapter()
 
             PhpCommandExecutor.execute(
                 localFile,
                 phpSnippet,
                 project,
-                StringBufferProcessAdapter(output),
+                capture,
             )
 
-
-            val jsonString = output.toString()
+            val jsonString = capture.output.stdout
 //            println("jsonString: $jsonString")
 
             val tree = TokenParser.parseTokens(jsonString)
diff --git a/src/main/kotlin/com/github/xepozz/php_dump/startup/EditorListener.kt b/src/main/kotlin/com/github/xepozz/php_dump/startup/EditorListener.kt
@@ -33,7 +33,7 @@ class EditorListener : EditorMouseListener {
         method: Method
     ) {
         val editorProvider = project.getService(EditorProvider::class.java)
-        val opcodesEditor = editorProvider.getOrCreateEditor()
+        val opcodesEditor = editorProvider.getOrCreateEditor(EditorProvider.opcodesEditorId)
 
         val psiFile = psiDocumentManager.getPsiFile(opcodesEditor.document) as? PHPOpFile ?: return
 
diff --git a/src/main/kotlin/com/github/xepozz/php_dump/toolWindow/panel/CustomTreePanel.kt b/src/main/kotlin/com/github/xepozz/php_dump/toolWindow/panel/CustomTreePanel.kt
@@ -5,26 +5,35 @@ import com.github.xepozz.php_dump.actions.EditPhpSnippetAction
 import com.github.xepozz.php_dump.actions.ExpandTreeAction
 import com.github.xepozz.php_dump.actions.OpenPhpSettingsAction
 import com.github.xepozz.php_dump.actions.RefreshAction
+import com.github.xepozz.php_dump.notification.NotificationUtil
+import com.github.xepozz.php_dump.services.CustomDumpResult
 import com.github.xepozz.php_dump.services.CustomTreeDumperService
+import com.github.xepozz.php_dump.services.EditorProvider
 import com.github.xepozz.php_dump.stubs.token_object.TokensList
 import com.github.xepozz.php_dump.toolWindow.tabs.CompositeWindowTabsState
 import com.github.xepozz.php_dump.tree.RootNode
 import com.github.xepozz.php_dump.tree.TokenNode
 import com.github.xepozz.php_dump.tree.TokensTreeStructure
+import com.intellij.icons.AllIcons
 import com.intellij.ide.util.treeView.AbstractTreeStructure
 import com.intellij.openapi.Disposable
 import com.intellij.openapi.actionSystem.ActionManager
+import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.DefaultActionGroup
+import com.intellij.openapi.actionSystem.ToggleAction
 import com.intellij.openapi.application.EDT
+import com.intellij.openapi.application.runWriteAction
 import com.intellij.openapi.editor.markup.EffectType
 import com.intellij.openapi.editor.markup.HighlighterLayer
 import com.intellij.openapi.editor.markup.HighlighterTargetArea
 import com.intellij.openapi.editor.markup.TextAttributes
 import com.intellij.openapi.fileEditor.FileEditorManager
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.ui.SimpleToolWindowPanel
+import com.intellij.openapi.vfs.findDocument
 import com.intellij.pom.Navigatable
 import com.intellij.psi.PsiDocumentManager
+import com.intellij.testFramework.LightVirtualFile
 import com.intellij.ui.JBColor
 import com.intellij.ui.TreeUIHelper
 import com.intellij.ui.components.JBScrollPane
@@ -37,6 +46,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import java.awt.BorderLayout
 import java.awt.GridLayout
+import javax.swing.JComponent
 import javax.swing.JPanel
 import javax.swing.JProgressBar
 import javax.swing.SwingUtilities
@@ -53,6 +63,7 @@ class CustomTreePanel(
     val fileEditorManager = FileEditorManager.getInstance(project)
     private val progressBar = JProgressBar()
 
+    var rawOutput = ""
     private val treeModel = StructureTreeModel(TokensTreeStructure(RootNode(null)), this)
     private val tree = Tree(DefaultTreeModel(DefaultMutableTreeNode())).apply {
         setModel(AsyncTreeModel(treeModel, this@CustomTreePanel))
@@ -68,7 +79,12 @@ class CustomTreePanel(
             }, true)
     }
     val service: CustomTreeDumperService = project.getService(CustomTreeDumperService::class.java)
+    val editorProvider: EditorProvider = project.getService(EditorProvider::class.java)
 
+    val scrollPane = JBScrollPane(tree)
+    var contentPanel: JComponent = JPanel(BorderLayout()).apply { add(scrollPane) }
+    val rawVirtualFile = LightVirtualFile("Raw Output", "")
+    val rawPanel = editorProvider.getOrCreateEditorFor(rawVirtualFile).component
 
     init {
         treeModel.invalidateAsync()
@@ -81,6 +97,7 @@ class CustomTreePanel(
         SwingUtilities.invokeLater { refreshData() }
     }
 
+    private var showRawOutput = false
     fun createToolbar() {
         val actionGroup = DefaultActionGroup().apply {
             add(RefreshAction { refreshData() })
@@ -91,6 +108,20 @@ class CustomTreePanel(
             add(EditPhpSnippetAction(project, tabConfig) { snippet ->
                 tabConfig.snippet = snippet
             })
+            add(object :
+                ToggleAction("Use Object Tokens", "Switches engine to dump lexical tokens", AllIcons.FileTypes.Json) {
+                override fun isSelected(event: AnActionEvent): Boolean = showRawOutput
+
+                override fun setSelected(event: AnActionEvent, value: Boolean) {
+                    println("switch content")
+                    event.presentation.icon = if (value) AllIcons.FileTypes.Json else AllIcons.FileTypes.Text
+                    showRawOutput = value
+                    contentPanel.components.forEach { contentPanel.remove(it) }
+                    contentPanel.add(if (showRawOutput) rawPanel else scrollPane)
+                    SwingUtilities.invokeLater { contentPanel.repaint() }
+                }
+
+            })
             add(OpenPhpSettingsAction())
         }
 
@@ -106,7 +137,7 @@ class CustomTreePanel(
     private fun createContent() {
         val responsivePanel = JPanel(BorderLayout())
         responsivePanel.add(progressBar, BorderLayout.NORTH)
-        responsivePanel.add(JBScrollPane(tree), BorderLayout.CENTER)
+        responsivePanel.add(contentPanel, BorderLayout.CENTER)
 
         setContent(responsivePanel)
     }
@@ -153,7 +184,8 @@ class CustomTreePanel(
 
             val result = getViewData()
             tree.emptyText.text = "Nothing to show"
-            rebuildTree(result)
+            rebuildTree(result.tokens)
+            rawOutput = result.raw
 
             progressBar.setIndeterminate(false)
             progressBar.isVisible = false
@@ -169,16 +201,33 @@ class CustomTreePanel(
         TreeUtil.expandAll(tree)
     }
 
-    private suspend fun getViewData(): TokensList {
-        val result = TokensList()
+    private suspend fun getViewData(): CustomDumpResult {
+        val result = CustomDumpResult()
         val editor = fileEditorManager.selectedTextEditor ?: return result
         val virtualFile = editor.virtualFile ?: return result
 
         service.phpSnippet = tabConfig.snippet
 
-        val runBlocking = service.dump(virtualFile)
+        val runResult = service.dump(virtualFile) as CustomDumpResult
+
+        val error = runResult.error
+        val document = rawVirtualFile.findDocument()
+        if (document != null) {
+            runWriteAction {
+                document.setText(runResult.raw ?: "")
+            }
+        }
+
+        if (error != null) {
+            NotificationUtil
+                .sendNotification(
+                    project,
+                    "Error ${error.javaClass}",
+                    error.message ?: "Unknown error",
+                )
+        }
 
-        return runBlocking as? TokensList ?: result
+        return runResult
     }
 
     override fun refresh(project: Project, type: RefreshType) {
diff --git a/src/main/kotlin/com/github/xepozz/php_dump/toolWindow/panel/OpcodesTerminalPanel.kt b/src/main/kotlin/com/github/xepozz/php_dump/toolWindow/panel/OpcodesTerminalPanel.kt
@@ -47,11 +47,10 @@ class OpcodesTerminalPanel(
     private val editorProvider = project.getService(EditorProvider::class.java)
     private val state = PhpDumpSettingsService.getInstance(project)
 
-    val editor = editorProvider.getOrCreateEditor()
+    val editor = editorProvider.getOrCreateEditor(EditorProvider.opcodesEditorId)
     val viewComponent = editor.component
 
     init {
-
         createToolBar()
         createContent()
     }
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
@@ -17,6 +17,12 @@
                 id="PHP Dump" anchor="right" secondary="false" icon="/icons/pot.svg"/>
         <editorFactoryMouseListener
                 implementation="com.github.xepozz.php_dump.startup.EditorListener"/>
+        <notificationGroup
+                id="PHP Dump Errors"
+                displayType="BALLOON"
+                hideFromSettings="true"
+                isLogByDefault="true"
+        />
     </extensions>
     <projectListeners>
         <listener
