From 89d41a1bc909c7e350b07bc29d39762449d64650 Mon Sep 17 00:00:00 2001 From: Simon Ogorodnik Date: Wed, 16 Nov 2016 17:53:47 +0300 Subject: Fix most of failing tests, by not unwrapping types, if it not abbreviated (Otherwise we will lose in/out variance) --- core/src/main/kotlin/Kotlin/DocumentationBuilder.kt | 7 +++---- core/src/test/kotlin/format/MarkdownFormatTest.kt | 2 -- 2 files changed, 3 insertions(+), 6 deletions(-) (limited to 'core') diff --git a/core/src/main/kotlin/Kotlin/DocumentationBuilder.kt b/core/src/main/kotlin/Kotlin/DocumentationBuilder.kt index 5f2d08f9..f922a25b 100644 --- a/core/src/main/kotlin/Kotlin/DocumentationBuilder.kt +++ b/core/src/main/kotlin/Kotlin/DocumentationBuilder.kt @@ -152,10 +152,9 @@ class DocumentationBuilder fun DocumentationNode.appendType(kotlinType: KotlinType?, kind: NodeKind = NodeKind.Type, prefix: String = "") { if (kotlinType == null) return - if (kotlinType is WrappedType) - return appendType(kotlinType.unwrap()) - if (kotlinType is AbbreviatedType) - return appendType(kotlinType.abbreviation) + (kotlinType.unwrap() as? AbbreviatedType)?.let { + return appendType(it.abbreviation) + } val classifierDescriptor = kotlinType.constructor.declarationDescriptor val name = when (classifierDescriptor) { diff --git a/core/src/test/kotlin/format/MarkdownFormatTest.kt b/core/src/test/kotlin/format/MarkdownFormatTest.kt index 280e8e22..c9f86503 100644 --- a/core/src/test/kotlin/format/MarkdownFormatTest.kt +++ b/core/src/test/kotlin/format/MarkdownFormatTest.kt @@ -27,8 +27,6 @@ class MarkdownFormatTest { verifyMarkdownPackage("annotationClass", withKotlinRuntime = true) } - //TODO: Enable after typealias support - // @Ignore("Disabled until we will correctly support typealias") @Test fun exceptionClass() { verifyMarkdownNode("exceptionClass", withKotlinRuntime = true) verifyMarkdownPackage("exceptionClass", withKotlinRuntime = true) -- cgit