From 6ff8851e15949a0bcb32fd6025acd696733309ad Mon Sep 17 00:00:00 2001 From: soWhoAmI Date: Tue, 6 Oct 2020 22:00:47 +0300 Subject: [PATCH] bugfix/suppress-bug(#372) ### What's done: * Fixed bug --- .../main/kotlin/org/cqfn/diktat/ruleset/utils/AstNodeUtils.kt | 3 ++- .../test/kotlin/org/cqfn/diktat/ruleset/utils/SuppressTest.kt | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/utils/AstNodeUtils.kt b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/utils/AstNodeUtils.kt index 5e5feda29b..8589ac931b 100644 --- a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/utils/AstNodeUtils.kt +++ b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/utils/AstNodeUtils.kt @@ -339,7 +339,8 @@ fun ASTNode.hasSuppress(warningName: String): Boolean { ?.any { it.shortName.toString() == Suppress::class.simpleName && it.valueArgumentList?.arguments - ?.firstOrNull()?.text?.trim('"', ' ').equals(warningName) ?: false + ?.any { annotationName -> annotationName.text.trim('"', ' ') == warningName } + ?: false } ?: false }, strict = false) != null } diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/utils/SuppressTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/utils/SuppressTest.kt index 726c205129..981a1977c0 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/utils/SuppressTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/utils/SuppressTest.kt @@ -15,11 +15,13 @@ class SuppressTest : LintTestBase(::IdentifierNaming) { fun `test suppress on class`() { val code = """ - @Suppress("FUNCTION_NAME_INCORRECT_CASE") + @Suppress("FUNCTION_NAME_INCORRECT_CASE", "BACKTICKS_PROHIBITED") class SomeClass { fun /* */ methODTREE(): String { } + + fun `some`() {} } """.trimIndent() lintMethod(code)