This commit is contained in:
Rob Lourens 2021-05-21 09:12:43 -07:00
parent adf68a52d5
commit 70c87f0db9

View file

@ -194,15 +194,17 @@ export default class PHPValidationProvider {
if (vscode.workspace.isTrusted) { if (vscode.workspace.isTrusted) {
trigger(); trigger();
} }
} else if (this.config!.executableIsUserDefined !== undefined && !this.config!.executableIsUserDefined) { } else {
const checkedExecutablePath = this.workspaceStore.get<string | undefined>(Setting.CheckedExecutablePath, undefined); if (this.config!.executableIsUserDefined !== undefined && !this.config!.executableIsUserDefined) {
if (!checkedExecutablePath || checkedExecutablePath !== this.config!.executable) { const checkedExecutablePath = this.workspaceStore.get<string | undefined>(Setting.CheckedExecutablePath, undefined);
if (await this.showCustomTrustDialog()) { if (!checkedExecutablePath || checkedExecutablePath !== this.config!.executable) {
this.workspaceStore.update(Setting.CheckedExecutablePath, this.config!.executable); if (await this.showCustomTrustDialog()) {
vscode.commands.executeCommand('setContext', 'php.untrustValidationExecutableContext', true); this.workspaceStore.update(Setting.CheckedExecutablePath, this.config!.executable);
} else { vscode.commands.executeCommand('setContext', 'php.untrustValidationExecutableContext', true);
this.pauseValidation = true; } else {
return; this.pauseValidation = true;
return;
}
} }
} }