Diagnostics & diagnostic factories refactoring

This commit is contained in:
Svetlana Isakova
2012-02-27 21:35:00 +04:00
parent 4c70d341b1
commit 631961e761
81 changed files with 1486 additions and 1999 deletions
@@ -35,8 +35,8 @@ import org.jetbrains.jet.lang.descriptors.ClassOrNamespaceDescriptor;
import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
import org.jetbrains.jet.lang.descriptors.ModuleDescriptor;
import org.jetbrains.jet.lang.diagnostics.Diagnostic;
import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory;
import org.jetbrains.jet.lang.diagnostics.Severity;
import org.jetbrains.jet.lang.diagnostics.SimpleDiagnosticFactory;
import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.jet.lang.resolve.BindingContext;
import org.jetbrains.jet.lang.resolve.java.AnalyzerFacade;
@@ -190,7 +190,7 @@ public class CompileSession {
public void visitErrorElement(PsiErrorElement element) {
String description = element.getErrorDescription();
String message = StringUtil.isEmpty(description) ? "Syntax error" : description;
Diagnostic diagnostic = SimpleDiagnosticFactory.create(Severity.ERROR, message).on(element);
Diagnostic diagnostic = DiagnosticFactory.create(Severity.ERROR, message).on(element);
errorCollector.report(diagnostic);
}
});
@@ -39,7 +39,7 @@ class ErrorCollector {
public void report(Diagnostic diagnostic) {
hasErrors |= diagnostic.getSeverity() == Severity.ERROR;
maps.put(diagnostic.getFactory().getPsiFile(diagnostic), diagnostic);
maps.put(diagnostic.getPsiFile(), diagnostic);
}
public void flushTo(final PrintStream out) {