From 068c9636fc155d53a3927c4793e941e47240610b Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Wed, 16 Apr 2014 16:29:29 +0400 Subject: [PATCH] Refactoring: rename TEXT to FQNAMES_IN_TYPES --- .idea/dictionaries/Nikolay_Krasko.xml | 1 + .../jet/codegen/ExpressionCodegen.java | 4 ++-- .../ElementAlternativeSignatureData.java | 2 +- .../TypeTransformingVisitor.java | 4 ++-- .../rendering/DefaultErrorMessages.java | 23 ++++++++++--------- .../lang/diagnostics/rendering/Renderers.java | 4 ++-- .../jet/lang/resolve/DeclarationResolver.java | 2 +- .../ForLoopConventionsChecker.java | 2 +- .../AbstractSdkAnnotationsValidityTest.java | 2 +- .../jvm/compiler/ExpectedLoadErrorsUtil.java | 2 +- ...ractLazyResolveDescriptorRendererTest.java | 2 +- .../jet/renderer/DescriptorRendererTest.java | 2 +- .../jet/resolve/ExpectedResolveData.java | 2 +- .../LazyJavaAnnotationDescriptor.kt | 2 +- .../annotations/AnnotationDescriptorImpl.java | 2 +- .../impl/TypeParameterDescriptorImpl.java | 2 +- .../jet/renderer/DescriptorRenderer.java | 2 +- .../JetFunctionPsiElementCellRenderer.java | 2 +- .../plugin/codeInsight/ShortenReferences.kt | 2 +- .../MoveDeclarationsOutHelper.java | 2 +- .../completion/DescriptorLookupConverter.java | 2 +- .../plugin/completion/smart/StaticMembers.kt | 2 +- .../jet/plugin/completion/smart/ThisItems.kt | 2 +- .../smart/TypeInstantiationItems.kt | 2 +- .../KotlinTypeHierarchyProvider.java | 2 +- .../DeprecatedAnnotationVisitor.java | 4 ++-- .../highlighter/JetLineMarkerProvider.java | 2 +- .../VariablesHighlightingVisitor.java | 2 +- .../intentions/InsertExplicitTypeArguments.kt | 2 +- .../SpecifyTypeExplicitlyAction.java | 5 +--- .../declarations/DeclarationUtils.java | 2 +- .../jet/plugin/libraries/MemberMatching.java | 8 +++---- .../quickfix/MapPlatformClassToKotlinFix.java | 4 ++-- .../extractFunction/ExtractionData.kt | 2 +- .../extractFunction/extractFunctionUtils.kt | 2 +- .../inline/KotlinInlineValHandler.java | 4 ++-- .../KotlinIntroduceVariableHandler.java | 2 +- .../references/BuiltInsReferenceResolver.java | 4 ++-- .../JetStructureViewElement.java | 10 ++++---- 39 files changed, 64 insertions(+), 65 deletions(-) diff --git a/.idea/dictionaries/Nikolay_Krasko.xml b/.idea/dictionaries/Nikolay_Krasko.xml index 6a3de02208046..443a097d1985c 100644 --- a/.idea/dictionaries/Nikolay_Krasko.xml +++ b/.idea/dictionaries/Nikolay_Krasko.xml @@ -2,6 +2,7 @@ accessors + fqnames goto kdoc memoized diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java index 460832afc0e1b..29c4f8ef0e205 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java @@ -3555,9 +3555,9 @@ public StackValue visitBinaryWithTypeRHSExpression(@NotNull JetBinaryExpressionW v.ifnonnull(nonnull); JetType leftType = bindingContext.get(BindingContext.EXPRESSION_TYPE, left); assert leftType != null; - throwNewException("kotlin/TypeCastException", DescriptorRenderer.TEXT.renderType(leftType) + + throwNewException("kotlin/TypeCastException", DescriptorRenderer.FQNAMES_IN_TYPES.renderType(leftType) + " cannot be cast to " + - DescriptorRenderer.TEXT.renderType(rightType)); + DescriptorRenderer.FQNAMES_IN_TYPES.renderType(rightType)); v.mark(nonnull); } } 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 3cfd6f985f210..791ffdee52b9f 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 @@ -97,7 +97,7 @@ protected static JetType computeReturnType( else { throw new AlternativeSignatureMismatchException( "Return type in alternative signature is missing, while in real signature it is '%s'", - DescriptorRenderer.TEXT.renderType(originalType)); + DescriptorRenderer.FQNAMES_IN_TYPES.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 33c9c909cb14c..bb42be72c0fc7 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 @@ -74,7 +74,7 @@ public static JetType computeType( public JetType visitNullableType(@NotNull 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()); + DescriptorRenderer.FQNAMES_IN_TYPES.renderType(originalType), nullableType.getText()); } JetTypeElement innerType = nullableType.getInnerType(); assert innerType != null : "Syntax error: " + nullableType.getText(); @@ -134,7 +134,7 @@ private JetType visitCommonType(@NotNull String qualifiedName, @NotNull JetTypeE 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(), + DescriptorRenderer.FQNAMES_IN_TYPES.renderType(originalType), arguments.size(), type.getText(), type.getTypeArgumentsAsTypes().size()); } 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 b92a2eea6cbfb..a42bed1975bec 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 @@ -158,7 +158,7 @@ public String render(@NotNull Collection tokens) { 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}'' has no access to ''{1}'', so it cannot override it", TEXT, TEXT); + MAP.put(CANNOT_OVERRIDE_INVISIBLE_MEMBER, "''{0}'' has no access to ''{1}'', so it cannot override it", FQNAMES_IN_TYPES, FQNAMES_IN_TYPES); MAP.put(CANNOT_INFER_VISIBILITY, "Cannot infer visibility. Please specify it explicitly"); MAP.put(ENUM_ENTRY_SHOULD_BE_INITIALIZED, "Missing delegation specifier ''{0}''", NAME); @@ -170,7 +170,7 @@ public String render(@NotNull Collection tokens) { MAP.put(UNUSED_PARAMETER, "Parameter ''{0}'' is never used", NAME); MAP.put(ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE, "Variable ''{0}'' is assigned but never accessed", NAME); MAP.put(VARIABLE_WITH_REDUNDANT_INITIALIZER, "Variable ''{0}'' initializer is redundant", NAME); - MAP.put(UNUSED_VALUE, "The value ''{0}'' assigned to ''{1}'' is never used", ELEMENT_TEXT, TEXT); + MAP.put(UNUSED_VALUE, "The value ''{0}'' assigned to ''{1}'' is never used", ELEMENT_TEXT, FQNAMES_IN_TYPES); MAP.put(UNUSED_CHANGED_VALUE, "The value changed at ''{0}'' is never used", ELEMENT_TEXT); MAP.put(UNUSED_EXPRESSION, "The expression is unused"); MAP.put(UNUSED_FUNCTION_LITERAL, "The function literal is unused. If you mean block, you can use 'run { ... }'"); @@ -292,7 +292,7 @@ public String render(@NotNull JetExpression expression) { 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}", TEXT); + MAP.put(TOO_MANY_ARGUMENTS, "Too many arguments for {0}", FQNAMES_IN_TYPES); MAP.put(CONSTANT_EXPECTED_TYPE_MISMATCH, "An {0} literal does not conform to the expected type {1}", STRING, RENDER_TYPE); MAP.put(INTEGER_OVERFLOW, "This operation has led to an overflow"); @@ -383,17 +383,18 @@ public String render(@NotNull JetSimpleNameExpression nameExpression) { 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, TEXT); + NAME, FQNAMES_IN_TYPES); - MAP.put(PROPERTY_TYPE_MISMATCH_ON_OVERRIDE, "Type of ''{0}'' doesn't match to the type of overridden var-property {1}", NAME, TEXT); + MAP.put(PROPERTY_TYPE_MISMATCH_ON_OVERRIDE, "Type of ''{0}'' doesn't match to the type of overridden var-property {1}", + NAME, FQNAMES_IN_TYPES); - MAP.put(VAR_OVERRIDDEN_BY_VAL, "Var-property {0} cannot be overridden by val-property {1}", TEXT, TEXT); + MAP.put(VAR_OVERRIDDEN_BY_VAL, "Var-property {0} cannot be overridden by val-property {1}", FQNAMES_IN_TYPES, FQNAMES_IN_TYPES); MAP.put(ABSTRACT_MEMBER_NOT_IMPLEMENTED, "{0} must be declared abstract or implement abstract member {1}", RENDER_CLASS_OR_OBJECT, - TEXT); + FQNAMES_IN_TYPES); MAP.put(MANY_IMPL_MEMBER_NOT_IMPLEMENTED, "{0} must override {1} because it inherits many implementations of it", - RENDER_CLASS_OR_OBJECT, TEXT); + RENDER_CLASS_OR_OBJECT, FQNAMES_IN_TYPES); MAP.put(CONFLICTING_OVERLOADS, "''{0}'' is already defined in {1}", COMPACT_WITH_MODIFIERS, STRING); @@ -465,15 +466,15 @@ public String render(@NotNull Boolean hasValueParameters) { String multipleDefaultsMessage = "More than one overridden descriptor declares a default value for ''{0}''. " + "As the compiler can not make sure these values agree, this is not allowed."; - MAP.put(MULTIPLE_DEFAULTS_INHERITED_FROM_SUPERTYPES, multipleDefaultsMessage, TEXT); - MAP.put(MULTIPLE_DEFAULTS_INHERITED_FROM_SUPERTYPES_WHEN_NO_EXPLICIT_OVERRIDE, multipleDefaultsMessage, TEXT); + MAP.put(MULTIPLE_DEFAULTS_INHERITED_FROM_SUPERTYPES, multipleDefaultsMessage, FQNAMES_IN_TYPES); + MAP.put(MULTIPLE_DEFAULTS_INHERITED_FROM_SUPERTYPES_WHEN_NO_EXPLICIT_OVERRIDE, multipleDefaultsMessage, FQNAMES_IN_TYPES); MAP.put(PARAMETER_NAME_CHANGED_ON_OVERRIDE, "The corresponding parameter in the supertype ''{0}'' is named ''{1}''. " + "This may cause problems when calling this function with named arguments.", NAME, NAME); MAP.put(DIFFERENT_NAMES_FOR_THE_SAME_PARAMETER_IN_SUPERTYPES, "Names of the parameter #{1} conflict in the following members of supertypes: ''{0}''. " + - "This may cause problems when calling this function with named arguments.", commaSeparated(TEXT), TO_STRING); + "This may cause problems when calling this function with named arguments.", commaSeparated(FQNAMES_IN_TYPES), TO_STRING); MAP.put(AMBIGUOUS_ANONYMOUS_TYPE_INFERRED, "Right-hand side has anonymous type. Please specify type explicitly", TO_STRING); 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 8d015d1514294..20719d4c0c75d 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 @@ -120,7 +120,7 @@ public String render(@NotNull JetClassOrObject classOrObject) { @NotNull @Override public String render(@NotNull JetType type) { - return DescriptorRenderer.TEXT.renderType(type); + return DescriptorRenderer.FQNAMES_IN_TYPES.renderType(type); } }; @@ -131,7 +131,7 @@ public String render(@NotNull JetType type) { 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(DescriptorRenderer.FQNAMES_IN_TYPES.render(call.getResultingDescriptor())).append("\n"); } return stringBuilder.toString(); } 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 7714b7ddf7be2..d612be5663c2a 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationResolver.java @@ -302,7 +302,7 @@ public boolean apply(@Nullable DeclarationDescriptor descriptor) { 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 ? DescriptorRenderer.FQNAMES_IN_TYPES.render(declarationDescriptor) : ""); trace.report(REDECLARATION.on(declaration, declarationDescriptor.getName().asString())); } } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ForLoopConventionsChecker.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ForLoopConventionsChecker.java index cc9fadd44077d..976309a030f28 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ForLoopConventionsChecker.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ForLoopConventionsChecker.java @@ -111,7 +111,7 @@ public boolean isVariableIterable(@NotNull VariableDescriptor variableDescriptor if (iteratorResolutionResults.isAmbiguity()) { // StringBuffer stringBuffer = new StringBuffer("Method 'iterator()' is ambiguous for this expression: "); // for (FunctionDescriptor functionDescriptor : iteratorResolutionResults.getResultingCalls()) { -// stringBuffer.append(DescriptorRendererImpl.TEXT.render(functionDescriptor)).append(" "); +// stringBuffer.append(DescriptorRendererImpl.FQNAMES_IN_TYPES.render(functionDescriptor)).append(" "); // } // errorMessage = stringBuffer.toString(); context.trace.report(ITERATOR_AMBIGUITY.on(loopRangeExpression, iteratorResolutionResults.getResultingCalls())); diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractSdkAnnotationsValidityTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractSdkAnnotationsValidityTest.java index 73c381a5be273..0f3f4e2a400e3 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractSdkAnnotationsValidityTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractSdkAnnotationsValidityTest.java @@ -149,7 +149,7 @@ public Void visitPropertyDescriptor(PropertyDescriptor descriptor, Void data) { private Void visitDeclaration(@NotNull DeclarationDescriptor descriptor) { List errors = bindingContext.get(JavaBindingContext.LOAD_FROM_JAVA_SIGNATURE_ERRORS, descriptor); if (errors != null) { - this.errors.put(DescriptorRenderer.TEXT.render(descriptor), errors); + this.errors.put(DescriptorRenderer.FQNAMES_IN_TYPES.render(descriptor), errors); } return null; } diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/ExpectedLoadErrorsUtil.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/ExpectedLoadErrorsUtil.java index fce31e8c0173f..2ea2d5602d1b9 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/ExpectedLoadErrorsUtil.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/ExpectedLoadErrorsUtil.java @@ -47,7 +47,7 @@ public static void checkForLoadErrors( 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 = DescriptorRenderer.FQNAMES_IN_TYPES.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/lang/resolve/lazy/AbstractLazyResolveDescriptorRendererTest.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveDescriptorRendererTest.java index fdeb7644ff12a..3d42b702a1783 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveDescriptorRendererTest.java +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveDescriptorRendererTest.java @@ -154,7 +154,7 @@ public void visitJetElement(@NotNull JetElement element) { if (renderedDescriptors.length() != 0) { renderedDescriptors.append("\n"); } - renderedDescriptors.append(DescriptorRenderer.TEXT.render(descriptor)); + renderedDescriptors.append(DescriptorRenderer.FQNAMES_IN_TYPES.render(descriptor)); } Document document = new DocumentImpl(psiFile.getText()); diff --git a/compiler/tests/org/jetbrains/jet/renderer/DescriptorRendererTest.java b/compiler/tests/org/jetbrains/jet/renderer/DescriptorRendererTest.java index 5d710002ae75e..5a0ce14e202af 100644 --- a/compiler/tests/org/jetbrains/jet/renderer/DescriptorRendererTest.java +++ b/compiler/tests/org/jetbrains/jet/renderer/DescriptorRendererTest.java @@ -120,7 +120,7 @@ public void visitJetElement(@NotNull JetElement element) { if (renderedDescriptors.length() != 0) { renderedDescriptors.append("\n"); } - renderedDescriptors.append(DescriptorRenderer.TEXT.render(descriptor)); + renderedDescriptors.append(DescriptorRenderer.FQNAMES_IN_TYPES.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 e7f590edfd54a..e8b26fdfa8c77 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/ExpectedResolveData.java +++ b/compiler/tests/org/jetbrains/jet/resolve/ExpectedResolveData.java @@ -367,6 +367,6 @@ private static T getAncestorOfType(Class type, PsiElement element) { @NotNull private static String renderNullableDescriptor(@Nullable DeclarationDescriptor d) { - return d == null ? "" : DescriptorRenderer.TEXT.render(d); + return d == null ? "" : DescriptorRenderer.FQNAMES_IN_TYPES.render(d); } } diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaAnnotationDescriptor.kt b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaAnnotationDescriptor.kt index c3b11250b21d6..e7747601a9208 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaAnnotationDescriptor.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaAnnotationDescriptor.kt @@ -176,6 +176,6 @@ class LazyJavaAnnotationDescriptor( override fun toString(): String { - return DescriptorRenderer.TEXT.renderAnnotation(this) + return DescriptorRenderer.FQNAMES_IN_TYPES.renderAnnotation(this) } } \ No newline at end of file diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/annotations/AnnotationDescriptorImpl.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/annotations/AnnotationDescriptorImpl.java index e3428c409e1f6..8cb42219f3fb9 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/annotations/AnnotationDescriptorImpl.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/annotations/AnnotationDescriptorImpl.java @@ -71,6 +71,6 @@ public boolean areValueArgumentsResolved() { @Override public String toString() { - return DescriptorRenderer.TEXT.renderAnnotation(this); + return DescriptorRenderer.FQNAMES_IN_TYPES.renderAnnotation(this); } } diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/TypeParameterDescriptorImpl.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/TypeParameterDescriptorImpl.java index 8ee7c5d6ae18d..a9a0693c01845 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/TypeParameterDescriptorImpl.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/TypeParameterDescriptorImpl.java @@ -194,7 +194,7 @@ public TypeConstructor getTypeConstructor() { @Override public String toString() { try { - return DescriptorRenderer.TEXT.render(this); + return DescriptorRenderer.FQNAMES_IN_TYPES.render(this); } catch (Exception e) { return this.getClass().getName() + "@" + System.identityHashCode(this); } diff --git a/core/descriptors/src/org/jetbrains/jet/renderer/DescriptorRenderer.java b/core/descriptors/src/org/jetbrains/jet/renderer/DescriptorRenderer.java index 35fa2460942fd..efc2e3978cac9 100644 --- a/core/descriptors/src/org/jetbrains/jet/renderer/DescriptorRenderer.java +++ b/core/descriptors/src/org/jetbrains/jet/renderer/DescriptorRenderer.java @@ -54,7 +54,7 @@ public interface DescriptorRenderer extends Renderer { .setModifiers() .setStartFromName(true).build(); - DescriptorRenderer TEXT = new DescriptorRendererBuilder().build(); + DescriptorRenderer FQNAMES_IN_TYPES = new DescriptorRendererBuilder().build(); DescriptorRenderer SHORT_NAMES_IN_TYPES = new DescriptorRendererBuilder().setShortNames(true).build(); diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/JetFunctionPsiElementCellRenderer.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/JetFunctionPsiElementCellRenderer.java index 475d073b52d73..45f512a4170ae 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/JetFunctionPsiElementCellRenderer.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/JetFunctionPsiElementCellRenderer.java @@ -37,7 +37,7 @@ public String getElementText(PsiElement element) { SimpleFunctionDescriptor fd = bindingContext.get(BindingContext.FUNCTION, function); assert fd != null; - return DescriptorRenderer.TEXT.render(fd); + return DescriptorRenderer.FQNAMES_IN_TYPES.render(fd); } return super.getElementText(element); } diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/ShortenReferences.kt b/idea/src/org/jetbrains/jet/plugin/codeInsight/ShortenReferences.kt index 2ab08d8ad2473..68e88bc6c08ec 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/ShortenReferences.kt +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/ShortenReferences.kt @@ -240,7 +240,7 @@ public object ShortenReferences { } } - private fun DeclarationDescriptor.asString() = DescriptorRenderer.TEXT.render(this) + private fun DeclarationDescriptor.asString() = DescriptorRenderer.FQNAMES_IN_TYPES.render(this) //TODO: do we need this "IfNeeded" check? private fun addImportIfNeeded(descriptor: DeclarationDescriptor, file: JetFile) { diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/MoveDeclarationsOutHelper.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/MoveDeclarationsOutHelper.java index 3631a352300fb..3f093853cda46 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/MoveDeclarationsOutHelper.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/MoveDeclarationsOutHelper.java @@ -131,7 +131,7 @@ private static JetProperty createProperty(@NotNull JetProperty property, @NotNul typeString = typeRef.getText(); } else if (!propertyType.isError()) { - typeString = DescriptorRenderer.TEXT.renderType(propertyType); + typeString = DescriptorRenderer.FQNAMES_IN_TYPES.renderType(propertyType); } return JetPsiFactory.createProperty(property.getProject(), property.getName(), typeString, property.isVar(), initializer); diff --git a/idea/src/org/jetbrains/jet/plugin/completion/DescriptorLookupConverter.java b/idea/src/org/jetbrains/jet/plugin/completion/DescriptorLookupConverter.java index fb8b4a0947ba4..e4fbb98d012ef 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/DescriptorLookupConverter.java +++ b/idea/src/org/jetbrains/jet/plugin/completion/DescriptorLookupConverter.java @@ -139,7 +139,7 @@ private static LookupElement createJavaLookupElementIfPossible(@NotNull PsiEleme InsertHandler handler = getInsertHandler(descriptor); assert handler != null: "Special kotlin handler is expected for function: " + declaration.getText() + - " and descriptor: " + DescriptorRenderer.TEXT.render(descriptor); + " and descriptor: " + DescriptorRenderer.FQNAMES_IN_TYPES.render(descriptor); return new JavaMethodCallElementWithCustomHandler(declaration).setInsertHandler(handler); } diff --git a/idea/src/org/jetbrains/jet/plugin/completion/smart/StaticMembers.kt b/idea/src/org/jetbrains/jet/plugin/completion/smart/StaticMembers.kt index 30c90ec5f0b8a..7384092d3f83a 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/smart/StaticMembers.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/smart/StaticMembers.kt @@ -104,7 +104,7 @@ class StaticMembers(val bindingContext: BindingContext, val resolveSession: Reso } if (presentation.getTypeText().isNullOrEmpty()) { - presentation.setTypeText(DescriptorRenderer.TEXT.renderType(classDescriptor.getDefaultType())) + presentation.setTypeText(DescriptorRenderer.FQNAMES_IN_TYPES.renderType(classDescriptor.getDefaultType())) } } diff --git a/idea/src/org/jetbrains/jet/plugin/completion/smart/ThisItems.kt b/idea/src/org/jetbrains/jet/plugin/completion/smart/ThisItems.kt index 4041c2b35b921..be7e63e2bd21f 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/smart/ThisItems.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/smart/ThisItems.kt @@ -33,7 +33,7 @@ class ThisItems(val bindingContext: BindingContext) { //val expressionText = if (i == 0) "this" else "this@" + (thisQualifierName(receiver, bindingContext) ?: continue) val qualifier = if (i == 0) null else thisQualifierName(receiver) ?: continue val expressionText = if (qualifier == null) "this" else "this@" + qualifier - val lookupElement = LookupElementBuilder.create(expressionText).withTypeText(DescriptorRenderer.TEXT.renderType(thisType)) + val lookupElement = LookupElementBuilder.create(expressionText).withTypeText(DescriptorRenderer.FQNAMES_IN_TYPES.renderType(thisType)) collection.add(addTailToLookupElement(lookupElement, matchedExpectedInfos)) } } diff --git a/idea/src/org/jetbrains/jet/plugin/completion/smart/TypeInstantiationItems.kt b/idea/src/org/jetbrains/jet/plugin/completion/smart/TypeInstantiationItems.kt index 756edcb9845d5..eced4337776a7 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/smart/TypeInstantiationItems.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/smart/TypeInstantiationItems.kt @@ -42,7 +42,7 @@ class TypeInstantiationItems(val bindingContext: BindingContext, val resolveSess var lookupString = lookupElement.getLookupString() val typeArgs = jetType.getArguments() - var itemText = lookupString + DescriptorRenderer.TEXT.renderTypeArguments(typeArgs) + var itemText = lookupString + DescriptorRenderer.FQNAMES_IN_TYPES.renderTypeArguments(typeArgs) val insertHandler: InsertHandler val typeText = DescriptorUtils.getFqName(classifier).toString() + DescriptorRenderer.SOURCE_CODE.renderTypeArguments(typeArgs) diff --git a/idea/src/org/jetbrains/jet/plugin/hierarchy/KotlinTypeHierarchyProvider.java b/idea/src/org/jetbrains/jet/plugin/hierarchy/KotlinTypeHierarchyProvider.java index ac31bffa34f26..5c15f96c2bfbb 100644 --- a/idea/src/org/jetbrains/jet/plugin/hierarchy/KotlinTypeHierarchyProvider.java +++ b/idea/src/org/jetbrains/jet/plugin/hierarchy/KotlinTypeHierarchyProvider.java @@ -75,7 +75,7 @@ else if (target instanceof JetNamedFunction) { if (functionDescriptor != null) { JetType type = functionDescriptor.getReturnType(); if (type != null) { - String returnTypeText = DescriptorRenderer.TEXT.renderType(type); + String returnTypeText = DescriptorRenderer.FQNAMES_IN_TYPES.renderType(type); if (returnTypeText.equals(functionName)) { Collection classOrObjects = JetClassShortNameIndex.getInstance().get(functionName, project, GlobalSearchScope.allScope(project)); diff --git a/idea/src/org/jetbrains/jet/plugin/highlighter/DeprecatedAnnotationVisitor.java b/idea/src/org/jetbrains/jet/plugin/highlighter/DeprecatedAnnotationVisitor.java index cfd5c73947368..a11fc5274c953 100644 --- a/idea/src/org/jetbrains/jet/plugin/highlighter/DeprecatedAnnotationVisitor.java +++ b/idea/src/org/jetbrains/jet/plugin/highlighter/DeprecatedAnnotationVisitor.java @@ -262,8 +262,8 @@ else if (descriptor instanceof PropertyDescriptor) { return "val " + descriptor.getName(); } else if (descriptor instanceof FunctionDescriptor) { - return "fun " + descriptor.getName() + DescriptorRenderer.TEXT.renderFunctionParameters((FunctionDescriptor) descriptor); + return "fun " + descriptor.getName() + DescriptorRenderer.FQNAMES_IN_TYPES.renderFunctionParameters((FunctionDescriptor) descriptor); } - return DescriptorRenderer.TEXT.render(descriptor); + return DescriptorRenderer.FQNAMES_IN_TYPES.render(descriptor); } } diff --git a/idea/src/org/jetbrains/jet/plugin/highlighter/JetLineMarkerProvider.java b/idea/src/org/jetbrains/jet/plugin/highlighter/JetLineMarkerProvider.java index cc4604378cffc..a11b311fdc4e3 100644 --- a/idea/src/org/jetbrains/jet/plugin/highlighter/JetLineMarkerProvider.java +++ b/idea/src/org/jetbrains/jet/plugin/highlighter/JetLineMarkerProvider.java @@ -316,7 +316,7 @@ private static void iconNavigatorHandler(MouseEvent event, PsiElement elt) { else { JBPopup popup = NavigationUtil.getPsiElementPopup(PsiUtilCore.toPsiElementArray(list), new JetFunctionPsiElementCellRenderer(bindingContext), - DescriptorRenderer.TEXT.render(descriptor)); + DescriptorRenderer.FQNAMES_IN_TYPES.render(descriptor)); if (event != null) { popup.show(new RelativePoint(event)); } diff --git a/idea/src/org/jetbrains/jet/plugin/highlighter/VariablesHighlightingVisitor.java b/idea/src/org/jetbrains/jet/plugin/highlighter/VariablesHighlightingVisitor.java index e0fbdf83568da..2af09c03000d8 100644 --- a/idea/src/org/jetbrains/jet/plugin/highlighter/VariablesHighlightingVisitor.java +++ b/idea/src/org/jetbrains/jet/plugin/highlighter/VariablesHighlightingVisitor.java @@ -68,7 +68,7 @@ public void visitParameter(@NotNull JetParameter parameter) { 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 " + DescriptorRenderer.FQNAMES_IN_TYPES.renderType(autoCast)).setTextAttributes( JetHighlightingColors.AUTO_CASTED_VALUE); } super.visitExpression(expression); diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/InsertExplicitTypeArguments.kt b/idea/src/org/jetbrains/jet/plugin/intentions/InsertExplicitTypeArguments.kt index fcaccc0c298f4..a44148864219a 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/InsertExplicitTypeArguments.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/InsertExplicitTypeArguments.kt @@ -51,7 +51,7 @@ public class InsertExplicitTypeArguments : JetSelfTargetingIntention() { @Override public String fun(JetType type) { - return DescriptorRenderer.TEXT.renderType(type); + return DescriptorRenderer.FQNAMES_IN_TYPES.renderType(type); } })); Set decompiledUpperBounds = decompiledParameterToBounds.get(descriptor.getName()).isEmpty() - ? Sets.newHashSet(DescriptorRenderer.TEXT.renderType(KotlinBuiltIns.getInstance().getDefaultBound())) + ? Sets.newHashSet(DescriptorRenderer.FQNAMES_IN_TYPES.renderType(KotlinBuiltIns.getInstance().getDefaultBound())) : Sets.newHashSet(decompiledParameterToBounds.get(descriptor.getName())); if (!descriptorUpperBounds.equals(decompiledUpperBounds)) { return false; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/MapPlatformClassToKotlinFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/MapPlatformClassToKotlinFix.java index f598381bd8c01..d0b1ccdfeb18b 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/MapPlatformClassToKotlinFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/MapPlatformClassToKotlinFix.java @@ -62,10 +62,10 @@ public MapPlatformClassToKotlinFix(@NotNull JetReferenceExpression element, @Not @NotNull @Override public String getText() { - String platformClassQualifiedName = DescriptorRenderer.TEXT.renderType(platformClass.getDefaultType()); + String platformClassQualifiedName = DescriptorRenderer.FQNAMES_IN_TYPES.renderType(platformClass.getDefaultType()); return possibleClasses.size() == 1 ? JetBundle.message("map.platform.class.to.kotlin", platformClassQualifiedName, - DescriptorRenderer.TEXT.renderType(possibleClasses.iterator().next().getDefaultType())) + DescriptorRenderer.FQNAMES_IN_TYPES.renderType(possibleClasses.iterator().next().getDefaultType())) : JetBundle.message("map.platform.class.to.kotlin.multiple", platformClassQualifiedName); } diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/ExtractionData.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/ExtractionData.kt index 4a6953e18edd0..5931e4baff03a 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/ExtractionData.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/ExtractionData.kt @@ -107,7 +107,7 @@ class ExtractionData( fun getBrokenReferencesInfo(body: JetBlockExpression): List { fun compareDescriptors(d1: DeclarationDescriptor?, d2: DeclarationDescriptor?): Boolean { - return d1 == d2 || (d1 != null && d2 != null && DescriptorRenderer.TEXT.render(d1) == DescriptorRenderer.TEXT.render(d2)) + return d1 == d2 || (d1 != null && d2 != null && DescriptorRenderer.FQNAMES_IN_TYPES.render(d1) == DescriptorRenderer.FQNAMES_IN_TYPES.render(d2)) } val startOffset = body.getStatements().first!!.getTextRange()!!.getStartOffset() diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/extractFunctionUtils.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/extractFunctionUtils.kt index 1db7e5d6f1431..9d23b0385ca87 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/extractFunctionUtils.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/extractFunctionUtils.kt @@ -463,7 +463,7 @@ fun ExtractionDescriptor.validate(): ExtractionDescriptorWithConflicts { fun ExtractionDescriptor.getFunctionText( withBody: Boolean = true, - descriptorRenderer: DescriptorRenderer = DescriptorRenderer.TEXT + descriptorRenderer: DescriptorRenderer = DescriptorRenderer.FQNAMES_IN_TYPES ): String { return FunctionBuilder().let { builder -> builder.modifier(visibility) diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/inline/KotlinInlineValHandler.java b/idea/src/org/jetbrains/jet/plugin/refactoring/inline/KotlinInlineValHandler.java index ac6cd89ac12ae..22b271dc9b7d8 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/inline/KotlinInlineValHandler.java +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/inline/KotlinInlineValHandler.java @@ -236,7 +236,7 @@ private static String getParametersForFunctionLiteral(JetExpression initializer) return StringUtil.join(fun.getValueParameters(), new Function() { @Override public String fun(ValueParameterDescriptor descriptor) { - return descriptor.getName() + ": " + DescriptorRenderer.TEXT.renderType(descriptor.getType()); + return descriptor.getName() + ": " + DescriptorRenderer.FQNAMES_IN_TYPES.renderType(descriptor.getType()); } }, ", "); } @@ -357,7 +357,7 @@ private static String getTypeArgumentsStringForCall(@NotNull JetExpression initi return StringUtil.join(typeArguments, new Function() { @Override public String fun(JetType type) { - return DescriptorRenderer.TEXT.renderType(type); + return DescriptorRenderer.FQNAMES_IN_TYPES.renderType(type); } }, ", "); } diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.java b/idea/src/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.java index 917de29652fbb..048b5a744a331 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.java +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.java @@ -249,7 +249,7 @@ private static Runnable introduceVariable(final @NotNull Project project, final public void run() { String variableText = "val " + suggestedNames[0]; if (noTypeInference) { - variableText += ": " + DescriptorRenderer.TEXT.renderType(expressionType); + variableText += ": " + DescriptorRenderer.FQNAMES_IN_TYPES.renderType(expressionType); } variableText += " = "; if (expression instanceof JetParenthesizedExpression) { diff --git a/idea/src/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolver.java b/idea/src/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolver.java index 2dec186da245d..73fcebc6e0b29 100644 --- a/idea/src/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolver.java +++ b/idea/src/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolver.java @@ -187,7 +187,7 @@ private DeclarationDescriptor findCurrentDescriptorForMember(@NotNull MemberDesc JetScope memberScope = getMemberScope(containingDeclaration); if (memberScope == null) return null; - String renderedOriginal = DescriptorRenderer.TEXT.render(originalDescriptor); + String renderedOriginal = DescriptorRenderer.FQNAMES_IN_TYPES.render(originalDescriptor); Collection descriptors; if (originalDescriptor instanceof ConstructorDescriptor && containingDeclaration instanceof ClassDescriptor) { descriptors = ((ClassDescriptor) containingDeclaration).getConstructors(); @@ -196,7 +196,7 @@ private DeclarationDescriptor findCurrentDescriptorForMember(@NotNull MemberDesc descriptors = memberScope.getAllDescriptors(); } for (DeclarationDescriptor member : descriptors) { - if (renderedOriginal.equals(DescriptorRenderer.TEXT.render(member))) { + if (renderedOriginal.equals(DescriptorRenderer.FQNAMES_IN_TYPES.render(member))) { 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 aa1f0f57d5c18..79194ee67af1a 100644 --- a/idea/src/org/jetbrains/jet/plugin/structureView/JetStructureViewElement.java +++ b/idea/src/org/jetbrains/jet/plugin/structureView/JetStructureViewElement.java @@ -191,7 +191,7 @@ public static String getDescriptorTreeText(@NotNull DeclarationDescriptor descri FunctionDescriptor functionDescriptor = (FunctionDescriptor) descriptor; ReceiverParameterDescriptor receiver = functionDescriptor.getReceiverParameter(); if (receiver != null) { - textBuilder.append(DescriptorRenderer.TEXT.renderType(receiver.getType())).append("."); + textBuilder.append(DescriptorRenderer.FQNAMES_IN_TYPES.renderType(receiver.getType())).append("."); } textBuilder.append(functionDescriptor.getName()); @@ -202,7 +202,7 @@ public static String getDescriptorTreeText(@NotNull DeclarationDescriptor descri @Override public String fun(ValueParameterDescriptor valueParameterDescriptor) { return valueParameterDescriptor.getName() + ":" + - DescriptorRenderer.TEXT.renderType(valueParameterDescriptor.getType()); + DescriptorRenderer.FQNAMES_IN_TYPES.renderType(valueParameterDescriptor.getType()); } }, ","); @@ -211,13 +211,13 @@ public String fun(ValueParameterDescriptor valueParameterDescriptor) { JetType returnType = functionDescriptor.getReturnType(); assert returnType != null; - textBuilder.append(":").append(DescriptorRenderer.TEXT.renderType(returnType)); + textBuilder.append(":").append(DescriptorRenderer.FQNAMES_IN_TYPES.renderType(returnType)); } else if (descriptor instanceof VariableDescriptor) { JetType outType = ((VariableDescriptor) descriptor).getType(); textBuilder = new StringBuilder(descriptor.getName().asString()); - textBuilder.append(":").append(DescriptorRenderer.TEXT.renderType(outType)); + textBuilder.append(":").append(DescriptorRenderer.FQNAMES_IN_TYPES.renderType(outType)); } else if (descriptor instanceof ClassDescriptor) { textBuilder = new StringBuilder(descriptor.getName().asString()); @@ -227,7 +227,7 @@ else if (descriptor instanceof ClassDescriptor) { .append(")"); } else { - return DescriptorRenderer.TEXT.render(descriptor); + return DescriptorRenderer.FQNAMES_IN_TYPES.render(descriptor); } return textBuilder.toString();