From cbf9208c1dd6686e2c5994ab307327599f8dd727 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Thu, 26 Feb 2015 20:19:47 +0300 Subject: [PATCH] Minor: change rendering of class objects in source code renderers Fixes one particular case in completion --- .../src/org/jetbrains/kotlin/renderer/RenderingUtils.kt | 2 +- .../completion/handlers/smart/ClassInClassObject.kt.after | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/descriptors/src/org/jetbrains/kotlin/renderer/RenderingUtils.kt b/core/descriptors/src/org/jetbrains/kotlin/renderer/RenderingUtils.kt index fa7effd4f6a..41e61b3eeef 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/renderer/RenderingUtils.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/renderer/RenderingUtils.kt @@ -25,7 +25,7 @@ public fun qualifiedNameForSourceCode(descriptor: ClassifierDescriptor): String } private fun qualifierName(descriptor: DeclarationDescriptor): String? = when (descriptor) { - is ClassDescriptor -> if (descriptor.getKind() != ClassKind.CLASS_OBJECT) qualifiedNameForSourceCode(descriptor) else qualifierName(descriptor.getContainingDeclaration()) + is ClassDescriptor -> qualifiedNameForSourceCode(descriptor) is PackageFragmentDescriptor -> DescriptorRenderer.COMPACT.renderFqName(descriptor.fqName) else -> null } diff --git a/idea/testData/completion/handlers/smart/ClassInClassObject.kt.after b/idea/testData/completion/handlers/smart/ClassInClassObject.kt.after index 0917f0a5aa6..2d47e82105c 100644 --- a/idea/testData/completion/handlers/smart/ClassInClassObject.kt.after +++ b/idea/testData/completion/handlers/smart/ClassInClassObject.kt.after @@ -4,6 +4,6 @@ class A { } } -val v: A.Default.Inner = A.Inner() +val v: A.Default.Inner = A.Default.Inner() // ELEMENT: Inner