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

Made renderers added to DiagnosticWithParametersXRenderer nullable.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-04-18 18:03:31 +04:00
parent 5692032530
commit a45a7ae631
5 changed files with 65 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticFactoryToRendererMap.java
+11 -11
View File
@@ -39,29 +39,29 @@ public final class DiagnosticFactoryToRendererMap {
}
}
public <E extends PsiElement> void put(SimpleDiagnosticFactory<E> factory, String message) {
public <E extends PsiElement> void put(@NotNull SimpleDiagnosticFactory<E> factory, @NotNull String message) {
checkMutability();
map.put(factory, new SimpleDiagnosticRenderer(message));
}
public <E extends PsiElement, A> void put(DiagnosticFactory1<E, A> factory, String message, Renderer<? super A> rendererA) {
public <E extends PsiElement, A> void put(@NotNull DiagnosticFactory1<E, A> factory, @NotNull String message, @Nullable Renderer<? super A> rendererA) {
checkMutability();
map.put(factory, new DiagnosticWithParameters1Renderer<A>(message, rendererA));
}
public <E extends PsiElement, A, B> void put(DiagnosticFactory2<E, A, B> factory,
String message,
Renderer<? super A> rendererA,
Renderer<? super B> rendererB) {
public <E extends PsiElement, A, B> void put(@NotNull DiagnosticFactory2<E, A, B> factory,
@NotNull String message,
@Nullable Renderer<? super A> rendererA,
@Nullable Renderer<? super B> rendererB) {
checkMutability();
map.put(factory, new DiagnosticWithParameters2Renderer<A, B>(message, rendererA, rendererB));
}
public <E extends PsiElement, A, B, C> void put(DiagnosticFactory3<E, A, B, C> factory,
String message,
Renderer<? super A> rendererA,
Renderer<? super B> rendererB,
Renderer<? super C> rendererC) {
public <E extends PsiElement, A, B, C> void put(@NotNull DiagnosticFactory3<E, A, B, C> factory,
@NotNull String message,
@Nullable Renderer<? super A> rendererA,
@Nullable Renderer<? super B> rendererB,
@Nullable Renderer<? super C> rendererC) {
checkMutability();
map.put(factory, new DiagnosticWithParameters3Renderer<A, B, C>(message, rendererA, rendererB, rendererC));
}
compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticRendererUtil.java
+34
View File
@@ -0,0 +1,34 @@
/*
* Copyright 2010-2012 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jetbrains.jet.lang.diagnostics.rendering;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
/**
* @author Evgeny Gerashchenko
* @since 4/18/12
*/
public class DiagnosticRendererUtil {
private DiagnosticRendererUtil() {
}
@NotNull
public static <P> Object renderParameter(@NotNull P parameter, @Nullable Renderer<P> renderer) {
return renderer == null ? parameter : renderer.render(parameter);
}
}
compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticWithParameters1Renderer.java
+5 -2
View File
@@ -17,10 +17,13 @@
package org.jetbrains.jet.lang.diagnostics.rendering;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.diagnostics.DiagnosticWithParameters1;
import java.text.MessageFormat;
import static org.jetbrains.jet.lang.diagnostics.rendering.DiagnosticRendererUtil.renderParameter;
/**
* @author Evgeny Gerashchenko
* @since 4/12/12
@@ -29,7 +32,7 @@ public class DiagnosticWithParameters1Renderer<A> implements DiagnosticRenderer<
private final MessageFormat messageFormat;
private final Renderer<? super A> rendererForA;
public DiagnosticWithParameters1Renderer(@NotNull String message, @NotNull Renderer<? super A> rendererForA) {
public DiagnosticWithParameters1Renderer(@NotNull String message, @Nullable Renderer<? super A> rendererForA) {
this.messageFormat = new MessageFormat(message);
this.rendererForA = rendererForA;
}
@@ -37,6 +40,6 @@ public class DiagnosticWithParameters1Renderer<A> implements DiagnosticRenderer<
@NotNull
@Override
public String render(@NotNull DiagnosticWithParameters1<?, A> diagnostic) {
return messageFormat.format(new Object[]{rendererForA.render(diagnostic.getA())});
return messageFormat.format(new Object[]{renderParameter(diagnostic.getA(), rendererForA)});
}
}
compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticWithParameters2Renderer.java
+6 -3
View File
@@ -17,10 +17,13 @@
package org.jetbrains.jet.lang.diagnostics.rendering;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.diagnostics.DiagnosticWithParameters2;
import java.text.MessageFormat;
import static org.jetbrains.jet.lang.diagnostics.rendering.DiagnosticRendererUtil.renderParameter;
/**
* @author Evgeny Gerashchenko
* @since 4/12/12
@@ -30,7 +33,7 @@ public class DiagnosticWithParameters2Renderer<A, B> implements DiagnosticRender
private final Renderer<? super A> rendererForA;
private final Renderer<? super B> rendererForB;
public DiagnosticWithParameters2Renderer(@NotNull String message, @NotNull Renderer<? super A> rendererForA, @NotNull Renderer<? super B> rendererForB) {
public DiagnosticWithParameters2Renderer(@NotNull String message, @Nullable Renderer<? super A> rendererForA, @Nullable Renderer<? super B> rendererForB) {
this.messageFormat = new MessageFormat(message);
this.rendererForA = rendererForA;
this.rendererForB = rendererForB;
@@ -40,7 +43,7 @@ public class DiagnosticWithParameters2Renderer<A, B> implements DiagnosticRender
@Override
public String render(@NotNull DiagnosticWithParameters2<?, A, B> diagnostic) {
return messageFormat.format(new Object[]{
rendererForA.render(diagnostic.getA()),
rendererForB.render(diagnostic.getB())});
renderParameter(diagnostic.getA(), rendererForA),
renderParameter(diagnostic.getB(), rendererForB)});
}
}
compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticWithParameters3Renderer.java
+9 -6
View File
@@ -17,10 +17,13 @@
package org.jetbrains.jet.lang.diagnostics.rendering;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.diagnostics.DiagnosticWithParameters3;
import java.text.MessageFormat;
import static org.jetbrains.jet.lang.diagnostics.rendering.DiagnosticRendererUtil.renderParameter;
/**
* @author Evgeny Gerashchenko
* @since 4/12/12
@@ -32,9 +35,9 @@ public class DiagnosticWithParameters3Renderer<A, B, C> implements DiagnosticRen
private final Renderer<? super C> rendererForC;
public DiagnosticWithParameters3Renderer(@NotNull String message,
@NotNull Renderer<? super A> rendererForA,
@NotNull Renderer<? super B> rendererForB,
@NotNull Renderer<? super C> rendererForC) {
@Nullable Renderer<? super A> rendererForA,
@Nullable Renderer<? super B> rendererForB,
@Nullable Renderer<? super C> rendererForC) {
this.messageFormat = new MessageFormat(message);
this.rendererForA = rendererForA;
this.rendererForB = rendererForB;
@@ -45,8 +48,8 @@ public class DiagnosticWithParameters3Renderer<A, B, C> implements DiagnosticRen
@Override
public String render(@NotNull DiagnosticWithParameters3<?, A, B, C> diagnostic) {
return messageFormat.format(new Object[]{
rendererForA.render(diagnostic.getA()),
rendererForB.render(diagnostic.getB()),
rendererForC.render(diagnostic.getC())});
renderParameter(diagnostic.getA(), rendererForA),
renderParameter(diagnostic.getB(), rendererForB),
renderParameter(diagnostic.getC(), rendererForC)});
}
}