Removed UnnecessaryAbstractClass if it inherits from an interface or …

…abstract class that has concrete members Removed deprecated annotations Revert "Removed deprecated annotations" This reverts commit 326a356 fix return count rule violation
detekt · Jun 29, 2022 · 8445bee · 8445bee
1 parent 2f75d2c
commit 8445bee
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/...style/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/style/UnnecessaryAbstractClass.kt b/...style/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/style/UnnecessaryAbstractClass.kt
@@ -79,7 +79,7 @@ class UnnecessaryAbstractClass(config: Config = Config.empty) : Rule(config) {
         super.visitClass(klass)
     }
 
-    @Suppress("ComplexMethod")
+    @Suppress("ComplexMethod", "ReturnCount")
     private fun KtClass.check() {
         val nameIdentifier = this.nameIdentifier ?: return
         if (annotationExcluder.shouldExclude(annotationEntries) || isInterface() || !isAbstract()) return
@@ -98,6 +98,7 @@ class UnnecessaryAbstractClass(config: Config = Config.empty) : Rule(config) {
                     report(CodeSmell(issue, Entity.from(nameIdentifier), noConcreteMember))
                 }
             }
+            hasInheritedMember(true) -> return
             !hasConstructorParameter() ->
                 report(CodeSmell(issue, Entity.from(nameIdentifier), noConcreteMember))
             else ->

diff --git a/...e/src/test/kotlin/io/gitlab/arturbosch/detekt/rules/style/UnnecessaryAbstractClassSpec.kt b/...e/src/test/kotlin/io/gitlab/arturbosch/detekt/rules/style/UnnecessaryAbstractClassSpec.kt
@@ -73,8 +73,7 @@ class UnnecessaryAbstractClassSpec(val env: KotlinCoreEnvironment) {
                     }
                     abstract class B : A
                 """
-                val findings = subject.compileAndLintWithContext(env, code)
-                assertFindingMessage(findings, message)
+                assertThat(subject.compileAndLintWithContext(env, code)).isEmpty()
             }
 
             @Test
@@ -86,6 +85,16 @@ class UnnecessaryAbstractClassSpec(val env: KotlinCoreEnvironment) {
                     }
                     abstract class B : A()
                 """
+                assertThat(subject.compileAndLintWithContext(env, code)).isEmpty()
+            }
+
+            @Test
+            fun `that inherits from another empty abstract class`() {
+                val code = """
+                    @Deprecated("We don't care about this first class")
+                    abstract class A 
+                    abstract class B : A()
+                """
                 val findings = subject.compileAndLintWithContext(env, code)
                 assertFindingMessage(findings, message)
             }