Fixing the "Debug PHP" button and implementing run and debug php file…

… like Mock Debug example.
xdebug · Oct 23, 2023 · 989148e · 989148e
1 parent 10ed918
commit 989148e
Show file tree

Hide file tree

Showing 2 changed files with 77 additions and 18 deletions.
diff --git a/package.json b/package.json
@@ -154,8 +154,9 @@
   "main": "./out/extension.js",
   "activationEvents": [
     "onDebugResolve:php",
-    "onCommand:php.debug.debugPhpFile",
-    "onCommand:php.debug.startWithStopOnEntry"
+    "onCommand:extension.php-debug.startWithStopOnEntry",
+    "onCommand:extension.php-debug.debugEditorContents",
+    "onCommand:extension.php-debug.runEditorContents"
   ],
   "capabilities": {
     "untrustedWorkspaces": {
@@ -525,32 +526,56 @@
     "menus": {
       "editor/title/run": [
         {
-          "command": "php.debug.debugPhpFile",
+          "command": "extension.php-debug.runEditorContents",
+          "when": "resourceLangId == php && !inDiffEditor",
+          "group": "navigation@1"
+        },
+        {
+          "command": "extension.php-debug.debugEditorContents",
+          "when": "resourceLangId == php && !inDiffEditor",
+          "group": "navigation@2"
+        }
+      ],
+      "commandPalette": [
+        {
+          "command": "extension.php-debug.debugEditorContents",
+          "when": "resourceLangId == php && !inDiffEditor"
+        },
+        {
+          "command": "extension.php-debug.runEditorContents",
           "when": "resourceLangId == php && !inDiffEditor"
         }
       ]
     },
     "commands": [
       {
-        "command": "php.debug.debugPhpFile",
-        "title": "Debug PHP",
-        "icon": "$(debug-alt-small)",
-        "enablement": "resourceLangId == php"
-      },
-      {
-        "command": "php.debug.startWithStopOnEntry",
+        "command": "extension.php-debug.startWithStopOnEntry",
         "title": "Start Debugging and Stop on Entry",
         "category": "Debug"
+      },
+      {
+        "command": "extension.php-debug.debugEditorContents",
+        "title": "Debug PHP File",
+        "category": "PHP Debug",
+        "enablement": "!inDebugMode",
+        "icon": "$(debug-alt)"
+      },
+      {
+        "command": "extension.php-debug.runEditorContents",
+        "title": "Run PHP File",
+        "category": "PHP Debug",
+        "enablement": "!inDebugMode",
+        "icon": "$(play)"
       }
     ],
     "keybindings": [
       {
-        "command": "php.debug.startWithStopOnEntry",
+        "command": "extension.php-debug.startWithStopOnEntry",
         "key": "F10",
         "when": "!inDebugMode && debugConfigurationType == 'php'"
       },
       {
-        "command": "php.debug.startWithStopOnEntry",
+        "command": "extension.php-debug.startWithStopOnEntry",
         "key": "F11",
         "when": "!inDebugMode && debugConfigurationType == 'php'"
       }

diff --git a/src/extension.ts b/src/extension.ts
@@ -2,6 +2,7 @@ import * as vscode from 'vscode'
 import { WorkspaceFolder, DebugConfiguration, ProviderResult, CancellationToken } from 'vscode'
 import { LaunchRequestArguments } from './phpDebug'
 import * as which from 'which'
+import * as path from 'path'
 
 export function activate(context: vscode.ExtensionContext) {
     context.subscriptions.push(
@@ -11,14 +12,18 @@ export function activate(context: vscode.ExtensionContext) {
                 debugConfiguration: DebugConfiguration & LaunchRequestArguments,
                 token?: CancellationToken
             ): Promise<ProviderResult<DebugConfiguration>> {
-                if (!debugConfiguration.type && !debugConfiguration.request && !debugConfiguration.name) {
+                const isDynamic =
+                    (!debugConfiguration.type || debugConfiguration.type === 'php') &&
+                    !debugConfiguration.request &&
+                    !debugConfiguration.name
+                if (isDynamic) {
                     const editor = vscode.window.activeTextEditor
                     if (editor && editor.document.languageId === 'php') {
                         debugConfiguration.type = 'php'
                         debugConfiguration.name = 'Launch (dynamic)'
                         debugConfiguration.request = 'launch'
-                        debugConfiguration.program = '${file}'
-                        debugConfiguration.cwd = '${fileDirname}'
+                        debugConfiguration.program = debugConfiguration.program || '${file}'
+                        debugConfiguration.cwd = debugConfiguration.cwd || '${fileDirname}'
                         debugConfiguration.port = 0
                         debugConfiguration.runtimeArgs = ['-dxdebug.start_with_request=yes']
                         debugConfiguration.env = {
@@ -72,13 +77,42 @@ export function activate(context: vscode.ExtensionContext) {
     )
 
     context.subscriptions.push(
-        vscode.commands.registerCommand('php.debug.debugPhpFile', async (uri: vscode.Uri) => {
-            await vscode.debug.startDebugging(undefined, { type: '', name: '', request: '' })
+        vscode.commands.registerCommand('extension.php-debug.runEditorContents', (resource: vscode.Uri) => {
+            let targetResource = resource
+            if (!targetResource && vscode.window.activeTextEditor) {
+                targetResource = vscode.window.activeTextEditor.document.uri
+            }
+            if (targetResource) {
+                void vscode.debug.startDebugging(undefined, {
+                    type: 'php',
+                    name: '',
+                    request: '',
+                    noDebug: true,
+                    program: targetResource.fsPath,
+                    cwd: path.dirname(targetResource.fsPath),
+                })
+            }
+        }),
+        vscode.commands.registerCommand('extension.php-debug.debugEditorContents', (resource: vscode.Uri) => {
+            let targetResource = resource
+            if (!targetResource && vscode.window.activeTextEditor) {
+                targetResource = vscode.window.activeTextEditor.document.uri
+            }
+            if (targetResource) {
+                void vscode.debug.startDebugging(undefined, {
+                    type: 'php',
+                    name: '',
+                    request: '',
+                    stopOnEntry: true,
+                    program: targetResource.fsPath,
+                    cwd: path.dirname(targetResource.fsPath),
+                })
+            }
         })
     )
 
     context.subscriptions.push(
-        vscode.commands.registerCommand('php.debug.startWithStopOnEntry', async (uri: vscode.Uri) => {
+        vscode.commands.registerCommand('extension.php-debug.startWithStopOnEntry', async (uri: vscode.Uri) => {
             await vscode.commands.executeCommand('workbench.action.debug.start', {
                 config: {
                     stopOnEntry: true,