diff --git a/detekt-formatting/src/main/kotlin/io/gitlab/arturbosch/detekt/formatting/KtLintMultiRule.kt b/detekt-formatting/src/main/kotlin/io/gitlab/arturbosch/detekt/formatting/KtLintMultiRule.kt index 40459ae5044c..60d6881d16a8 100644 --- a/detekt-formatting/src/main/kotlin/io/gitlab/arturbosch/detekt/formatting/KtLintMultiRule.kt +++ b/detekt-formatting/src/main/kotlin/io/gitlab/arturbosch/detekt/formatting/KtLintMultiRule.kt @@ -117,8 +117,8 @@ class KtLintMultiRule(config: Config = Config.empty) : SpacingBetweenDeclarationsWithAnnotations(config), SpacingBetweenDeclarationsWithComments(config), StringTemplate(config), - TrailingCommaOnCallSite(config), // in standard ruleset but not enabled by default - TrailingCommaOnDeclarationSite(config), // in standard ruleset but not enabled by default + TrailingCommaOnCallSite(config), + TrailingCommaOnDeclarationSite(config), Wrapping(config), // Wrappers for ktlint-ruleset-experimental rules. Disabled by default. diff --git a/detekt-formatting/src/main/kotlin/io/gitlab/arturbosch/detekt/formatting/wrappers/TrailingCommaOnCallSite.kt b/detekt-formatting/src/main/kotlin/io/gitlab/arturbosch/detekt/formatting/wrappers/TrailingCommaOnCallSite.kt index 855055f4831a..f79e74956cb1 100644 --- a/detekt-formatting/src/main/kotlin/io/gitlab/arturbosch/detekt/formatting/wrappers/TrailingCommaOnCallSite.kt +++ b/detekt-formatting/src/main/kotlin/io/gitlab/arturbosch/detekt/formatting/wrappers/TrailingCommaOnCallSite.kt @@ -4,6 +4,7 @@ import com.pinterest.ktlint.core.api.UsesEditorConfigProperties import com.pinterest.ktlint.ruleset.standard.TrailingCommaOnCallSiteRule import io.gitlab.arturbosch.detekt.api.Config import io.gitlab.arturbosch.detekt.api.config +import io.gitlab.arturbosch.detekt.api.internal.ActiveByDefault import io.gitlab.arturbosch.detekt.api.internal.AutoCorrectable import io.gitlab.arturbosch.detekt.api.internal.Configuration import io.gitlab.arturbosch.detekt.formatting.FormattingRule @@ -12,6 +13,7 @@ import io.gitlab.arturbosch.detekt.formatting.FormattingRule * See [ktlint docs](https://pinterest.github.io/ktlint/rules/standard/) for documentation. */ @AutoCorrectable(since = "1.22.0") +@ActiveByDefault(since = "1.22.0") class TrailingCommaOnCallSite(config: Config) : FormattingRule(config) { override val wrapping = TrailingCommaOnCallSiteRule() diff --git a/detekt-formatting/src/main/kotlin/io/gitlab/arturbosch/detekt/formatting/wrappers/TrailingCommaOnDeclarationSite.kt b/detekt-formatting/src/main/kotlin/io/gitlab/arturbosch/detekt/formatting/wrappers/TrailingCommaOnDeclarationSite.kt index 6c6bdb0c8151..3712dc8b0131 100644 --- a/detekt-formatting/src/main/kotlin/io/gitlab/arturbosch/detekt/formatting/wrappers/TrailingCommaOnDeclarationSite.kt +++ b/detekt-formatting/src/main/kotlin/io/gitlab/arturbosch/detekt/formatting/wrappers/TrailingCommaOnDeclarationSite.kt @@ -4,6 +4,7 @@ import com.pinterest.ktlint.core.api.UsesEditorConfigProperties import com.pinterest.ktlint.ruleset.standard.TrailingCommaOnDeclarationSiteRule import io.gitlab.arturbosch.detekt.api.Config import io.gitlab.arturbosch.detekt.api.config +import io.gitlab.arturbosch.detekt.api.internal.ActiveByDefault import io.gitlab.arturbosch.detekt.api.internal.AutoCorrectable import io.gitlab.arturbosch.detekt.api.internal.Configuration import io.gitlab.arturbosch.detekt.formatting.FormattingRule @@ -12,6 +13,7 @@ import io.gitlab.arturbosch.detekt.formatting.FormattingRule * See [ktlint docs](https://pinterest.github.io/ktlint/rules/standard/) for documentation. */ @AutoCorrectable(since = "1.22.0") +@ActiveByDefault(since = "1.22.0") class TrailingCommaOnDeclarationSite(config: Config) : FormattingRule(config) { override val wrapping = TrailingCommaOnDeclarationSiteRule() diff --git a/detekt-formatting/src/main/resources/config/config.yml b/detekt-formatting/src/main/resources/config/config.yml index fdc9e9c2800a..d0cca87ac150 100644 --- a/detekt-formatting/src/main/resources/config/config.yml +++ b/detekt-formatting/src/main/resources/config/config.yml @@ -180,11 +180,11 @@ formatting: active: true autoCorrect: true TrailingCommaOnCallSite: - active: false + active: true autoCorrect: true useTrailingCommaOnCallSite: false TrailingCommaOnDeclarationSite: - active: false + active: true autoCorrect: true useTrailingCommaOnDeclarationSite: false TypeArgumentListSpacing: