From e83711d41ae1f9854c14bcc70c476dc26631f042 Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Tue, 18 Aug 2015 15:47:22 +0300 Subject: [PATCH] More correct rendering of synthetic extension descriptors --- .../jetbrains/kotlin/renderer/DescriptorRendererImpl.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt b/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt index 19e70adb796..46a93f939a6 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt @@ -327,12 +327,12 @@ internal class DescriptorRendererImpl( builder.append(" is a module") return } - builder.append(" ").append(renderMessage("defined in")).append(" ") - val containingDeclaration = descriptor.getContainingDeclaration() - if (containingDeclaration != null) { + val containingDeclaration = descriptor.containingDeclaration + if (containingDeclaration != null && containingDeclaration !is ModuleDescriptor) { + builder.append(" ").append(renderMessage("defined in")).append(" ") val fqName = DescriptorUtils.getFqName(containingDeclaration) - builder.append(if (FqName.ROOT.equalsTo(fqName)) "root package" else renderFqName(fqName)) + builder.append(if (fqName.isRoot) "root package" else renderFqName(fqName)) } } private fun renderAnnotations(annotated: Annotated, builder: StringBuilder, needBrackets: Boolean = false) {