Always load experimental rules

jeremymailen · Jan 20, 2023 · bb1cc95 · bb1cc95
1 parent bbf3e25
commit bb1cc95
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 9 deletions.
diff --git a/src/main/kotlin/org/jmailen/gradle/kotlinter/support/RuleSets.kt b/src/main/kotlin/org/jmailen/gradle/kotlinter/support/RuleSets.kt
@@ -2,15 +2,12 @@ package org.jmailen.gradle.kotlinter.support
 
 import com.pinterest.ktlint.core.RuleProvider
 import com.pinterest.ktlint.core.RuleSetProviderV2
-import com.pinterest.ktlint.ruleset.experimental.ExperimentalRuleSetProvider
 import java.util.ServiceLoader
 
 internal fun resolveRuleProviders(
     providers: Iterable<RuleSetProviderV2>,
-    includeExperimentalRules: Boolean = false,
 ): Set<RuleProvider> = providers
     .asSequence()
-    .filter { includeExperimentalRules || it !is ExperimentalRuleSetProvider }
     .sortedWith(
         compareBy {
             when (it.id) {

diff --git a/src/main/kotlin/org/jmailen/gradle/kotlinter/tasks/format/FormatWorkerAction.kt b/src/main/kotlin/org/jmailen/gradle/kotlinter/tasks/format/FormatWorkerAction.kt
@@ -26,7 +26,7 @@ abstract class FormatWorkerAction : WorkAction<FormatWorkerParameters> {
 
     override fun execute() {
         val ktLintEngine = KtLintRuleEngine(
-            ruleProviders = resolveRuleProviders(defaultRuleSetProviders, ktLintParams.experimentalRules),
+            ruleProviders = resolveRuleProviders(defaultRuleSetProviders),
             editorConfigOverride = editorConfigOverride(ktLintParams),
         )
 

diff --git a/src/main/kotlin/org/jmailen/gradle/kotlinter/tasks/lint/LintWorkerAction.kt b/src/main/kotlin/org/jmailen/gradle/kotlinter/tasks/lint/LintWorkerAction.kt
@@ -31,7 +31,7 @@ abstract class LintWorkerAction : WorkAction<LintWorkerParameters> {
 
     override fun execute() {
         val ktLintEngine = KtLintRuleEngine(
-            ruleProviders = resolveRuleProviders(defaultRuleSetProviders, ktLintParams.experimentalRules),
+            ruleProviders = resolveRuleProviders(defaultRuleSetProviders),
             editorConfigOverride = editorConfigOverride(ktLintParams),
         )
 

diff --git a/src/test/kotlin/org/jmailen/gradle/kotlinter/support/RuleSetsTest.kt b/src/test/kotlin/org/jmailen/gradle/kotlinter/support/RuleSetsTest.kt
@@ -13,11 +13,9 @@ class RuleSetsTest {
 
     @Test
     fun `resolveRuleSets loads from classpath providers`() {
-        val standardOnly = resolveRuleProviders(defaultRuleSetProviders, includeExperimentalRules = false)
-        val withExperimentalRules = resolveRuleProviders(defaultRuleSetProviders, includeExperimentalRules = true)
+        val rules = resolveRuleProviders(defaultRuleSetProviders)
 
-        assertTrue(standardOnly.isNotEmpty())
-        assertTrue(standardOnly.size < withExperimentalRules.size)
+        assertTrue(rules.isNotEmpty())
     }
 
     @Test