From 1c112e6982d30f81e10eb07772d023d752e27e97 Mon Sep 17 00:00:00 2001 From: ArtiSmarti Date: Sat, 22 Oct 2016 19:57:24 +0200 Subject: [PATCH] Remove comments from method signatures and trim signatures to fit in one line - Closes#15 --- .../kotlin/io/gitlab/arturbosch/detekt/api/Signatures.kt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/detekt-api/src/main/kotlin/io/gitlab/arturbosch/detekt/api/Signatures.kt b/detekt-api/src/main/kotlin/io/gitlab/arturbosch/detekt/api/Signatures.kt index 02da5abce..2ec0c4bc9 100644 --- a/detekt-api/src/main/kotlin/io/gitlab/arturbosch/detekt/api/Signatures.kt +++ b/detekt-api/src/main/kotlin/io/gitlab/arturbosch/detekt/api/Signatures.kt @@ -42,12 +42,12 @@ internal fun PsiElement.buildFullSignature(): String { private fun PsiElement.extractClassName() = this.getNonStrictParentOfType(KtClassOrObject::class.java)?.nameAsSafeName?.asString() ?: "" -internal fun PsiElement.searchSignature(): String { +private fun PsiElement.searchSignature(): String { return when (this) { is KtNamedFunction -> buildFunctionSignature(this) is KtClassOrObject -> buildClassSignature(this) else -> this.text - } + }.replace('\n', ' ').replace(Regex("\\s(\\s|\t)+")," ") } private fun dotOrNot(sig: String, sig2: String) = if (sig.isNotEmpty() && sig2.isNotEmpty()) "." else "" @@ -67,7 +67,10 @@ private fun buildClassSignature(classOrObject: KtClassOrObject): String { } private fun buildFunctionSignature(element: KtNamedFunction): String { - val methodStart = 0 + var methodStart = 0 + element.docComment?.let { + methodStart = it.endOffset - it.startOffset + } var methodEnd = element.endOffset - element.startOffset val typeReference = element.typeReference if (typeReference != null) {