azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed rendering syntax error diagnostics in CompileSession.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-04-13 14:21:43 +04:00
parent 2cbac0a588
commit a5d5eb53e2
1 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/jet/compiler/CompileSession.java
+20 -2
View File
@@ -54,6 +54,8 @@ import java.util.List;
* @author yole * @author yole
*/ */
public class CompileSession { public class CompileSession {
private static final SimpleDiagnosticFactory<PsiErrorElement> SYNTAX_ERROR_FACTORY = SimpleDiagnosticFactory.create(Severity.ERROR);
private final JetCoreEnvironment environment; private final JetCoreEnvironment environment;
private final MessageCollector messageCollector; private final MessageCollector messageCollector;
private boolean stubs = false; private boolean stubs = false;
@@ -137,7 +139,7 @@ public class CompileSession {
public void visitErrorElement(PsiErrorElement element) { public void visitErrorElement(PsiErrorElement element) {
String description = element.getErrorDescription(); String description = element.getErrorDescription();
String message = StringUtil.isEmpty(description) ? "Syntax error" : description; String message = StringUtil.isEmpty(description) ? "Syntax error" : description;
Diagnostic diagnostic = SimpleDiagnosticFactory.create(Severity.ERROR, message).on(element); Diagnostic diagnostic = new SyntaxErrorDiagnostic(element, Severity.ERROR, message);
reportDiagnostic(messageCollector, diagnostic); reportDiagnostic(messageCollector, diagnostic);
} }
}); });
@@ -148,7 +150,14 @@ public class CompileSession {
DiagnosticUtils.LineAndColumn lineAndColumn = DiagnosticUtils.getLineAndColumn(diagnostic); DiagnosticUtils.LineAndColumn lineAndColumn = DiagnosticUtils.getLineAndColumn(diagnostic);
VirtualFile virtualFile = diagnostic.getPsiFile().getVirtualFile(); VirtualFile virtualFile = diagnostic.getPsiFile().getVirtualFile();
String path = virtualFile == null ? null : virtualFile.getPath(); String path = virtualFile == null ? null : virtualFile.getPath();
collector.report(diagnostic.getSeverity(), DefaultDiagnosticRenderer.INSTANCE.render(diagnostic), path, lineAndColumn.getLine(), lineAndColumn.getColumn()); String render;
if (diagnostic.getFactory() == SYNTAX_ERROR_FACTORY) {
render = ((SyntaxErrorDiagnostic)diagnostic).message;
}
else {
render = DefaultDiagnosticRenderer.INSTANCE.render(diagnostic);
}
collector.report(diagnostic.getSeverity(), render, path, lineAndColumn.getLine(), lineAndColumn.getColumn());
} }
@NotNull @NotNull
@@ -176,4 +185,13 @@ public class CompileSession {
errorStream.println(messageRenderer.render(Severity.LOGGING, message, null, -1, -1)); errorStream.println(messageRenderer.render(Severity.LOGGING, message, null, -1, -1));
} }
} }
private static class SyntaxErrorDiagnostic extends SimpleDiagnostic<PsiErrorElement> {
private String message;
private SyntaxErrorDiagnostic(@NotNull PsiErrorElement psiElement, @NotNull Severity severity, String message) {
super(psiElement, SYNTAX_ERROR_FACTORY, severity);
this.message = message;
}
}
} }