From 4370b50841922d2f6e7a9899b08f8ef5434161f5 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Thu, 26 Feb 2015 20:21:45 +0300 Subject: [PATCH] Minor: change rendering of class objects' types in completion --- .../jetbrains/kotlin/idea/completion/LookupElementFactory.kt | 5 +---- .../basic/common/ExtensionFunctionInClassObject.kt | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/completion/LookupElementFactory.kt b/idea/src/org/jetbrains/kotlin/idea/completion/LookupElementFactory.kt index 068a6d88965..8f7a0acacd7 100644 --- a/idea/src/org/jetbrains/kotlin/idea/completion/LookupElementFactory.kt +++ b/idea/src/org/jetbrains/kotlin/idea/completion/LookupElementFactory.kt @@ -187,10 +187,7 @@ public class LookupElementFactory( if (descriptor.getExtensionReceiverParameter() != null) { val container = descriptor.getContainingDeclaration() val containerPresentation = if (container is ClassDescriptor) { - if (container.getKind() != ClassKind.CLASS_OBJECT) - DescriptorUtils.getFqNameFromTopLevelClass(container).toString() - else - "class object for " + DescriptorUtils.getFqNameFromTopLevelClass(container.getContainingDeclaration()) + DescriptorUtils.getFqNameFromTopLevelClass(container).toString() } else { DescriptorUtils.getFqName(container).toString() diff --git a/idea/testData/completion/basic/common/ExtensionFunctionInClassObject.kt b/idea/testData/completion/basic/common/ExtensionFunctionInClassObject.kt index dc15097c42d..e9ea62f7eb6 100644 --- a/idea/testData/completion/basic/common/ExtensionFunctionInClassObject.kt +++ b/idea/testData/completion/basic/common/ExtensionFunctionInClassObject.kt @@ -10,4 +10,4 @@ class R { } } -// EXIST: { itemText: "f", tailText: "() for B in class object for R" } +// EXIST: { itemText: "f", tailText: "() for B in R.Default" }