Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-24 18:49:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #971

Browse Source
This commit is contained in:
Dirk Baeumer
2015-12-04 12:32:00 +01:00
parent da5268f6a0
commit 93f3088584
2 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
extensions/php/src/features/validationProvider.ts
View File

@@ -84,6 +84,7 @@ export default class PHPValidationProvider {
private static BufferArgs: string[] = ['-l', '-n', '-d', 'display_errors=On', '-d', 'log_errors=Off'];
private static FileArgs: string[] = ['-l', '-n', '-d', 'display_errors=On', '-d', 'log_errors=Off', '-f'];
private validationEnabled: boolean;
private executable: string;
private trigger: RunTrigger;
private executableNotFound: boolean;
@@ -94,6 +95,7 @@ export default class PHPValidationProvider {
constructor() {
this.executable = null;
this.validationEnabled = true;
this.trigger = RunTrigger.onSave;
this.executableNotFound = false;
}
@@ -109,9 +111,6 @@ export default class PHPValidationProvider {
this.diagnosticCollection.delete(textDocument.uri);
delete this.delayers[textDocument.uri.toString()];
}, null, subscriptions);
// Validate all open php documents
vscode.workspace.textDocuments.forEach(this.triggerValidate, this);
}
public dispose(): void {
@@ -123,6 +122,7 @@ export default class PHPValidationProvider {
let section = vscode.workspace.getConfiguration('php');
let oldExecutable = this.executable;
if (section) {
this.validationEnabled = section.get<boolean>('validate.enable', true);
this.executable = section.get<string>('validate.executablePath', null);
this.trigger = RunTrigger.from(section.get<string>('validate.run', RunTrigger.strings.onSave));
}
@@ -133,19 +133,22 @@ export default class PHPValidationProvider {
if (this.documentListener) {
this.documentListener.dispose();
}
if (this.trigger === RunTrigger.onType) {
this.documentListener = vscode.workspace.onDidChangeTextDocument((e) => {
this.triggerValidate(e.document);
});
} else {
this.documentListener = vscode.workspace.onDidSaveTextDocument(this.triggerValidate, this);
this.diagnosticCollection.clear();
if (this.validationEnabled) {
if (this.trigger === RunTrigger.onType) {
this.documentListener = vscode.workspace.onDidChangeTextDocument((e) => {
this.triggerValidate(e.document);
});
} else {
this.documentListener = vscode.workspace.onDidSaveTextDocument(this.triggerValidate, this);
}
// Configuration has changed. Reevaluate all documents.
vscode.workspace.textDocuments.forEach(this.triggerValidate, this);
}
// Configuration has changed. Reevaluate all documents.
vscode.workspace.textDocuments.forEach(this.triggerValidate, this);
}
private triggerValidate(textDocument: vscode.TextDocument): void {
if (textDocument.languageId !== 'php' || this.executableNotFound) {
if (textDocument.languageId !== 'php' || this.executableNotFound || !this.validationEnabled) {
return;
}
let key = textDocument.uri.toString();