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

Made single parameter of Renderer.render() @NotNull, because argument was almost never @Nullable on call-sites.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-04-12 18:27:29 +04:00
parent 46d929efa1
commit 7be6fe84be
10 changed files with 41 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/jet/compiler/DefaultDiagnosticRenderer.java
+4 -8
View File
@@ -18,7 +18,6 @@ package org.jetbrains.jet.compiler;
import com.intellij.psi.PsiElement;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.diagnostics.*;
import org.jetbrains.jet.lang.psi.JetFile;
@@ -41,7 +40,7 @@ public class DefaultDiagnosticRenderer implements DiagnosticRenderer<Diagnostic>
factoryToRenderer.put(EXCEPTION_WHILE_ANALYZING, new DiagnosticWithParameters1Renderer<JetFile, Throwable>("{0}", new Renderer<Throwable>() {
@NotNull
@Override
public String render(@Nullable Throwable e) {
public String render(@NotNull Throwable e) {
return e.getClass().getSimpleName() + ": " + e.getMessage();
}
}));
@@ -49,10 +48,7 @@ public class DefaultDiagnosticRenderer implements DiagnosticRenderer<Diagnostic>
@NotNull
@Override
public String render(@Nullable Diagnostic diagnostic) {
if (diagnostic == null) {
throw new IllegalArgumentException("Diagnostic passed to diagnostic renderer cannot be null");
}
public String render(@NotNull Diagnostic diagnostic) {
DiagnosticRenderer renderer = factoryToRenderer.get(diagnostic.getFactory());
if (renderer == null) {
return diagnostic.getMessage(); // TODO throw IllegalArgumentException instead
@@ -72,8 +68,8 @@ public class DefaultDiagnosticRenderer implements DiagnosticRenderer<Diagnostic>
@NotNull
@Override
public String render(@Nullable DiagnosticWithParameters1<E, A> diagnostic) {
return diagnostic == null ? "null" : messageFormat.format(new Object[]{rendererForA.render(diagnostic.getA())});
public String render(@NotNull DiagnosticWithParameters1<E, A> diagnostic) {
return messageFormat.format(new Object[]{rendererForA.render(diagnostic.getA())});
}
}
}