Merge branch 'refs/heads/listener'

Author: xepozz

README.md

@@ -1,16 +1,12 @@
 # PHP Dump
 
-![Build](https://github.com/xepozz/php-dump-plugin/workflows/Build/badge.svg)
-[![Version](https://img.shields.io/jetbrains/plugin/v/MARKETPLACE_ID.svg)](https://plugins.jetbrains.com/plugin/MARKETPLACE_ID)
-[![Downloads](https://img.shields.io/jetbrains/plugin/d/MARKETPLACE_ID.svg)](https://plugins.jetbrains.com/plugin/MARKETPLACE_ID)
-
-## Template ToDo list
-- [x] Create a new [IntelliJ Platform Plugin Template][template] project.
-- [ ] Set the `MARKETPLACE_ID` in the above README badges. You can obtain it once the plugin is published to JetBrains Marketplace.
+![Build](https://github.com/j-plugins/php-dump-plugin/workflows/Build/badge.svg)
+[![Version](https://img.shields.io/jetbrains/plugin/v/28100-php-dump.svg)](https://plugins.jetbrains.com/plugin/28100-php-dump)
+[![Downloads](https://img.shields.io/jetbrains/plugin/d/28100-php-dump.svg)](https://plugins.jetbrains.com/plugin/28100-php-dump)
 
 <!-- Plugin description -->
 
-[Github](https://github.com/xepozz/php-dump-plugin) | [Telegram](https://t.me/jb_plugins/50) | [Donation](https://github.com/xepozz/xepozz?tab=readme-ov-file#become-a-sponsor)
+[Github](https://github.com/j-plugins/php-dump-plugin) | [Telegram](https://t.me/jb_plugins/50) | [Donation](https://github.com/xepozz/xepozz?tab=readme-ov-file#become-a-sponsor)
 
 ## PHP Dump
 
@@ -53,14 +49,14 @@ Chose the best option for you to say thank you:
 
 - Using JetBrains Marketplace:
 
-  Go to [JetBrains Marketplace](https://plugins.jetbrains.com/plugin/MARKETPLACE_ID) and install it by clicking the <kbd>Install to ...</kbd> button in case your IDE is running.
+  Go to [JetBrains Marketplace](https://plugins.jetbrains.com/plugin/28100-php-dump) and install it by clicking the <kbd>Install to ...</kbd> button in case your IDE is running.
 
-  You can also download the [latest release](https://plugins.jetbrains.com/plugin/MARKETPLACE_ID/versions) from JetBrains Marketplace and install it manually using
+  You can also download the [latest release](https://plugins.jetbrains.com/plugin/28100-php-dump/versions) from JetBrains Marketplace and install it manually using
   <kbd>Settings/Preferences</kbd> > <kbd>Plugins</kbd> > <kbd>⚙️</kbd> > <kbd>Install plugin from disk...</kbd>
 
 - Manually:
 
-  Download the [latest release](https://github.com/xepozz/php-dump-plugin/releases/latest) and install it manually using
+  Download the [latest release](https://github.com/j-plugins/php-dump-plugin/releases/latest) and install it manually using
   <kbd>Settings/Preferences</kbd> > <kbd>Plugins</kbd> > <kbd>⚙️</kbd> > <kbd>Install plugin from disk...</kbd>
 
 

gradle.properties

@@ -4,7 +4,7 @@ pluginGroup = com.github.xepozz.php_dump
 pluginName = PHP Dump
 pluginRepositoryUrl = https://github.com/xepozz/php-opcodes-plugin
 # SemVer format -> https://semver.org
-pluginVersion = 2025.0.11
+pluginVersion = 2025.0.12
 
 # Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 pluginSinceBuild = 231
@@ -16,7 +16,7 @@ platformVersion = 2025.1.1
 
 # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
 # Example: platformPlugins = com.jetbrains.php:203.4449.22, org.intellij.scala:2023.3.27@EAP
-platformPlugins=com.jetbrains.php:251.23774.318,com.jetbrains.hackathon.indices.viewer:1.30,com.github.xepozz.php_opcodes_language:2025.0.7
+platformPlugins=com.jetbrains.php:251.23774.318,com.jetbrains.hackathon.indices.viewer:1.30,com.github.xepozz.php_opcodes_language:2025.0.12
 # Example: platformBundledPlugins = com.intellij.java
 platformBundledPlugins=
 

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

@@ -0,0 +1,16 @@
+package com.github.xepozz.php_dump
+
+import com.intellij.execution.process.ProcessAdapter
+import com.intellij.execution.process.ProcessEvent
+import com.intellij.execution.process.ProcessOutputTypes
+import com.intellij.openapi.util.Key
+
+
+class SeparateStringBufferProcessAdapter(val stderr: StringBuilder?, val stdout: StringBuilder?) : ProcessAdapter() {
+    override fun onTextAvailable(event: ProcessEvent, outputType: Key<*>) {
+        when (outputType) {
+            ProcessOutputTypes.STDERR -> stderr?.append(event.text)
+            ProcessOutputTypes.STDOUT -> stdout?.append(event.text)
+        }
+    }
+}

src/main/kotlin/com/github/xepozz/php_dump/command/PhpCommandExecutor.kt

@@ -6,6 +6,7 @@ import com.intellij.execution.process.KillableColoredProcessHandler
 import com.intellij.execution.process.ProcessAdapter
 import com.intellij.execution.process.ProcessEvent
 import com.intellij.execution.process.ProcessHandler
+import com.intellij.openapi.diagnostic.thisLogger
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.text.StringUtil
 import com.jetbrains.php.config.PhpProjectConfigurationFacade
@@ -22,8 +23,6 @@ object PhpCommandExecutor {
         processListener: ProcessAdapter,
         processArguments: List<String> = emptyList()
     ) {
-        println("run php command $file, $phpSnippet")
-
         val arguments = buildList {
             addAll(processArguments)
             add("-r")
@@ -66,7 +65,7 @@ object PhpCommandExecutor {
                     .withRedirectErrorStream(false)
                     .apply { addParameters(arguments) }
 
-                println("cmd: ${command.commandLineString}")
+                thisLogger().info("cmd: ${command.commandLineString}")
                 processHandler = manager.getRemoteProcessHandler(
                     project,
                     data,
@@ -75,7 +74,7 @@ object PhpCommandExecutor {
                     *phpCommandSettings.additionalMappings
                 )
             } else {
-                println("cmd: ${command.commandLineString}")
+                thisLogger().info("cmd: ${command.commandLineString}")
                 processHandler = KillableColoredProcessHandler.Silent(command)
                 processHandler.setShouldKillProcessSoftly(false)
                 processHandler.setShouldDestroyProcessRecursively(true)

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

@@ -5,8 +5,8 @@ import com.github.xepozz.php_dump.actions.OpenPhpSettingsAction
 import com.github.xepozz.php_dump.actions.RefreshAction
 import com.github.xepozz.php_dump.configuration.PhpDumpSettingsService
 import com.github.xepozz.php_dump.configuration.PhpOpcacheDebugLevel
+import com.github.xepozz.php_dump.services.EditorProvider
 import com.github.xepozz.php_dump.services.OpcodesDumperService
-import com.github.xepozz.php_opcodes_language.language.PHPOpFileType
 import com.intellij.icons.AllIcons
 import com.intellij.openapi.Disposable
 import com.intellij.openapi.actionSystem.ActionManager
@@ -17,15 +17,12 @@ import com.intellij.openapi.actionSystem.DefaultActionGroup
 import com.intellij.openapi.application.EDT
 import com.intellij.openapi.command.WriteCommandAction
 import com.intellij.openapi.editor.EditorFactory
-import com.intellij.openapi.editor.ex.EditorEx
 import com.intellij.openapi.fileChooser.FileChooser
 import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory
 import com.intellij.openapi.fileEditor.FileEditorManager
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.ui.SimpleToolWindowPanel
 import com.intellij.psi.PsiDocumentManager
-import com.intellij.psi.PsiManager
-import com.intellij.testFramework.LightVirtualFile
 import com.jetbrains.php.lang.PhpFileType
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -40,48 +37,24 @@ import javax.swing.JPanel
 class OpcodesTerminalPanel(
     val project: Project,
 ) : SimpleToolWindowPanel(false, false), RefreshablePanel, Disposable {
+
     val fileEditorManager = FileEditorManager.getInstance(project)
     val documentManager = PsiDocumentManager.getInstance(project)
+    val editorFactory = EditorFactory.getInstance()
 
     private val service = project.getService(OpcodesDumperService::class.java)
+    private val editorProvider = project.getService(EditorProvider::class.java)
     private val state = PhpDumpSettingsService.getInstance(project)
-    private val editorFactory: EditorFactory = EditorFactory.getInstance()
-
-    private val virtualFile: LightVirtualFile = LightVirtualFile(
-        "opcodes.phpop",
-        PHPOpFileType.INSTANCE,
-        ""
-    )
-    val psiFile = PsiManager.getInstance(project).findFile(virtualFile)!!
-    val document = documentManager.getDocument(psiFile)!!
-
-    private var editor = editorFactory.createEditor(
-        document,
-        project,
-        virtualFile,
-        false
-    ) as EditorEx
+
+    val editor = editorProvider.getOrCreateEditor()
     val viewComponent = editor.component
 
     init {
-        configureEditor()
+
         createToolBar()
         createContent()
     }
 
-    private fun configureEditor() {
-        editor.settings.apply {
-            isBlinkCaret = true
-            isCaretRowShown = true
-            isBlockCursor = false
-            isLineMarkerAreaShown = true
-            isAutoCodeFoldingEnabled = true
-            isSmartHome = true
-            isShowIntentionBulb = true
-        }
-
-        editor.setCaretEnabled(true)
-    }
 
     private fun createToolBar() {
         val actionGroup = DefaultActionGroup().apply {
@@ -207,8 +180,8 @@ class OpcodesTerminalPanel(
 
     private fun setDocumentText(project: Project, content: String) {
         WriteCommandAction.runWriteCommandAction(project) {
-            document.setText(content)
-            documentManager.commitDocument(document)
+            editor.document.setText(content)
+            documentManager.commitDocument(editor.document)
         }
     }
 

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

@@ -108,7 +108,7 @@ class TokenTreePanel(private val project: Project) :
         }
     }
 
-    private fun navigation(closestPathForLocation: TreePath?) {
+    private fun navigation(closestPathForLocation: TreePath) {
         val lastUserObject = TreeUtil.getLastUserObject(closestPathForLocation)
         if (lastUserObject is TokenNode) {
             val fileEditor = FileEditorManager.getInstance(project)

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

@@ -0,0 +1,53 @@
+package com.github.xepozz.php_dump.services
+
+import com.github.xepozz.php_opcodes_language.language.PHPOpFileType
+import com.intellij.openapi.components.Service
+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.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 documentManager = PsiDocumentManager.getInstance(project)
+    val editorFactory = EditorFactory.getInstance()
+
+    var editor: EditorEx? = null
+
+    fun getOrCreateEditor(): EditorEx = synchronized(this) {
+        editor?.let { return it }
+
+        val virtualFile = LightVirtualFile(
+            "opcodes.phpop",
+            PHPOpFileType.INSTANCE,
+            ""
+        )
+        val psiFile = PsiManager.getInstance(project).findFile(virtualFile)!!
+        val document = documentManager.getDocument(psiFile)!!
+
+        return@synchronized (editorFactory.createEditor(document, project, virtualFile, false) as EditorEx)
+            .apply {
+                settings.apply {
+                    isBlinkCaret = true
+                    isCaretRowShown = true
+                    isBlockCursor = false
+                    isLineMarkerAreaShown = true
+                    isAutoCodeFoldingEnabled = true
+                    isSmartHome = true
+                    isShowIntentionBulb = true
+                }
+
+                setCaretEnabled(true)
+                putUserData(editorId, true)
+
+                editor = this
+            }
+    }
+}

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

@@ -51,7 +51,7 @@ class OpcacheSettingsTreeDumperService(var project: Project) : DumperServiceInte
                 phpSnippet,
                 project,
                 StringBufferProcessAdapter(output),
-                listOf("-dopcache.enable_cli=1"),
+                ("-d opcache.enable_cli=1".split(" ")),
             )
 
             val jsonString = output.toString()

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

@@ -1,65 +1,62 @@
 package com.github.xepozz.php_dump.services
 
-import com.github.xepozz.php_dump.StringBufferProcessAdapter
+import com.github.xepozz.php_dump.SeparateStringBufferProcessAdapter
 import com.github.xepozz.php_dump.command.PathMapper
 import com.github.xepozz.php_dump.command.PhpCommandExecutor
 import com.github.xepozz.php_dump.configuration.PhpDumpSettingsService
 import com.intellij.execution.configurations.GeneralCommandLine
 import com.intellij.openapi.components.Service
 import com.intellij.openapi.project.Project
-import com.jetbrains.php.config.PhpProjectConfigurationFacade
-import com.jetbrains.php.config.interpreters.PhpInterpretersManagerImpl
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 
 @Service(Service.Level.PROJECT)
 class OpcodesDumperService(var project: Project) : DumperServiceInterface {
     val state = PhpDumpSettingsService.getInstance(project)
-    val interpreter = PhpProjectConfigurationFacade.getInstance(project).interpreter
-        ?: PhpInterpretersManagerImpl.getInstance(project).interpreters.firstOrNull()
 
-    override suspend fun dump(file: String): Any? {
-        val interpreterPath = interpreter?.pathToPhpExecutable ?: return null
+    override suspend fun dump(file: String): Any {
         val debugLevel = state.debugLevel.value
         val preloadFile = state.preloadFile
 
         val localFile = PathMapper.map(project, file)
         val command = GeneralCommandLine(buildList {
-            add(interpreterPath)
             add("-l")
-            add("-ddisplay_errors=0")
-            add("-derror_reporting=0")
+            addAll("-d display_errors=0".split(" "))
+            addAll("-d error_reporting=0".split(" "))
 
-            add("-dopcache.enable_cli=1")
-            add("-dopcache.save_comments=1")
-            add("-dopcache.opt_debug_level=${debugLevel}")
+            addAll("-d opcache.enable_cli=1".split(" "))
+            addAll("-d opcache.save_comments=1".split(" "))
+            addAll("-d opcache.opt_debug_level=${debugLevel}".split(" "))
             if (preloadFile != null) {
-                add("-dopcache.preload=${preloadFile}")
+                addAll("-d opcache.preload=${preloadFile}".split(" "))
             }
-
-            add("1>/dev/null")
             add(localFile)
         }).commandLineString
 
         // language=injectablephp
         val phpSnippet = $$"""
-        opcache_compile_file($argv[1]);
-        passthru('$$command');
+        opcache_compile_file($argv[1]); passthru(PHP_BINARY . ' $$command');
         """.trimIndent()
 
+//        println("command: $command")
+//        println("phpSnippet: $phpSnippet")
         return withContext(Dispatchers.IO) {
-            val output = StringBuilder()
+            val opcodes = StringBuilder()
+            val errors = StringBuilder()
 
             PhpCommandExecutor.execute(
                 localFile,
                 phpSnippet,
                 project,
-                StringBufferProcessAdapter(output),
-                listOf("-dopcache.enable_cli=1"),
+                SeparateStringBufferProcessAdapter(stderr = opcodes, stdout = errors),
+                ("-d opcache.enable_cli=1".split(" ")),
             )
 
-
-            output.toString()
+            if (opcodes.isEmpty()) {
+                errors.toString()
+            } else {
+                opcodes.toString()
+            }
         }
     }
 }