Skip to content

Commit

Permalink
Set property "ktlint_disabled_rules" instead of "disabled_rules" when…
Browse files Browse the repository at this point in the history
… using CLI parameter as otherwise the deprecation warning is displayed (#1616)

Closes #1599
  • Loading branch information
paul-dingemans committed Sep 3, 2022
1 parent 61856ad commit 8894ee9
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Expand Up @@ -7,6 +7,8 @@ This project adheres to [Semantic Versioning](https://semver.org/).
### Fixed
* Do not add trailing comma in empty parameter/argument list with comments (`trailing-comma-on-call-site`, `trailing-comma-on-declaration-site`) ([#1602](https://github.com/pinterest/ktlint/issue/1602))

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
Expand Down
Expand Up @@ -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
Expand Down Expand Up @@ -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)
}
Expand Down

0 comments on commit 8894ee9

Please sign in to comment.