Set property "ktlint_disabled_rules" instead of "disabled_rules" when…

… using CLI parameter as otherwise the deprecation warning is displayed Closes pinterest#1599
paul-dingemans · Aug 27, 2022 · c9498b9 · c9498b9
1 parent 2736e3f
commit c9498b9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,8 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 
 ### Fixed
 
+Do not show deprecation warning about property "disabled_rules" when using CLi-parameter `--disabled-rules` ([#1599](https://github.com/pinterest/ktlint/issues/1599)) 
+
 ### Added
 
 ### Changed

diff --git a/ktlint/src/main/kotlin/com/pinterest/ktlint/internal/KtlintCommandLine.kt b/ktlint/src/main/kotlin/com/pinterest/ktlint/internal/KtlintCommandLine.kt
@@ -12,7 +12,7 @@ import com.pinterest.ktlint.core.RuleProvider
 import com.pinterest.ktlint.core.api.Baseline.Status.INVALID
 import com.pinterest.ktlint.core.api.Baseline.Status.NOT_FOUND
 import com.pinterest.ktlint.core.api.DefaultEditorConfigProperties.codeStyleSetProperty
-import com.pinterest.ktlint.core.api.DefaultEditorConfigProperties.disabledRulesProperty
+import com.pinterest.ktlint.core.api.DefaultEditorConfigProperties.ktlintDisabledRulesProperty
 import com.pinterest.ktlint.core.api.EditorConfigDefaults
 import com.pinterest.ktlint.core.api.EditorConfigOverride
 import com.pinterest.ktlint.core.api.EditorConfigOverride.Companion.plus
@@ -251,7 +251,7 @@ internal class KtlintCommandLine {
             EditorConfigOverride
                 .emptyEditorConfigOverride
                 .applyIf(disabledRules.isNotBlank()) {
-                    plus(disabledRulesProperty to disabledRules)
+                    plus(ktlintDisabledRulesProperty to disabledRules)
                 }.applyIf(android) {
                     plus(codeStyleSetProperty to android)
                 }