From 12f2c0861fc7a4506d548c4963884cfbc078fb9e Mon Sep 17 00:00:00 2001 From: Stanislav Erokhin Date: Tue, 9 Sep 2014 16:11:28 +0400 Subject: [PATCH] Added DiagnosticFactoryToRendererMap.put(Renderers.MultiRenderer) --- .../rendering/DefaultErrorMessages.java | 2 +- .../DiagnosticFactoryToRendererMap.java | 6 +++ ...DiagnosticWithMultiParametersRenderer.java | 39 +++++++++++++++++++ .../jetbrains/jet/renderer/MultiRenderer.java | 24 ++++++++++++ 4 files changed, 70 insertions(+), 1 deletion(-) create mode 100644 compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticWithMultiParametersRenderer.java create mode 100644 core/descriptors/src/org/jetbrains/jet/renderer/MultiRenderer.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DefaultErrorMessages.java b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DefaultErrorMessages.java index d1b673e675f..8fdb45c5216 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DefaultErrorMessages.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DefaultErrorMessages.java @@ -470,7 +470,7 @@ public class DefaultErrorMessages { MAP.put(TYPE_INFERENCE_UPPER_BOUND_VIOLATED, "{0}", TYPE_INFERENCE_UPPER_BOUND_VIOLATED_RENDERER); MAP.put(TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH, "Type inference failed. Expected type mismatch: found: {1} required: {0}", RENDER_TYPE, RENDER_TYPE); - MAP.put(WRONG_NUMBER_OF_TYPE_ARGUMENTS, "{0,choice,0#No type arguments|1#Type argument|1<{0,number,integer} type arguments} expected", null); + MAP.put(WRONG_NUMBER_OF_TYPE_ARGUMENTS, "{0,choice,0#No type arguments|1#Type argument|1<{0,number,integer} type arguments} expected", (Renderer) null); MAP.put(NO_TYPE_ARGUMENTS_ON_RHS, "{0,choice,0#No type arguments|1#Type argument|1<{0,number,integer} type arguments} expected. " + "Use ''{1}'' if you don''t want to pass type arguments", null, STRING); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticFactoryToRendererMap.java b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticFactoryToRendererMap.java index 96bdeb669cb..8df3601f263 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticFactoryToRendererMap.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticFactoryToRendererMap.java @@ -20,6 +20,7 @@ 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.renderer.MultiRenderer; import org.jetbrains.jet.renderer.Renderer; import java.util.HashMap; @@ -46,6 +47,11 @@ public final class DiagnosticFactoryToRendererMap { map.put(factory, new DiagnosticWithParameters1Renderer(message, rendererA)); } + public void put(@NotNull DiagnosticFactory1 factory, @NotNull String message, @NotNull MultiRenderer rendererA) { + checkMutability(); + map.put(factory, new DiagnosticWithMultiParametersRenderer(message, rendererA)); + } + public void put(@NotNull DiagnosticFactory2 factory, @NotNull String message, @Nullable Renderer rendererA, diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticWithMultiParametersRenderer.java b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticWithMultiParametersRenderer.java new file mode 100644 index 00000000000..c001e47cf3f --- /dev/null +++ b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticWithMultiParametersRenderer.java @@ -0,0 +1,39 @@ +/* + * Copyright 2010-2014 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.jet.lang.diagnostics.DiagnosticWithParameters1; +import org.jetbrains.jet.renderer.MultiRenderer; + +import java.text.MessageFormat; + +public class DiagnosticWithMultiParametersRenderer implements DiagnosticRenderer> { + @NotNull private final MessageFormat messageFormat; + @NotNull private final MultiRenderer renderersForA; + + public DiagnosticWithMultiParametersRenderer(@NotNull String message, @NotNull MultiRenderer renderersForA) { + this.messageFormat = new MessageFormat(message); + this.renderersForA = renderersForA; + } + + @NotNull + @Override + public String render(@NotNull DiagnosticWithParameters1 diagnostic) { + return messageFormat.format(renderersForA.render(diagnostic.getA())); + } +} diff --git a/core/descriptors/src/org/jetbrains/jet/renderer/MultiRenderer.java b/core/descriptors/src/org/jetbrains/jet/renderer/MultiRenderer.java new file mode 100644 index 00000000000..f650d09a7fc --- /dev/null +++ b/core/descriptors/src/org/jetbrains/jet/renderer/MultiRenderer.java @@ -0,0 +1,24 @@ +/* + * Copyright 2010-2014 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.renderer; + +import org.jetbrains.annotations.NotNull; + +public interface MultiRenderer { + @NotNull + String[] render(@NotNull O object); +} \ No newline at end of file