Skip to content

Commit d33d9f4

Browse files
committed
Fix tests
1 parent ad66203 commit d33d9f4

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

src/phpDebug.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -233,14 +233,14 @@ class PhpDebugSession extends vscode.DebugSession {
233233
const runtimeArgs = launchArgs.runtimeArgs || [];
234234
const runtimeExecutable = launchArgs.runtimeExecutable || 'php';
235235
const programArgs = launchArgs.args || [];
236-
const args = [runtimeExecutable, ...runtimeArgs, launchArgs.program, ...programArgs];
236+
const args = [...runtimeArgs, launchArgs.program, ...programArgs];
237237
const cwd = launchArgs.cwd || process.cwd();
238238
const env = launchArgs.env;
239239
if (launchArgs.externalConsole || launchArgs.console === 'externalTerminal' || launchArgs.console === 'integratedTerminal') {
240240
// If external console or integrated terminal, send a runInTerminal request
241241
const kind: 'integrated' | 'external' = launchArgs.externalConsole || launchArgs.console === 'externalTerminal' ? 'external' : 'integrated';
242242
await new Promise<VSCodeDebugProtocol.RunInTerminalResponse>((resolve, reject) => {
243-
this.runInTerminalRequest({args, env, cwd, kind}, 5000, resolve);
243+
this.runInTerminalRequest({args: [runtimeExecutable, ...args], env, cwd, kind}, 5000, resolve);
244244
});
245245
} else {
246246
// Else spawn in an "internal" console
@@ -255,6 +255,9 @@ class PhpDebugSession extends vscode.DebugSession {
255255
script.on('error', (error: Error) => {
256256
this.sendEvent(new vscode.OutputEvent(error.message));
257257
});
258+
script.on('exit', (code: number) => {
259+
this.sendEvent(new vscode.TerminatedEvent());
260+
});
258261
}
259262
}
260263
} catch (error) {

0 commit comments

Comments
 (0)