Run all rules from EmptyBlocks multi rule individually (#5208)

Co-authored-by: Markus Schwarz <post@markus-schwarz.net>
detekt · Aug 16, 2022 · 30ffdc1 · 30ffdc1
1 parent 1a6a82d
commit 30ffdc1
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 234 deletions.
diff --git a/detekt-rules-empty/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/empty/EmptyBlocks.kt b/detekt-rules-empty/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/empty/EmptyBlocks.kt
diff --git a/...-rules-empty/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/empty/EmptyCodeProvider.kt b/...-rules-empty/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/empty/EmptyCodeProvider.kt
@@ -17,7 +17,21 @@ class EmptyCodeProvider : DefaultRuleSetProvider {
     override fun instance(config: Config): RuleSet = RuleSet(
         ruleSetId,
         listOf(
-            EmptyBlocks(config)
+            EmptyCatchBlock(config),
+            EmptyClassBlock(config),
+            EmptyDefaultConstructor(config),
+            EmptyDoWhileBlock(config),
+            EmptyElseBlock(config),
+            EmptyFinallyBlock(config),
+            EmptyForBlock(config),
+            EmptyFunctionBlock(config),
+            EmptyIfBlock(config),
+            EmptyInitBlock(config),
+            EmptyKtFile(config),
+            EmptySecondaryConstructor(config),
+            EmptyTryBlock(config),
+            EmptyWhenBlock(config),
+            EmptyWhileBlock(config),
         )
     )
 }
diff --git a/...empty/src/test/kotlin/io/gitlab/arturbosch/detekt/rules/empty/EmptyBlocksMultiRuleSpec.kt b/...empty/src/test/kotlin/io/gitlab/arturbosch/detekt/rules/empty/EmptyBlocksMultiRuleSpec.kt
diff --git a/detekt-rules-empty/src/test/kotlin/io/gitlab/arturbosch/detekt/rules/empty/EmptyCodeSpec.kt b/detekt-rules-empty/src/test/kotlin/io/gitlab/arturbosch/detekt/rules/empty/EmptyCodeSpec.kt
@@ -130,6 +130,12 @@ class EmptyCodeSpec {
         test { EmptySecondaryConstructor(Config.empty) }
     }
 
+    @Test
+    fun `reports an empty kt file`() {
+        val rule = EmptyKtFile(Config.empty)
+        assertThat(rule.compileAndLint("")).hasSize(1)
+    }
+
     @Test
     fun `doesNotFailWithInvalidRegexWhenDisabled`() {
         val configValues = mapOf(

diff --git a/detekt-rules-empty/src/test/resources/deactivated-empty-blocks.yml b/detekt-rules-empty/src/test/resources/deactivated-empty-blocks.yml