diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java index 85d0b80e857..31316237911 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java @@ -59,7 +59,7 @@ import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.checker.JetTypeChecker; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; import org.jetbrains.jet.lexer.JetTokens; -import org.jetbrains.jet.resolve.DescriptorRenderer; +import org.jetbrains.jet.renderer.DescriptorRendererImpl; import java.util.*; @@ -3290,9 +3290,9 @@ The "returned" value of try expression with no finally is either the last expres v.dup(); Label nonnull = new Label(); v.ifnonnull(nonnull); - throwNewException(CLASS_TYPE_CAST_EXCEPTION, DescriptorRenderer.TEXT.renderType(leftType) + + throwNewException(CLASS_TYPE_CAST_EXCEPTION, DescriptorRendererImpl.TEXT.renderType(leftType) + " cannot be cast to " + - DescriptorRenderer.TEXT.renderType(rightType)); + DescriptorRendererImpl.TEXT.renderType(rightType)); v.mark(nonnull); } } diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaToKotlinMethodMap.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaToKotlinMethodMap.java index cea65877926..8e5425976d0 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaToKotlinMethodMap.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaToKotlinMethodMap.java @@ -28,7 +28,7 @@ import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.TypeUtils; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; -import org.jetbrains.jet.resolve.DescriptorRenderer; +import org.jetbrains.jet.renderer.DescriptorRendererImpl; import java.util.Collection; import java.util.List; @@ -94,7 +94,7 @@ public class JavaToKotlinMethodMap { @NotNull public static String serializeFunction(@NotNull FunctionDescriptor fun) { - return DescriptorRenderer.TEXT.render(fun); + return DescriptorRendererImpl.TEXT.render(fun); } // used in generated code diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/ElementAlternativeSignatureData.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/ElementAlternativeSignatureData.java index 0f5dd4f0dbb..b2bda210c42 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/ElementAlternativeSignatureData.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/ElementAlternativeSignatureData.java @@ -27,7 +27,7 @@ import org.jetbrains.jet.lang.psi.JetTypeReference; import org.jetbrains.jet.lang.resolve.AnalyzingUtils; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; -import org.jetbrains.jet.resolve.DescriptorRenderer; +import org.jetbrains.jet.renderer.DescriptorRendererImpl; import java.util.List; import java.util.Map; @@ -97,7 +97,7 @@ public abstract class ElementAlternativeSignatureData { else { throw new AlternativeSignatureMismatchException( "Return type in alternative signature is missing, while in real signature it is '%s'", - DescriptorRenderer.TEXT.renderType(originalType)); + DescriptorRendererImpl.TEXT.renderType(originalType)); } } diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/TypeTransformingVisitor.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/TypeTransformingVisitor.java index 11b97344ffd..a98e085f2ec 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/TypeTransformingVisitor.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/TypeTransformingVisitor.java @@ -29,7 +29,7 @@ import org.jetbrains.jet.lang.resolve.java.*; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.types.*; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; -import org.jetbrains.jet.resolve.DescriptorRenderer; +import org.jetbrains.jet.renderer.DescriptorRendererImpl; import java.util.*; @@ -67,7 +67,7 @@ class TypeTransformingVisitor extends JetVisitor { public JetType visitNullableType(JetNullableType nullableType, Void aVoid) { if (!originalType.isNullable() && typeUsage != TYPE_ARGUMENT) { throw new AlternativeSignatureMismatchException("Auto type '%s' is not-null, while type in alternative signature is nullable: '%s'", - DescriptorRenderer.TEXT.renderType(originalType), nullableType.getText()); + DescriptorRendererImpl.TEXT.renderType(originalType), nullableType.getText()); } return TypeUtils.makeNullable(computeType(nullableType.getInnerType(), originalType, originalToAltTypeParameters, typeUsage)); } @@ -117,7 +117,7 @@ class TypeTransformingVisitor extends JetVisitor { if (arguments.size() != type.getTypeArgumentsAsTypes().size()) { throw new AlternativeSignatureMismatchException("'%s' type in method signature has %d type arguments, while '%s' in alternative signature has %d of them", - DescriptorRenderer.TEXT.renderType(originalType), arguments.size(), type.getText(), + DescriptorRendererImpl.TEXT.renderType(originalType), arguments.size(), type.getText(), type.getTypeArgumentsAsTypes().size()); } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/DeclarationDescriptorImpl.java b/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/DeclarationDescriptorImpl.java index fe049778a17..033056e221a 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/DeclarationDescriptorImpl.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/DeclarationDescriptorImpl.java @@ -20,7 +20,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.annotations.AnnotatedImpl; import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor; import org.jetbrains.jet.lang.resolve.name.Name; -import org.jetbrains.jet.resolve.DescriptorRenderer; +import org.jetbrains.jet.renderer.DescriptorRendererImpl; import java.util.List; @@ -57,7 +57,7 @@ public abstract class DeclarationDescriptorImpl extends AnnotatedImpl implements @Override public String toString() { try { - return DescriptorRenderer.DEBUG_TEXT.render(this) + "[" + getClass().getSimpleName() + "@" + Integer.toHexString(System.identityHashCode(this)) + "]"; + return DescriptorRendererImpl.DEBUG_TEXT.render(this) + "[" + getClass().getSimpleName() + "@" + Integer.toHexString(System.identityHashCode(this)) + "]"; } catch (Throwable e) { // DescriptionRenderer may throw if this is not yet completely initialized // It is very inconvenient while debugging diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/MutableClassDescriptorLite.java b/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/MutableClassDescriptorLite.java index ac542ede0a5..b7c06105287 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/MutableClassDescriptorLite.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/MutableClassDescriptorLite.java @@ -26,7 +26,7 @@ import org.jetbrains.jet.lang.resolve.scopes.InnerClassesScopeWrapper; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.resolve.scopes.WritableScope; import org.jetbrains.jet.lang.types.*; -import org.jetbrains.jet.resolve.DescriptorRenderer; +import org.jetbrains.jet.renderer.DescriptorRendererImpl; import java.util.ArrayList; import java.util.Collection; @@ -240,7 +240,7 @@ public abstract class MutableClassDescriptorLite extends ClassDescriptorBase { @Override public String toString() { try { - return DescriptorRenderer.TEXT.render(this) + "[" + getClass().getCanonicalName() + "@" + System.identityHashCode(this) + "]"; + return DescriptorRendererImpl.TEXT.render(this) + "[" + getClass().getCanonicalName() + "@" + System.identityHashCode(this) + "]"; } catch (Throwable e) { return super.toString(); } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/TypeParameterDescriptorImpl.java b/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/TypeParameterDescriptorImpl.java index 81f2b9443fa..ad9fb331ebd 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/TypeParameterDescriptorImpl.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/TypeParameterDescriptorImpl.java @@ -25,7 +25,7 @@ import org.jetbrains.jet.lang.resolve.scopes.LazyScopeAdapter; import org.jetbrains.jet.lang.types.*; import org.jetbrains.jet.lang.types.checker.JetTypeChecker; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; -import org.jetbrains.jet.resolve.DescriptorRenderer; +import org.jetbrains.jet.renderer.DescriptorRendererImpl; import org.jetbrains.jet.util.lazy.LazyValue; import java.util.Collections; @@ -192,7 +192,7 @@ public class TypeParameterDescriptorImpl extends DeclarationDescriptorNonRootImp @Override public String toString() { try { - return DescriptorRenderer.TEXT.render(this); + return DescriptorRendererImpl.TEXT.render(this); } catch (Exception e) { return this.getClass().getName() + "@" + System.identityHashCode(this); } 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 bb81430a362..88ef7823c5a 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 @@ -26,7 +26,7 @@ import org.jetbrains.jet.lang.psi.JetTypeConstraint; import org.jetbrains.jet.lang.types.ErrorUtils; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lexer.JetKeywordToken; -import org.jetbrains.jet.resolve.DescriptorRenderer; +import org.jetbrains.jet.renderer.DescriptorRendererImpl; import java.lang.reflect.Field; import java.lang.reflect.Modifier; @@ -160,7 +160,7 @@ public class DefaultErrorMessages { MAP.put(DATA_CLASS_OVERRIDE_CONFLICT, "Function ''{0}'' generated for the data class conflicts with member of supertype ''{1}''", NAME, NAME); MAP.put(CANNOT_OVERRIDE_INVISIBLE_MEMBER, "''{0}'' cannot has no access to ''{1}'' in class {2}, so it cannot override it", - DescriptorRenderer.TEXT, DescriptorRenderer.TEXT, DescriptorRenderer.TEXT); + DescriptorRendererImpl.TEXT, DescriptorRendererImpl.TEXT, DescriptorRendererImpl.TEXT); MAP.put(CANNOT_INFER_VISIBILITY, "Cannot infer visibility. Please specify it explicitly"); MAP.put(ENUM_ENTRY_SHOULD_BE_INITIALIZED, "Missing delegation specifier ''{0}''", NAME); @@ -273,7 +273,7 @@ public class DefaultErrorMessages { MAP.put(CONFLICTING_UPPER_BOUNDS, "Upper bounds of {0} have empty intersection", NAME); MAP.put(CONFLICTING_CLASS_OBJECT_UPPER_BOUNDS, "Class object upper bounds of {0} have empty intersection", NAME); - MAP.put(TOO_MANY_ARGUMENTS, "Too many arguments for {0}", DescriptorRenderer.TEXT); + MAP.put(TOO_MANY_ARGUMENTS, "Too many arguments for {0}", DescriptorRendererImpl.TEXT); MAP.put(ERROR_COMPILE_TIME_VALUE, "{0}", TO_STRING); MAP.put(ELSE_MISPLACED_IN_WHEN, "'else' entry must be the last one in a when-expression"); @@ -366,18 +366,18 @@ public class DefaultErrorMessages { MAP.put(CANNOT_CHANGE_ACCESS_PRIVILEGE, "Cannot change access privilege ''{0}'' for ''{1}'' in ''{2}''", TO_STRING, NAME, NAME); MAP.put(RETURN_TYPE_MISMATCH_ON_OVERRIDE, "Return type of ''{0}'' is not a subtype of the return type of overridden member {1}", - NAME, DescriptorRenderer.TEXT); + NAME, DescriptorRendererImpl.TEXT); - MAP.put(VAR_OVERRIDDEN_BY_VAL, "Var-property {0} cannot be overridden by val-property {1}", DescriptorRenderer.TEXT, - DescriptorRenderer.TEXT); + MAP.put(VAR_OVERRIDDEN_BY_VAL, "Var-property {0} cannot be overridden by val-property {1}", DescriptorRendererImpl.TEXT, + DescriptorRendererImpl.TEXT); MAP.put(ABSTRACT_MEMBER_NOT_IMPLEMENTED, "{0} must be declared abstract or implement abstract member {1}", RENDER_CLASS_OR_OBJECT, - DescriptorRenderer.TEXT); + DescriptorRendererImpl.TEXT); MAP.put(MANY_IMPL_MEMBER_NOT_IMPLEMENTED, "{0} must override {1} because it inherits many implementations of it", - RENDER_CLASS_OR_OBJECT, DescriptorRenderer.TEXT); + RENDER_CLASS_OR_OBJECT, DescriptorRendererImpl.TEXT); - MAP.put(CONFLICTING_OVERLOADS, "{1} is already defined in ''{0}''", DescriptorRenderer.TEXT, TO_STRING); + MAP.put(CONFLICTING_OVERLOADS, "{1} is already defined in ''{0}''", DescriptorRendererImpl.TEXT, TO_STRING); MAP.put(FUNCTION_EXPECTED, "Expression ''{0}''{1} cannot be invoked as a function", ELEMENT_TEXT, new Renderer() { @NotNull diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/Renderers.java b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/Renderers.java index fa74a7680ed..5a7dc71e34a 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/Renderers.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/Renderers.java @@ -34,7 +34,7 @@ import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.TypeSubstitutor; import org.jetbrains.jet.lang.types.Variance; import org.jetbrains.jet.lang.types.checker.JetTypeChecker; -import org.jetbrains.jet.resolve.DescriptorRenderer; +import org.jetbrains.jet.renderer.DescriptorRendererImpl; import java.util.Collection; import java.util.Iterator; @@ -96,7 +96,7 @@ public class Renderers { @NotNull @Override public String render(@NotNull JetType type) { - return DescriptorRenderer.TEXT.renderType(type); + return DescriptorRendererImpl.TEXT.renderType(type); } }; @@ -107,7 +107,7 @@ public class Renderers { public String render(@NotNull Collection> argument) { StringBuilder stringBuilder = new StringBuilder("\n"); for (ResolvedCall call : argument) { - stringBuilder.append(DescriptorRenderer.TEXT.render(call.getResultingDescriptor())).append("\n"); + stringBuilder.append(DescriptorRendererImpl.TEXT.render(call.getResultingDescriptor())).append("\n"); } return stringBuilder.toString(); } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/TabledDescriptorRenderer.java b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/TabledDescriptorRenderer.java index 44a0c395d78..2e122104ee5 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/TabledDescriptorRenderer.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/TabledDescriptorRenderer.java @@ -26,7 +26,7 @@ import org.jetbrains.jet.lang.diagnostics.rendering.TabledDescriptorRenderer.Tab import org.jetbrains.jet.lang.diagnostics.rendering.TabledDescriptorRenderer.TextRenderer.TextElement; import org.jetbrains.jet.lang.resolve.calls.inference.ConstraintPosition; import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.resolve.DescriptorRenderer; +import org.jetbrains.jet.renderer.DescriptorRendererImpl; import java.util.Iterator; import java.util.List; @@ -168,7 +168,7 @@ public class TabledDescriptorRenderer { renderText((TextRenderer) row, result); } if (row instanceof DescriptorRow) { - result.append(DescriptorRenderer.COMPACT.render(((DescriptorRow) row).descriptor)); + result.append(DescriptorRendererImpl.COMPACT.render(((DescriptorRow) row).descriptor)); } if (row instanceof FunctionArgumentsRow) { FunctionArgumentsRow functionArgumentsRow = (FunctionArgumentsRow) row; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationResolver.java index 74cb20d4b1e..787618128e8 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationResolver.java @@ -30,7 +30,7 @@ import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.resolve.scopes.WritableScope; import org.jetbrains.jet.lang.types.ErrorUtils; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; -import org.jetbrains.jet.resolve.DescriptorRenderer; +import org.jetbrains.jet.renderer.DescriptorRendererImpl; import javax.inject.Inject; import java.util.*; @@ -311,7 +311,7 @@ public class DeclarationResolver { for (DeclarationDescriptor declarationDescriptor : descriptors) { for (PsiElement declaration : getDeclarationsByDescriptor(declarationDescriptor)) { assert declaration != null : "Null declaration for descriptor: " + declarationDescriptor + " " + - (declarationDescriptor != null ? DescriptorRenderer.TEXT.render(declarationDescriptor) : ""); + (declarationDescriptor != null ? DescriptorRendererImpl.TEXT.render(declarationDescriptor) : ""); trace.report(REDECLARATION.on(declaration, declarationDescriptor.getName().getName())); } } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ControlStructureTypingVisitor.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ControlStructureTypingVisitor.java index 8e146d272f9..47bb9f571e6 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ControlStructureTypingVisitor.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ControlStructureTypingVisitor.java @@ -374,7 +374,7 @@ public class ControlStructureTypingVisitor extends ExpressionTypingVisitor { if (iteratorResolutionResults.isAmbiguity()) { // StringBuffer stringBuffer = new StringBuffer("Method 'iterator()' is ambiguous for this expression: "); // for (FunctionDescriptor functionDescriptor : iteratorResolutionResults.getResultingCalls()) { -// stringBuffer.append(DescriptorRenderer.TEXT.render(functionDescriptor)).append(" "); +// stringBuffer.append(DescriptorRendererImpl.TEXT.render(functionDescriptor)).append(" "); // } // errorMessage = stringBuffer.toString(); context.trace.report(ITERATOR_AMBIGUITY.on(loopRangeExpression, iteratorResolutionResults.getResultingCalls())); diff --git a/compiler/frontend/src/org/jetbrains/jet/resolve/DescriptorRenderer.java b/compiler/frontend/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java similarity index 96% rename from compiler/frontend/src/org/jetbrains/jet/resolve/DescriptorRenderer.java rename to compiler/frontend/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java index 35b528d27c8..2b1ec64bfcc 100644 --- a/compiler/frontend/src/org/jetbrains/jet/resolve/DescriptorRenderer.java +++ b/compiler/frontend/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.resolve; +package org.jetbrains.jet.renderer; import com.google.common.collect.Lists; import com.google.common.collect.Sets; @@ -37,7 +37,7 @@ import java.util.*; /** * @author abreslav */ -public class DescriptorRenderer implements Renderer { +public class DescriptorRendererImpl implements Renderer { private static final Set KEYWORDS = Sets.newHashSet(); static { for (IElementType elementType : JetTokens.KEYWORDS.getTypes()) { @@ -47,13 +47,13 @@ public class DescriptorRenderer implements Renderer { } } - public static final DescriptorRenderer COMPACT_WITH_MODIFIERS = new DescriptorRenderer() { + public static final DescriptorRendererImpl COMPACT_WITH_MODIFIERS = new DescriptorRendererImpl() { @Override protected boolean shouldRenderDefinedIn() { return false; } }; - public static final DescriptorRenderer COMPACT = new DescriptorRenderer() { + public static final DescriptorRendererImpl COMPACT = new DescriptorRendererImpl() { @Override protected boolean shouldRenderDefinedIn() { return false; @@ -64,7 +64,7 @@ public class DescriptorRenderer implements Renderer { return false; } }; - public static final DescriptorRenderer STARTS_FROM_NAME = new DescriptorRenderer() { + public static final DescriptorRendererImpl STARTS_FROM_NAME = new DescriptorRendererImpl() { @Override protected boolean shouldRenderDefinedIn() { return false; @@ -80,15 +80,15 @@ public class DescriptorRenderer implements Renderer { return true; } }; - public static final DescriptorRenderer TEXT = new DescriptorRenderer(); - public static final DescriptorRenderer DEBUG_TEXT = new DescriptorRenderer() { + public static final DescriptorRendererImpl TEXT = new DescriptorRendererImpl(); + public static final DescriptorRendererImpl DEBUG_TEXT = new DescriptorRendererImpl() { @Override protected boolean hasDefaultValue(ValueParameterDescriptor descriptor) { // hasDefaultValue() has effects return descriptor.declaresDefaultValue(); } }; - public static final DescriptorRenderer HTML = new HtmlDescriptorRenderer(); + public static final DescriptorRendererImpl HTML = new HtmlDescriptorRendererImpl(); //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// protected final DeclarationDescriptorVisitor subVisitor = new RenderDeclarationDescriptorVisitor() { @Override @@ -366,7 +366,7 @@ public class DescriptorRenderer implements Renderer { } } - public static class HtmlDescriptorRenderer extends DescriptorRenderer { + public static class HtmlDescriptorRendererImpl extends DescriptorRendererImpl { @Override protected String escape(String s) { @@ -669,7 +669,7 @@ public class DescriptorRenderer implements Renderer { } protected void renderName(DeclarationDescriptor descriptor, StringBuilder stringBuilder) { - stringBuilder.append(escape(DescriptorRenderer.this.renderName(descriptor.getName()))); + stringBuilder.append(escape(DescriptorRendererImpl.this.renderName(descriptor.getName()))); } protected void renderTypeParameter(TypeParameterDescriptor descriptor, StringBuilder builder, boolean topLevel) { diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/AnnotationJavaDescriptorResolverTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/AnnotationJavaDescriptorResolverTest.java index 14a6bacef0d..891aecda9d8 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/AnnotationJavaDescriptorResolverTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/AnnotationJavaDescriptorResolverTest.java @@ -28,7 +28,7 @@ import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; -import org.jetbrains.jet.resolve.DescriptorRenderer; +import org.jetbrains.jet.renderer.DescriptorRendererImpl; import org.jetbrains.jet.JetTestUtils; import java.io.File; @@ -193,7 +193,7 @@ public class AnnotationJavaDescriptorResolverTest extends AbstractJavaResolverDe } private static void compareJetTypeWithClass(@NotNull JetType actualType, @NotNull String expectedType) { - assertEquals(expectedType, DescriptorRenderer.TEXT.renderType(actualType)); + assertEquals(expectedType, DescriptorRendererImpl.TEXT.renderType(actualType)); } @NotNull diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/ExpectedLoadErrorsUtil.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/ExpectedLoadErrorsUtil.java index 5522a748eb6..b27d43390ee 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/ExpectedLoadErrorsUtil.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/ExpectedLoadErrorsUtil.java @@ -25,7 +25,7 @@ import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; import org.jetbrains.jet.lang.resolve.scopes.JetScope; -import org.jetbrains.jet.resolve.DescriptorRenderer; +import org.jetbrains.jet.renderer.DescriptorRendererImpl; import java.io.File; import java.util.*; @@ -47,7 +47,7 @@ public class ExpectedLoadErrorsUtil { for (DeclarationDescriptor descriptor : ContainerUtil.union(expectedErrors.keySet(), actualErrors.keySet())) { List actual = actualErrors.get(descriptor); List expected = expectedErrors.get(descriptor); - String rendered = DescriptorRenderer.TEXT.render(descriptor); + String rendered = DescriptorRendererImpl.TEXT.render(descriptor); assertNotNull("Unexpected load error(s):\n" + actual + "\ncontainer:" + rendered, expected); assertNotNull("Missing load error(s):\n" + expected + "\ncontainer:" + rendered, actual); diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/JdkAnnotationsValidityTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/JdkAnnotationsValidityTest.java index 0d47550a9f2..bef59652564 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/JdkAnnotationsValidityTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/JdkAnnotationsValidityTest.java @@ -42,7 +42,7 @@ import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver; import org.jetbrains.jet.lang.resolve.java.JavaToKotlinClassMap; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.scopes.JetScope; -import org.jetbrains.jet.resolve.DescriptorRenderer; +import org.jetbrains.jet.renderer.DescriptorRendererImpl; import java.io.IOException; import java.util.List; @@ -182,7 +182,7 @@ public class JdkAnnotationsValidityTest extends UsefulTestCase { private Void visitDeclaration(@NotNull DeclarationDescriptor descriptor) { List errors = bindingContext.get(BindingContext.LOAD_FROM_JAVA_SIGNATURE_ERRORS, descriptor); if (errors != null) { - this.errors.put(DescriptorRenderer.TEXT.render(descriptor), errors); + this.errors.put(DescriptorRendererImpl.TEXT.render(descriptor), errors); } return null; } diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveDescriptorRendererTest.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveDescriptorRendererTest.java index dee5033c612..b3e71ae88cf 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveDescriptorRendererTest.java +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveDescriptorRendererTest.java @@ -30,7 +30,7 @@ import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.Name; -import org.jetbrains.jet.resolve.DescriptorRenderer; +import org.jetbrains.jet.renderer.DescriptorRendererImpl; import java.io.File; import java.io.IOException; @@ -136,7 +136,7 @@ public abstract class AbstractLazyResolveDescriptorRendererTest extends KotlinTe if (renderedDescriptors.length() != 0) { renderedDescriptors.append("\n"); } - renderedDescriptors.append(DescriptorRenderer.TEXT.render(descriptor)); + renderedDescriptors.append(DescriptorRendererImpl.TEXT.render(descriptor)); } Document document = new DocumentImpl(psiFile.getText()); diff --git a/compiler/tests/org/jetbrains/jet/resolve/DescriptorRendererTest.java b/compiler/tests/org/jetbrains/jet/renderer/DescriptorRendererTest.java similarity index 97% rename from compiler/tests/org/jetbrains/jet/resolve/DescriptorRendererTest.java rename to compiler/tests/org/jetbrains/jet/renderer/DescriptorRendererTest.java index ad3c5d5345c..d576aa50e1f 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/DescriptorRendererTest.java +++ b/compiler/tests/org/jetbrains/jet/renderer/DescriptorRendererTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.resolve; +package org.jetbrains.jet.renderer; import com.intellij.openapi.editor.Document; import com.intellij.openapi.editor.impl.DocumentImpl; @@ -113,7 +113,7 @@ public class DescriptorRendererTest extends JetLiteFixture { if (renderedDescriptors.length() != 0) { renderedDescriptors.append("\n"); } - renderedDescriptors.append(DescriptorRenderer.TEXT.render(descriptor)); + renderedDescriptors.append(DescriptorRendererImpl.TEXT.render(descriptor)); } Document document = new DocumentImpl(psiFile.getText()); diff --git a/compiler/tests/org/jetbrains/jet/resolve/ExpectedResolveData.java b/compiler/tests/org/jetbrains/jet/resolve/ExpectedResolveData.java index 495cc601903..17b3e46d371 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/ExpectedResolveData.java +++ b/compiler/tests/org/jetbrains/jet/resolve/ExpectedResolveData.java @@ -44,6 +44,7 @@ import org.jetbrains.jet.lang.types.ErrorUtils; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.TypeConstructor; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.jet.renderer.DescriptorRendererImpl; import java.util.Collections; import java.util.List; @@ -374,6 +375,6 @@ public abstract class ExpectedResolveData { @NotNull private static String renderNullableDescriptor(@Nullable DeclarationDescriptor d) { - return d == null ? "" : DescriptorRenderer.TEXT.render(d); + return d == null ? "" : DescriptorRendererImpl.TEXT.render(d); } } diff --git a/compiler/tests/org/jetbrains/jet/types/BoundsSubstitutorTest.java b/compiler/tests/org/jetbrains/jet/types/BoundsSubstitutorTest.java index 42b900d61c3..3109c1f4acd 100644 --- a/compiler/tests/org/jetbrains/jet/types/BoundsSubstitutorTest.java +++ b/compiler/tests/org/jetbrains/jet/types/BoundsSubstitutorTest.java @@ -27,7 +27,7 @@ import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.lazy.KotlinTestWithEnvironment; import org.jetbrains.jet.lang.resolve.lazy.LazyResolveTestUtil; import org.jetbrains.jet.lang.resolve.name.Name; -import org.jetbrains.jet.resolve.DescriptorRenderer; +import org.jetbrains.jet.renderer.DescriptorRendererImpl; import java.util.Collection; import java.util.Collections; @@ -79,7 +79,7 @@ public class BoundsSubstitutorTest extends KotlinTestWithEnvironment { FunctionDescriptor function = ContainerUtil.getFirstItem(functions); FunctionDescriptor substituted = DescriptorUtils.substituteBounds(function); - String actual = DescriptorRenderer.COMPACT.render(substituted); + String actual = DescriptorRendererImpl.COMPACT.render(substituted); assertEquals(expected, actual); } } diff --git a/compiler/tests/org/jetbrains/jet/types/TypeSubstitutorTest.java b/compiler/tests/org/jetbrains/jet/types/TypeSubstitutorTest.java index 339ff93b6e6..edda7b9de4b 100644 --- a/compiler/tests/org/jetbrains/jet/types/TypeSubstitutorTest.java +++ b/compiler/tests/org/jetbrains/jet/types/TypeSubstitutorTest.java @@ -44,7 +44,7 @@ import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.resolve.scopes.*; import org.jetbrains.jet.lang.types.*; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; -import org.jetbrains.jet.resolve.DescriptorRenderer; +import org.jetbrains.jet.renderer.DescriptorRendererImpl; import java.io.File; import java.io.IOException; @@ -106,7 +106,7 @@ public class TypeSubstitutorTest extends KotlinTestWithEnvironment { JetType result = substitutor.substitute(initialType, Variance.INVARIANT); - assertEquals(expectedTypeStr, DescriptorRenderer.TEXT.renderTypeWithShortNames(result)); + assertEquals(expectedTypeStr, DescriptorRendererImpl.TEXT.renderTypeWithShortNames(result)); } private Map stringsToSubstitutionMap(Pair[] substitutionStrs) { diff --git a/generators/org/jetbrains/jet/generators/jvm/GenerateJavaToKotlinMethodMap.java b/generators/org/jetbrains/jet/generators/jvm/GenerateJavaToKotlinMethodMap.java index 4f165e25148..ebfad1b5c1e 100644 --- a/generators/org/jetbrains/jet/generators/jvm/GenerateJavaToKotlinMethodMap.java +++ b/generators/org/jetbrains/jet/generators/jvm/GenerateJavaToKotlinMethodMap.java @@ -36,7 +36,7 @@ import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.java.JavaToKotlinClassMapBuilder; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; -import org.jetbrains.jet.resolve.DescriptorRenderer; +import org.jetbrains.jet.renderer.DescriptorRendererImpl; import org.jetbrains.jet.utils.PathUtil; import org.jetbrains.jet.utils.Printer; @@ -182,7 +182,7 @@ public class GenerateJavaToKotlinMethodMap { // "special case": remove(Int) and remove(Any?) in MutableList if (method.getName().equals("remove") && method.getContainingClass().getName().equals("List")) { String psiType = method.getParameterList().getParameters()[0].getType().getPresentableText(); - String jetType = DescriptorRenderer.TEXT.renderTypeWithShortNames(fun.getValueParameters().get(0).getType()); + String jetType = DescriptorRendererImpl.TEXT.renderTypeWithShortNames(fun.getValueParameters().get(0).getType()); String string = psiType + "|" + jetType; return "int|Int".equals(string) || "Object|Any?".equals(string); diff --git a/idea/src/org/jetbrains/jet/plugin/JetQuickDocumentationProvider.java b/idea/src/org/jetbrains/jet/plugin/JetQuickDocumentationProvider.java index 44ff01c9bea..4df8c358679 100644 --- a/idea/src/org/jetbrains/jet/plugin/JetQuickDocumentationProvider.java +++ b/idea/src/org/jetbrains/jet/plugin/JetQuickDocumentationProvider.java @@ -18,12 +18,10 @@ package org.jetbrains.jet.plugin; import com.intellij.lang.documentation.AbstractDocumentationProvider; import com.intellij.lang.java.JavaDocumentationProvider; -import com.intellij.psi.PsiClass; import com.intellij.psi.PsiElement; import com.intellij.psi.impl.compiled.ClsClassImpl; import com.intellij.psi.impl.compiled.ClsFileImpl; import com.intellij.psi.util.PsiTreeUtil; -import com.intellij.xml.util.XmlStringUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.psi.JetDeclaration; @@ -33,7 +31,7 @@ import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingContextUtils; import org.jetbrains.jet.plugin.libraries.JetDecompiledData; import org.jetbrains.jet.plugin.project.WholeProjectAnalyzerFacade; -import org.jetbrains.jet.resolve.DescriptorRenderer; +import org.jetbrains.jet.renderer.DescriptorRendererImpl; /** * @author abreslav @@ -87,7 +85,7 @@ public class JetQuickDocumentationProvider extends AbstractDocumentationProvider private static String render(@NotNull DeclarationDescriptor declarationDescriptor, @NotNull BindingContext bindingContext, PsiElement element, PsiElement originalElement, boolean mergeKotlinAndJava) { - String renderedDecl = DescriptorRenderer.HTML.render(declarationDescriptor); + String renderedDecl = DescriptorRendererImpl.HTML.render(declarationDescriptor); if (isKotlinDeclaration(declarationDescriptor, bindingContext)) { return renderedDecl; } else { diff --git a/idea/src/org/jetbrains/jet/plugin/actions/ShowExpressionTypeAction.java b/idea/src/org/jetbrains/jet/plugin/actions/ShowExpressionTypeAction.java index ac36ee86f49..aa022d1a18d 100644 --- a/idea/src/org/jetbrains/jet/plugin/actions/ShowExpressionTypeAction.java +++ b/idea/src/org/jetbrains/jet/plugin/actions/ShowExpressionTypeAction.java @@ -31,7 +31,7 @@ import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.plugin.JetLanguage; import org.jetbrains.jet.plugin.project.WholeProjectAnalyzerFacade; -import org.jetbrains.jet.resolve.DescriptorRenderer; +import org.jetbrains.jet.renderer.DescriptorRendererImpl; /** * @author yole @@ -65,7 +65,7 @@ public class ShowExpressionTypeAction extends AnAction { if (expression != null) { JetType type = bindingContext.get(BindingContext.EXPRESSION_TYPE, expression); if (type != null) { - HintManager.getInstance().showInformationHint(editor, "" + DescriptorRenderer.HTML.renderType(type) + ""); + HintManager.getInstance().showInformationHint(editor, "" + DescriptorRendererImpl.HTML.renderType(type) + ""); } } } diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/DescriptorClassMember.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/DescriptorClassMember.java index 3180b64f32a..75f30183a91 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/DescriptorClassMember.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/DescriptorClassMember.java @@ -31,7 +31,7 @@ import org.jetbrains.jet.lang.psi.JetClass; import org.jetbrains.jet.lang.psi.JetDeclaration; import org.jetbrains.jet.lang.psi.JetNamedDeclaration; import org.jetbrains.jet.plugin.JetDescriptorIconProvider; -import org.jetbrains.jet.resolve.DescriptorRenderer; +import org.jetbrains.jet.renderer.DescriptorRendererImpl; import javax.swing.*; @@ -93,7 +93,7 @@ public class DescriptorClassMember implements ClassMemberWithElement { @Override public String getText() { - return DescriptorRenderer.STARTS_FROM_NAME.render(myDescriptor); + return DescriptorRendererImpl.STARTS_FROM_NAME.render(myDescriptor); } public DeclarationDescriptor getDescriptor() { diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/JetFunctionPsiElementCellRenderer.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/JetFunctionPsiElementCellRenderer.java index dc4110271dd..780af1d4ec3 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/JetFunctionPsiElementCellRenderer.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/JetFunctionPsiElementCellRenderer.java @@ -21,7 +21,7 @@ import com.intellij.psi.PsiElement; import org.jetbrains.jet.lang.descriptors.SimpleFunctionDescriptor; import org.jetbrains.jet.lang.psi.JetNamedFunction; import org.jetbrains.jet.lang.resolve.BindingContext; -import org.jetbrains.jet.resolve.DescriptorRenderer; +import org.jetbrains.jet.renderer.DescriptorRendererImpl; /** * @author Evgeny Gerashchenko @@ -41,7 +41,7 @@ public class JetFunctionPsiElementCellRenderer extends DefaultPsiElementCellRend SimpleFunctionDescriptor fd = bindingContext.get(BindingContext.FUNCTION, function); assert fd != null; - return DescriptorRenderer.TEXT.render(fd); + return DescriptorRendererImpl.TEXT.render(fd); } return super.getElementText(element); } diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideImplementMethodsHandler.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideImplementMethodsHandler.java index 8613342c4ba..985ce8e47e5 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideImplementMethodsHandler.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideImplementMethodsHandler.java @@ -36,7 +36,7 @@ import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; import org.jetbrains.jet.plugin.project.WholeProjectAnalyzerFacade; -import org.jetbrains.jet.resolve.DescriptorRenderer; +import org.jetbrains.jet.renderer.DescriptorRendererImpl; import java.util.ArrayList; import java.util.Collections; @@ -141,7 +141,7 @@ public abstract class OverrideImplementMethodsHandler implements LanguageCodeIns addReceiverParameter(descriptor, bodyBuilder); - bodyBuilder.append(descriptor.getName()).append(" : ").append(DescriptorRenderer.COMPACT_WITH_MODIFIERS.renderTypeWithShortNames( + bodyBuilder.append(descriptor.getName()).append(" : ").append(DescriptorRendererImpl.COMPACT_WITH_MODIFIERS.renderTypeWithShortNames( descriptor.getType())); String initializer = defaultInitializer(descriptor.getType(), KotlinBuiltIns.getInstance()); if (initializer != null) { @@ -154,7 +154,7 @@ public abstract class OverrideImplementMethodsHandler implements LanguageCodeIns } private static String renderType(JetType type) { - return DescriptorRenderer.TEXT.renderType(type); + return DescriptorRendererImpl.TEXT.renderType(type); } private static JetElement overrideFunction(Project project, SimpleFunctionDescriptor descriptor) { diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/ktSignature/AddKotlinSignatureAnnotation.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/ktSignature/AddKotlinSignatureAnnotation.java index eb16baf90b0..3d79b134b95 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/ktSignature/AddKotlinSignatureAnnotation.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/ktSignature/AddKotlinSignatureAnnotation.java @@ -42,7 +42,7 @@ import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.jet.plugin.JetIcons; -import org.jetbrains.jet.resolve.DescriptorRenderer; +import org.jetbrains.jet.renderer.DescriptorRendererImpl; import javax.swing.*; @@ -53,7 +53,7 @@ import static org.jetbrains.jet.plugin.codeInsight.ktSignature.KotlinSignatureUt * @since 16 Aug 2012 */ public class AddKotlinSignatureAnnotation extends BaseIntentionAction implements Iconable { - private static final DescriptorRenderer RENDERER = new DescriptorRenderer() { + private static final DescriptorRendererImpl RENDERER = new DescriptorRendererImpl() { @Override protected boolean shouldRenderDefinedIn() { return false; diff --git a/idea/src/org/jetbrains/jet/plugin/completion/DescriptorLookupConverter.java b/idea/src/org/jetbrains/jet/plugin/completion/DescriptorLookupConverter.java index 85c2917004d..db6ed730e62 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/DescriptorLookupConverter.java +++ b/idea/src/org/jetbrains/jet/plugin/completion/DescriptorLookupConverter.java @@ -41,7 +41,7 @@ import org.jetbrains.jet.plugin.completion.handlers.JetClassInsertHandler; import org.jetbrains.jet.plugin.completion.handlers.JetFunctionInsertHandler; import org.jetbrains.jet.plugin.completion.handlers.JetJavaClassInsertHandler; import org.jetbrains.jet.plugin.libraries.DecompiledDataFactory; -import org.jetbrains.jet.resolve.DescriptorRenderer; +import org.jetbrains.jet.renderer.DescriptorRendererImpl; import java.util.List; @@ -88,19 +88,19 @@ public final class DescriptorLookupConverter { if (descriptor instanceof FunctionDescriptor) { FunctionDescriptor functionDescriptor = (FunctionDescriptor) descriptor; JetType returnType = functionDescriptor.getReturnType(); - typeText = DescriptorRenderer.TEXT.renderType(returnType); - presentableText += DescriptorRenderer.TEXT.renderFunctionParameters(functionDescriptor); + typeText = DescriptorRendererImpl.TEXT.renderType(returnType); + presentableText += DescriptorRendererImpl.TEXT.renderFunctionParameters(functionDescriptor); boolean extensionFunction = functionDescriptor.getReceiverParameter() != null; DeclarationDescriptor containingDeclaration = descriptor.getContainingDeclaration(); if (containingDeclaration != null && extensionFunction) { - tailText += " for " + DescriptorRenderer.TEXT.renderType(functionDescriptor.getReceiverParameter().getType()); + tailText += " for " + DescriptorRendererImpl.TEXT.renderType(functionDescriptor.getReceiverParameter().getType()); tailText += " in " + DescriptorUtils.getFQName(containingDeclaration); } } else if (descriptor instanceof VariableDescriptor) { JetType outType = ((VariableDescriptor) descriptor).getType(); - typeText = DescriptorRenderer.TEXT.renderType(outType); + typeText = DescriptorRendererImpl.TEXT.renderType(outType); } else if (descriptor instanceof ClassDescriptor) { DeclarationDescriptor declaredIn = descriptor.getContainingDeclaration(); @@ -109,7 +109,7 @@ public final class DescriptorLookupConverter { tailTextGrayed = true; } else { - typeText = DescriptorRenderer.TEXT.render(descriptor); + typeText = DescriptorRendererImpl.TEXT.render(descriptor); } element = element.withInsertHandler(getInsertHandler(descriptor)); diff --git a/idea/src/org/jetbrains/jet/plugin/completion/JetLookupObject.java b/idea/src/org/jetbrains/jet/plugin/completion/JetLookupObject.java index 50b81dfd2c9..18f3396f25f 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/JetLookupObject.java +++ b/idea/src/org/jetbrains/jet/plugin/completion/JetLookupObject.java @@ -22,7 +22,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.resolve.lazy.ResolveSession; -import org.jetbrains.jet.resolve.DescriptorRenderer; +import org.jetbrains.jet.renderer.DescriptorRendererImpl; /** * Stores information about resolved descriptor and position of that descriptor. @@ -89,9 +89,9 @@ public final class JetLookupObject { else { LOG.warn("Descriptors from different resolve sessions"); - String descriptorText = DescriptorRenderer.TEXT.render(descriptor); + String descriptorText = DescriptorRendererImpl.TEXT.render(descriptor); @SuppressWarnings("ConstantConditions") - String otherDescriptorText = DescriptorRenderer.TEXT.render(other.descriptor); + String otherDescriptorText = DescriptorRendererImpl.TEXT.render(other.descriptor); if (descriptorText.equals(otherDescriptorText)) { return true; } diff --git a/idea/src/org/jetbrains/jet/plugin/highlighter/DeclarationHintSupport.java b/idea/src/org/jetbrains/jet/plugin/highlighter/DeclarationHintSupport.java index 19da90db0cb..7d8a3fd719e 100644 --- a/idea/src/org/jetbrains/jet/plugin/highlighter/DeclarationHintSupport.java +++ b/idea/src/org/jetbrains/jet/plugin/highlighter/DeclarationHintSupport.java @@ -45,7 +45,7 @@ import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.plugin.JetLanguage; import org.jetbrains.jet.plugin.project.WholeProjectAnalyzerFacade; import org.jetbrains.jet.plugin.util.LongRunningReadTask; -import org.jetbrains.jet.resolve.DescriptorRenderer; +import org.jetbrains.jet.renderer.DescriptorRendererImpl; import javax.swing.*; import java.awt.*; @@ -172,7 +172,7 @@ public class DeclarationHintSupport extends AbstractProjectComponent { JLayeredPane layeredPane = editor.getComponent().getRootPane().getLayeredPane(); Point point = SwingUtilities.convertPoint(editor.getContentComponent(), mousePosition, layeredPane); - lastHint = new LightweightHint(HintUtil.createInformationLabel(DescriptorRenderer.HTML.render(descriptor))); + lastHint = new LightweightHint(HintUtil.createInformationLabel(DescriptorRendererImpl.HTML.render(descriptor))); ((HintManagerImpl) HintManager.getInstance()).showEditorHint( lastHint, editor, point, HintManager.HIDE_BY_ANY_KEY | HintManager.HIDE_BY_TEXT_CHANGE diff --git a/idea/src/org/jetbrains/jet/plugin/highlighter/DeprecatedAnnotationVisitor.java b/idea/src/org/jetbrains/jet/plugin/highlighter/DeprecatedAnnotationVisitor.java index 0808f9dc43b..6aea1b6e5b0 100644 --- a/idea/src/org/jetbrains/jet/plugin/highlighter/DeprecatedAnnotationVisitor.java +++ b/idea/src/org/jetbrains/jet/plugin/highlighter/DeprecatedAnnotationVisitor.java @@ -38,7 +38,7 @@ import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.types.TypeUtils; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; import org.jetbrains.jet.lexer.JetTokens; -import org.jetbrains.jet.resolve.DescriptorRenderer; +import org.jetbrains.jet.renderer.DescriptorRendererImpl; public class DeprecatedAnnotationVisitor extends AfterAnalysisHighlightingVisitor { @@ -267,8 +267,8 @@ public class DeprecatedAnnotationVisitor extends AfterAnalysisHighlightingVisito return "val " + descriptor.getName(); } else if (descriptor instanceof FunctionDescriptor) { - return "fun " + descriptor.getName() + DescriptorRenderer.TEXT.renderFunctionParameters((FunctionDescriptor) descriptor); + return "fun " + descriptor.getName() + DescriptorRendererImpl.TEXT.renderFunctionParameters((FunctionDescriptor) descriptor); } - return DescriptorRenderer.TEXT.render(descriptor); + return DescriptorRendererImpl.TEXT.render(descriptor); } } diff --git a/idea/src/org/jetbrains/jet/plugin/highlighter/HtmlTabledDescriptorRenderer.java b/idea/src/org/jetbrains/jet/plugin/highlighter/HtmlTabledDescriptorRenderer.java index 9278ed3bd62..aa18bf6409d 100644 --- a/idea/src/org/jetbrains/jet/plugin/highlighter/HtmlTabledDescriptorRenderer.java +++ b/idea/src/org/jetbrains/jet/plugin/highlighter/HtmlTabledDescriptorRenderer.java @@ -26,12 +26,11 @@ import org.jetbrains.jet.lang.diagnostics.rendering.TabledDescriptorRenderer; import org.jetbrains.jet.lang.diagnostics.rendering.TabledDescriptorRenderer.TableRenderer.*; import org.jetbrains.jet.lang.resolve.calls.inference.ConstraintPosition; import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.resolve.DescriptorRenderer; +import org.jetbrains.jet.renderer.DescriptorRendererImpl; import java.util.Iterator; import java.util.List; -import static org.jetbrains.jet.plugin.highlighter.IdeRenderers.HTML_RENDER_TYPE; import static org.jetbrains.jet.plugin.highlighter.IdeRenderers.error; import static org.jetbrains.jet.plugin.highlighter.IdeRenderers.strong; @@ -150,7 +149,7 @@ public class HtmlTabledDescriptorRenderer extends TabledDescriptorRenderer { super(); } - public static final DescriptorRenderer DESCRIPTOR_IN_TABLE = new DescriptorRenderer.HtmlDescriptorRenderer() { + public static final DescriptorRendererImpl DESCRIPTOR_IN_TABLE = new DescriptorRendererImpl.HtmlDescriptorRendererImpl() { @Override protected boolean shouldRenderDefinedIn() { return false; diff --git a/idea/src/org/jetbrains/jet/plugin/highlighter/IdeErrorMessages.java b/idea/src/org/jetbrains/jet/plugin/highlighter/IdeErrorMessages.java index 94296262f2c..9f0135454bd 100644 --- a/idea/src/org/jetbrains/jet/plugin/highlighter/IdeErrorMessages.java +++ b/idea/src/org/jetbrains/jet/plugin/highlighter/IdeErrorMessages.java @@ -20,7 +20,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor; import org.jetbrains.jet.lang.diagnostics.Diagnostic; import org.jetbrains.jet.lang.diagnostics.rendering.*; -import org.jetbrains.jet.resolve.DescriptorRenderer; +import org.jetbrains.jet.renderer.DescriptorRendererImpl; import static org.jetbrains.jet.lang.diagnostics.Errors.*; import static org.jetbrains.jet.lang.diagnostics.rendering.Renderers.RENDER_CLASS_OR_OBJECT; @@ -86,20 +86,20 @@ public class IdeErrorMessages { @NotNull @Override public String render(@NotNull CallableMemberDescriptor object) { - return DescriptorRenderer.HTML.renderType(object.getReturnType()); + return DescriptorRendererImpl.HTML.renderType(object.getReturnType()); } - }, DescriptorRenderer.HTML); + }, DescriptorRendererImpl.HTML); MAP.put(VAR_OVERRIDDEN_BY_VAL, "Val-property cannot override var-property
" + - "{1}", DescriptorRenderer.HTML, DescriptorRenderer.HTML); + "{1}", DescriptorRendererImpl.HTML, DescriptorRendererImpl.HTML); MAP.put(ABSTRACT_MEMBER_NOT_IMPLEMENTED, "{0} must be declared abstract or implement abstract member
" + "{1}", RENDER_CLASS_OR_OBJECT, - DescriptorRenderer.HTML); + DescriptorRendererImpl.HTML); MAP.put(MANY_IMPL_MEMBER_NOT_IMPLEMENTED, "{0} must override {1}
because it inherits many implementations of it", - RENDER_CLASS_OR_OBJECT, DescriptorRenderer.HTML); - MAP.put(CONFLICTING_OVERLOADS, "{1}
is already defined in ''{0}''", DescriptorRenderer.HTML, TO_STRING); + RENDER_CLASS_OR_OBJECT, DescriptorRendererImpl.HTML); + MAP.put(CONFLICTING_OVERLOADS, "{1}
is already defined in ''{0}''", DescriptorRendererImpl.HTML, TO_STRING); MAP.put(RESULT_TYPE_MISMATCH, "Function return type mismatch." + "" + diff --git a/idea/src/org/jetbrains/jet/plugin/highlighter/IdeRenderers.java b/idea/src/org/jetbrains/jet/plugin/highlighter/IdeRenderers.java index c2fd57b3547..a9bf3fa3148 100644 --- a/idea/src/org/jetbrains/jet/plugin/highlighter/IdeRenderers.java +++ b/idea/src/org/jetbrains/jet/plugin/highlighter/IdeRenderers.java @@ -38,7 +38,7 @@ import org.jetbrains.jet.lang.resolve.calls.model.ResolvedValueArgument; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.FqNameUnsafe; import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.resolve.DescriptorRenderer; +import org.jetbrains.jet.renderer.DescriptorRendererImpl; import java.util.Collection; import java.util.HashSet; @@ -75,7 +75,7 @@ public class IdeRenderers { StringBuilder stringBuilder = new StringBuilder(""); for (ResolvedCall call : calls) { stringBuilder.append("
  • "); - stringBuilder.append(DescriptorRenderer.HTML.render(call.getResultingDescriptor())).append("\n"); + stringBuilder.append(DescriptorRendererImpl.HTML.render(call.getResultingDescriptor())).append("\n"); stringBuilder.append("
    • "); } return stringBuilder.toString(); @@ -86,7 +86,7 @@ public class IdeRenderers { @NotNull @Override public String render(@NotNull JetType type) { - return DescriptorRenderer.HTML.renderType(type); + return DescriptorRendererImpl.HTML.renderType(type); } }; @@ -140,7 +140,7 @@ public class IdeRenderers { CallableDescriptor funDescriptor = call.getResultingDescriptor(); Set parametersToHighlight = getParametersToHighlight(call); - DescriptorRenderer htmlRenderer = DescriptorRenderer.HTML; + DescriptorRendererImpl htmlRenderer = DescriptorRendererImpl.HTML; ReceiverParameterDescriptor receiverParameter = funDescriptor.getReceiverParameter(); if (receiverParameter != null) { stringBuilder.append(htmlRenderer.renderType(receiverParameter.getType())).append("."); diff --git a/idea/src/org/jetbrains/jet/plugin/highlighter/JetLineMarkerProvider.java b/idea/src/org/jetbrains/jet/plugin/highlighter/JetLineMarkerProvider.java index 3270dd41b2c..7a85b9055f1 100644 --- a/idea/src/org/jetbrains/jet/plugin/highlighter/JetLineMarkerProvider.java +++ b/idea/src/org/jetbrains/jet/plugin/highlighter/JetLineMarkerProvider.java @@ -50,7 +50,7 @@ import org.jetbrains.jet.lang.resolve.BindingContextUtils; import org.jetbrains.jet.lexer.JetTokens; import org.jetbrains.jet.plugin.codeInsight.JetFunctionPsiElementCellRenderer; import org.jetbrains.jet.plugin.project.WholeProjectAnalyzerFacade; -import org.jetbrains.jet.resolve.DescriptorRenderer; +import org.jetbrains.jet.renderer.DescriptorRendererImpl; import javax.swing.*; import java.awt.event.MouseEvent; @@ -185,7 +185,7 @@ public class JetLineMarkerProvider implements LineMarkerProvider { else { JBPopup popup = NavigationUtil.getPsiElementPopup(PsiUtilCore.toPsiElementArray(list), new JetFunctionPsiElementCellRenderer(bindingContext), - DescriptorRenderer.TEXT.render(descriptor)); + DescriptorRendererImpl.TEXT.render(descriptor)); if (event != null) { popup.show(new RelativePoint(event)); } @@ -218,11 +218,11 @@ public class JetLineMarkerProvider implements LineMarkerProvider { StringBuilder builder = new StringBuilder(); - builder.append(DescriptorRenderer.HTML.render(descriptor)); + builder.append(DescriptorRendererImpl.HTML.render(descriptor)); int overrideCount = overriddenMembers.size(); if (overrideCount >= 1) { builder.append("\n").append(implementsOrOverrides).append("\n"); - builder.append(DescriptorRenderer.HTML.render(overriddenMembers.iterator().next())); + builder.append(DescriptorRendererImpl.HTML.render(overriddenMembers.iterator().next())); } if (overrideCount > 1) { int count = overrideCount - 1; diff --git a/idea/src/org/jetbrains/jet/plugin/highlighter/VariablesHighlightingVisitor.java b/idea/src/org/jetbrains/jet/plugin/highlighter/VariablesHighlightingVisitor.java index cd42f911ad9..0a7e7575224 100644 --- a/idea/src/org/jetbrains/jet/plugin/highlighter/VariablesHighlightingVisitor.java +++ b/idea/src/org/jetbrains/jet/plugin/highlighter/VariablesHighlightingVisitor.java @@ -23,7 +23,7 @@ import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.resolve.DescriptorRenderer; +import org.jetbrains.jet.renderer.DescriptorRendererImpl; import static org.jetbrains.jet.lang.resolve.BindingContext.*; @@ -66,7 +66,7 @@ class VariablesHighlightingVisitor extends AfterAnalysisHighlightingVisitor { public void visitExpression(@NotNull JetExpression expression) { JetType autoCast = bindingContext.get(AUTOCAST, expression); if (autoCast != null) { - holder.createInfoAnnotation(expression, "Automatically cast to " + DescriptorRenderer.TEXT.renderType(autoCast)).setTextAttributes( + holder.createInfoAnnotation(expression, "Automatically cast to " + DescriptorRendererImpl.TEXT.renderType(autoCast)).setTextAttributes( JetHighlightingColors.AUTO_CASTED_VALUE); } super.visitExpression(expression); diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/SpecifyTypeExplicitlyAction.java b/idea/src/org/jetbrains/jet/plugin/intentions/SpecifyTypeExplicitlyAction.java index 76cfa1fa137..9b60d9dd510 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/SpecifyTypeExplicitlyAction.java +++ b/idea/src/org/jetbrains/jet/plugin/intentions/SpecifyTypeExplicitlyAction.java @@ -38,7 +38,7 @@ import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.jet.plugin.codeInsight.ReferenceToClassesShortening; import org.jetbrains.jet.plugin.project.AnalyzeSingleFileUtil; -import org.jetbrains.jet.resolve.DescriptorRenderer; +import org.jetbrains.jet.renderer.DescriptorRendererImpl; import java.util.Collections; @@ -186,7 +186,7 @@ public class SpecifyTypeExplicitlyAction extends PsiElementBaseIntentionAction { exprType = enumClass.getDefaultType(); } - JetTypeReference typeReference = JetPsiFactory.createType(project, DescriptorRenderer.TEXT.renderType(exprType)); + JetTypeReference typeReference = JetPsiFactory.createType(project, DescriptorRendererImpl.TEXT.renderType(exprType)); ASTNode colon = JetPsiFactory.createColonNode(project); ASTNode anchorNode = anchor == null ? null : anchor.getNode().getTreeNext(); if (anchor == null) { @@ -203,7 +203,7 @@ public class SpecifyTypeExplicitlyAction extends PsiElementBaseIntentionAction { } public static void addTypeAnnotation(Project project, JetFunction function, @NotNull JetType exprType) { - JetTypeReference typeReference = JetPsiFactory.createType(project, DescriptorRenderer.TEXT.renderType(exprType)); + JetTypeReference typeReference = JetPsiFactory.createType(project, DescriptorRendererImpl.TEXT.renderType(exprType)); Pair colon = JetPsiFactory.createColon(project); JetParameterList valueParameterList = function.getValueParameterList(); assert valueParameterList != null; @@ -213,7 +213,7 @@ public class SpecifyTypeExplicitlyAction extends PsiElementBaseIntentionAction { } public static void addTypeAnnotation(Project project, JetParameter parameter, @NotNull JetType exprType) { - JetTypeReference typeReference = JetPsiFactory.createType(project, DescriptorRenderer.TEXT.renderType(exprType)); + JetTypeReference typeReference = JetPsiFactory.createType(project, DescriptorRendererImpl.TEXT.renderType(exprType)); Pair colon = JetPsiFactory.createColon(project); parameter.addAfter(typeReference, parameter.getNameIdentifier()); parameter.addRangeAfter(colon.getFirst(), colon.getSecond(), parameter.getNameIdentifier()); diff --git a/idea/src/org/jetbrains/jet/plugin/libraries/DeclarationDescriptorComparator.java b/idea/src/org/jetbrains/jet/plugin/libraries/DeclarationDescriptorComparator.java index 62e5f1279b1..3af4f3c4bdd 100644 --- a/idea/src/org/jetbrains/jet/plugin/libraries/DeclarationDescriptorComparator.java +++ b/idea/src/org/jetbrains/jet/plugin/libraries/DeclarationDescriptorComparator.java @@ -17,7 +17,7 @@ package org.jetbrains.jet.plugin.libraries; import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.resolve.DescriptorRenderer; +import org.jetbrains.jet.renderer.DescriptorRendererImpl; import java.util.Comparator; @@ -67,8 +67,8 @@ class DeclarationDescriptorComparator implements Comparator descriptors; if (originalDescriptor instanceof ConstructorDescriptor && containingDeclaration instanceof ClassDescriptor) { descriptors = ((ClassDescriptor) containingDeclaration).getConstructors(); @@ -172,7 +172,7 @@ public class StandardLibraryReferenceResolver extends AbstractProjectComponent { descriptors = memberScope.getAllDescriptors(); } for (DeclarationDescriptor member : descriptors) { - if (renderedOriginal.equals(DescriptorRenderer.TEXT.render(member).replace(TUPLE0_FQ_NAME.getFqName(), + if (renderedOriginal.equals(DescriptorRendererImpl.TEXT.render(member).replace(TUPLE0_FQ_NAME.getFqName(), KotlinBuiltIns.UNIT_ALIAS.getName()))) { return member; } diff --git a/idea/src/org/jetbrains/jet/plugin/structureView/JetStructureViewElement.java b/idea/src/org/jetbrains/jet/plugin/structureView/JetStructureViewElement.java index dae3b38058b..76059a2e84e 100644 --- a/idea/src/org/jetbrains/jet/plugin/structureView/JetStructureViewElement.java +++ b/idea/src/org/jetbrains/jet/plugin/structureView/JetStructureViewElement.java @@ -34,7 +34,7 @@ import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.plugin.project.WholeProjectAnalyzerFacade; -import org.jetbrains.jet.resolve.DescriptorRenderer; +import org.jetbrains.jet.renderer.DescriptorRendererImpl; import javax.swing.*; import java.util.ArrayList; @@ -196,7 +196,7 @@ public class JetStructureViewElement implements StructureViewTreeElement { FunctionDescriptor functionDescriptor = (FunctionDescriptor) descriptor; ReceiverParameterDescriptor receiver = functionDescriptor.getReceiverParameter(); if (receiver != null) { - textBuilder.append(DescriptorRenderer.TEXT.renderType(receiver.getType())).append("."); + textBuilder.append(DescriptorRendererImpl.TEXT.renderType(receiver.getType())).append("."); } textBuilder.append(functionDescriptor.getName()); @@ -207,7 +207,7 @@ public class JetStructureViewElement implements StructureViewTreeElement { @Override public String fun(ValueParameterDescriptor valueParameterDescriptor) { return valueParameterDescriptor.getName() + ":" + - DescriptorRenderer.TEXT.renderType(valueParameterDescriptor.getType()); + DescriptorRendererImpl.TEXT.renderType(valueParameterDescriptor.getType()); } }, ","); @@ -215,13 +215,13 @@ public class JetStructureViewElement implements StructureViewTreeElement { textBuilder.append("(").append(parametersString).append(")"); JetType returnType = functionDescriptor.getReturnType(); - textBuilder.append(":").append(DescriptorRenderer.TEXT.renderType(returnType)); + textBuilder.append(":").append(DescriptorRendererImpl.TEXT.renderType(returnType)); } else if (descriptor instanceof VariableDescriptor) { JetType outType = ((VariableDescriptor) descriptor).getType(); textBuilder = new StringBuilder(descriptor.getName().getName()); - textBuilder.append(":").append(DescriptorRenderer.TEXT.renderType(outType)); + textBuilder.append(":").append(DescriptorRendererImpl.TEXT.renderType(outType)); } else if (descriptor instanceof ClassDescriptor) { textBuilder = new StringBuilder(descriptor.getName().getName()); @@ -231,7 +231,7 @@ public class JetStructureViewElement implements StructureViewTreeElement { .append(")"); } else { - return DescriptorRenderer.TEXT.render(descriptor); + return DescriptorRendererImpl.TEXT.render(descriptor); } return textBuilder.toString();
    Expected:{1}