From 03d567b763839323ab13d2f385395b221da06023 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Thu, 28 Apr 2016 17:55:46 +0200 Subject: SOE protection when calculating type signature. Resolves #69 --- .../src/main/kotlin/Kotlin/DocumentationBuilder.kt | 21 ++++++++++++++----- core/src/test/kotlin/format/HtmlFormatTest.kt | 4 ++++ core/testdata/format/linkWithStarProjection.html | 24 ++++++++++++++++++++++ core/testdata/format/linkWithStarProjection.kt | 3 +++ 4 files changed, 47 insertions(+), 5 deletions(-) create mode 100644 core/testdata/format/linkWithStarProjection.html create mode 100644 core/testdata/format/linkWithStarProjection.kt diff --git a/core/src/main/kotlin/Kotlin/DocumentationBuilder.kt b/core/src/main/kotlin/Kotlin/DocumentationBuilder.kt index 8cead63e..fc181252 100644 --- a/core/src/main/kotlin/Kotlin/DocumentationBuilder.kt +++ b/core/src/main/kotlin/Kotlin/DocumentationBuilder.kt @@ -764,12 +764,23 @@ fun CallableMemberDescriptor.parameterSignature(): String { } fun KotlinType.signature(): String { - val declarationDescriptor = constructor.declarationDescriptor ?: return "" - val typeName = DescriptorUtils.getFqName(declarationDescriptor).asString() - if (arguments.isEmpty()) { - return typeName + val visited = hashSetOf() + + fun KotlinType.signatureRecursive(): String { + if (this in visited) { + return "" + } + visited.add(this) + + val declarationDescriptor = constructor.declarationDescriptor ?: return "" + val typeName = DescriptorUtils.getFqName(declarationDescriptor).asString() + if (arguments.isEmpty()) { + return typeName + } + return typeName + arguments.joinToString(prefix = "((", postfix = "))") { it.type.signatureRecursive() } } - return typeName + arguments.joinToString(prefix = "((", postfix = "))") { it.type.signature() } + + return signatureRecursive() } fun DeclarationDescriptor.signatureWithSourceLocation(): String { diff --git a/core/src/test/kotlin/format/HtmlFormatTest.kt b/core/src/test/kotlin/format/HtmlFormatTest.kt index 0b4f9958..9936b8e2 100644 --- a/core/src/test/kotlin/format/HtmlFormatTest.kt +++ b/core/src/test/kotlin/format/HtmlFormatTest.kt @@ -168,6 +168,10 @@ class HtmlFormatTest { verifyHtmlNode("returnWithLink") } + @Test fun linkWithStarProjection() { + verifyHtmlNode("linkWithStarProjection", withKotlinRuntime = true) + } + private fun verifyHtmlNode(fileName: String, withKotlinRuntime: Boolean = false) { verifyOutput("testdata/format/$fileName.kt", ".html", withKotlinRuntime = withKotlinRuntime) { model, output -> htmlService.appendNodes(tempLocation, output, model.members.single().members) diff --git a/core/testdata/format/linkWithStarProjection.html b/core/testdata/format/linkWithStarProjection.html new file mode 100644 index 00000000..0e829e80 --- /dev/null +++ b/core/testdata/format/linkWithStarProjection.html @@ -0,0 +1,24 @@ + + +KClassLoader - test + + +test / KClassLoader
+
+

KClassLoader

+object KClassLoader
+
+
+

Functions

+ + + + + + + +
+foo +fun foo(c: Enum<*>): Unit
+ + diff --git a/core/testdata/format/linkWithStarProjection.kt b/core/testdata/format/linkWithStarProjection.kt new file mode 100644 index 00000000..6da6c595 --- /dev/null +++ b/core/testdata/format/linkWithStarProjection.kt @@ -0,0 +1,3 @@ +object KClassLoader { + fun foo(c: Enum<*>) { } +} -- cgit