refactor: better windows support

Author: xepozz

gradle.properties

@@ -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.9
+platformPlugins=com.jetbrains.php:251.23774.318,com.jetbrains.hackathon.indices.viewer:1.30,com.github.xepozz.php_opcodes_language:2025.0.10
 # 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/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()
+            }
         }
     }
 }