From d421f4b3c58fb2dc42c0096db084eaa06974088e Mon Sep 17 00:00:00 2001 From: MHO Date: Tue, 26 Dec 2023 15:11:58 +0100 Subject: [PATCH] Implemented cwd inside getPintCommand instead of global command --- src/ModuleResolver.ts | 6 +++++- src/PintEditService.ts | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/ModuleResolver.ts b/src/ModuleResolver.ts index 0b1a7f3..a80b70f 100644 --- a/src/ModuleResolver.ts +++ b/src/ModuleResolver.ts @@ -45,7 +45,11 @@ export class ModuleResolver { return; } - return new PhpCommand(executable, await this.getPintConfigAsArgs(workspaceFolder, input)); + const cmd = getWorkspaceConfig('executablePath', path.posix.join(...DEFAULT_EXEC_PATH)); + + const cwd = executable.replace( cmd, '' ); + + return new PhpCommand(cmd, await this.getPintConfigAsArgs(workspaceFolder, input), cwd); } public async getPintCommandWithinSail(workspaceFolder: WorkspaceFolder, input?: string): Promise { diff --git a/src/PintEditService.ts b/src/PintEditService.ts index 8da56b6..eb2e341 100644 --- a/src/PintEditService.ts +++ b/src/PintEditService.ts @@ -200,7 +200,7 @@ export default class PintEditService implements Disposable { return false; } - command.run(workspaceFolder?.uri.fsPath); + command.run(); this.loggingService.logDebug(RUNNING_PINT_ON_PATH, { command: command.toString() });