Bump KtLint to 0.44.0 and add UnnecessaryParenthesesBeforeTrailingLamda rule

detekt-formatting/src/main/kotlin/io/gitlab/arturbosch/detekt/formatting/FormattingRule.kt

@@ -1,6 +1,8 @@
 package io.gitlab.arturbosch.detekt.formatting
 
 import com.pinterest.ktlint.core.KtLint
+import com.pinterest.ktlint.core.Rule.VisitorModifier.RunAsLateAsPossible
+import com.pinterest.ktlint.core.Rule.VisitorModifier.RunOnRootNodeOnly
 import com.pinterest.ktlint.core.api.FeatureInAlphaState
 import com.pinterest.ktlint.core.api.UsesEditorConfigProperties
 import io.github.detekt.psi.fileName
@@ -37,6 +39,12 @@ abstract class FormattingRule(config: Config) : Rule(config) {
     protected val isAndroid
         get() = FormattingProvider.android.value(ruleSetConfig)
 
+    val runOnRootNodeOnly
+        get() = RunOnRootNodeOnly in wrapping.visitorModifiers
+
+    val runAsLateAsPossible
+        get() = RunAsLateAsPossible in wrapping.visitorModifiers
+
     private var positionByOffset: (offset: Int) -> Pair<Int, Int> by SingleAssign()
     private var root: KtFile by SingleAssign()
 
@@ -102,5 +110,5 @@ abstract class FormattingRule(config: Config) : Rule(config) {
         TextLocation(node.startOffset, node.psi.endOffset)
 
     private fun ruleShouldOnlyRunOnFileNode(node: ASTNode) =
-        wrapping is com.pinterest.ktlint.core.Rule.Modifier.RestrictToRoot && node !is FileASTNode
+        runOnRootNodeOnly && node !is FileASTNode
 }

detekt-formatting/src/main/kotlin/io/gitlab/arturbosch/detekt/formatting/KtLintMultiRule.kt

@@ -1,8 +1,5 @@
 package io.gitlab.arturbosch.detekt.formatting
 
-import com.pinterest.ktlint.core.Rule.Modifier.Last
-import com.pinterest.ktlint.core.Rule.Modifier.RestrictToRoot
-import com.pinterest.ktlint.core.Rule.Modifier.RestrictToRootLast
 import io.gitlab.arturbosch.detekt.api.Config
 import io.gitlab.arturbosch.detekt.api.MultiRule
 import io.gitlab.arturbosch.detekt.api.Rule
@@ -48,6 +45,7 @@ import io.gitlab.arturbosch.detekt.formatting.wrappers.SpacingBetweenDeclaration
 import io.gitlab.arturbosch.detekt.formatting.wrappers.SpacingBetweenDeclarationsWithComments
 import io.gitlab.arturbosch.detekt.formatting.wrappers.StringTemplate
 import io.gitlab.arturbosch.detekt.formatting.wrappers.TrailingComma
+import io.gitlab.arturbosch.detekt.formatting.wrappers.UnnecessaryParenthesesBeforeTrailingLambda
 import org.jetbrains.kotlin.com.intellij.lang.ASTNode
 import org.jetbrains.kotlin.com.intellij.psi.impl.source.JavaDummyElement
 import org.jetbrains.kotlin.com.intellij.psi.impl.source.JavaDummyHolder
@@ -105,6 +103,7 @@ class KtLintMultiRule(config: Config = Config.empty) : MultiRule() {
         SpacingBetweenDeclarationsWithAnnotations(config),
         SpacingBetweenDeclarationsWithComments(config),
         TrailingComma(config),
+        UnnecessaryParenthesesBeforeTrailingLambda(config),
     )
 
     override fun visit(root: KtFile) {
@@ -121,11 +120,10 @@ class KtLintMultiRule(config: Config = Config.empty) : MultiRule() {
         val runLastOnRoot = mutableListOf<FormattingRule>()
         val runLast = mutableListOf<FormattingRule>()
         for (rule in activeRules.filterIsInstance<FormattingRule>()) {
-            when (rule.wrapping) {
-                is Last -> runLast.add(rule)
-                // RestrictToRootLast implements RestrictToRoot, so we have to perform this check first
-                is RestrictToRootLast -> runLastOnRoot.add(rule)
-                is RestrictToRoot -> runFirstOnRoot.add(rule)
+            when {
+                rule.runOnRootNodeOnly && rule.runAsLateAsPossible -> runLastOnRoot.add(rule)
+                rule.runOnRootNodeOnly -> runFirstOnRoot.add(rule)
+                rule.runAsLateAsPossible -> runLast.add(rule)
                 else -> other.add(rule)
             }
         }

detekt-formatting/src/main/kotlin/io/gitlab/arturbosch/detekt/formatting/wrappers/ParameterListWrapping.kt

@@ -2,13 +2,11 @@ package io.gitlab.arturbosch.detekt.formatting.wrappers
 
 import com.pinterest.ktlint.ruleset.standard.ParameterListWrappingRule
 import io.gitlab.arturbosch.detekt.api.Config
-import io.gitlab.arturbosch.detekt.api.config
 import io.gitlab.arturbosch.detekt.api.configWithAndroidVariants
 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
-import io.gitlab.arturbosch.detekt.formatting.INDENT_SIZE_KEY
 import io.gitlab.arturbosch.detekt.formatting.MAX_LINE_LENGTH_KEY
 
 /**
@@ -21,14 +19,10 @@ class ParameterListWrapping(config: Config) : FormattingRule(config) {
     override val wrapping = ParameterListWrappingRule()
     override val issue = issueFor("Detects mis-aligned parameter lists")
 
-    @Configuration("indentation size")
-    private val indentSize by config(4)
-
     @Configuration("maximum line length")
     private val maxLineLength: Int by configWithAndroidVariants(120, 100)
 
     override fun overrideEditorConfig() = mapOf(
-        INDENT_SIZE_KEY to indentSize,
         MAX_LINE_LENGTH_KEY to maxLineLength
     )
 }

detekt-formatting/src/main/kotlin/io/gitlab/arturbosch/detekt/formatting/wrappers/UnnecessaryParenthesesBeforeTrailingLambda.kt

@@ -0,0 +1,18 @@
+package io.gitlab.arturbosch.detekt.formatting.wrappers
+
+import com.pinterest.ktlint.core.api.FeatureInAlphaState
+import com.pinterest.ktlint.ruleset.experimental.UnnecessaryParenthesesBeforeTrailingLambdaRule
+import io.gitlab.arturbosch.detekt.api.Config
+import io.gitlab.arturbosch.detekt.api.internal.AutoCorrectable
+import io.gitlab.arturbosch.detekt.formatting.FormattingRule
+
+/**
+ * See <a href="https://ktlint.github.io/#rule-spacing">ktlint-website</a> for documentation.
+ */
+@OptIn(FeatureInAlphaState::class)
+@AutoCorrectable(since = "1.20.0")
+class UnnecessaryParenthesesBeforeTrailingLambda(config: Config) : FormattingRule(config) {
+
+    override val wrapping = UnnecessaryParenthesesBeforeTrailingLambdaRule()
+    override val issue = issueFor("Ensures there are no unnecessary parentheses before a trailing lambda")
+}

detekt-formatting/src/main/resources/config/config.yml

@@ -87,7 +87,6 @@ formatting:
   ParameterListWrapping:
     active: true
     autoCorrect: true
-    indentSize: 4
     maxLineLength: 120
   SpacingAroundAngleBrackets:
     active: false
@@ -136,3 +135,6 @@ formatting:
     autoCorrect: true
     allowTrailingComma: false
     allowTrailingCommaOnCallSite: false
+  UnnecessaryParenthesesBeforeTrailingLambda:
+    active: false
+    autoCorrect: true

detekt-formatting/src/test/kotlin/io/gitlab/arturbosch/detekt/formatting/IndentationSpec.kt

@@ -54,5 +54,26 @@ class IndentationSpec {
             val code = "fun main() {\n    println()\n}"
             assertThat(subject.lint(code)).isEmpty()
         }
+
+        @Nested
+        inner class `parameter list indent size equals 1` {
+
+            val code = """
+                fun f(
+                 a: Int
+                ) {}
+            """.trimIndent()
+
+            @Test
+            fun `reports wrong indent size`() {
+                assertThat(subject.lint(code)).hasSize(1)
+            }
+
+            @Test
+            fun `does not report when using an indentation level config of 1`() {
+                val config = TestConfig("indentSize" to "1")
+                assertThat(Indentation(config).lint(code)).isEmpty()
+            }
+        }
     }
 }

detekt-formatting/src/test/kotlin/io/gitlab/arturbosch/detekt/formatting/KtLintMultiRuleSpec.kt

@@ -1,8 +1,5 @@
 package io.gitlab.arturbosch.detekt.formatting
 
-import com.pinterest.ktlint.core.Rule.Modifier.Last
-import com.pinterest.ktlint.core.Rule.Modifier.RestrictToRoot
-import com.pinterest.ktlint.core.Rule.Modifier.RestrictToRootLast
 import io.github.detekt.test.utils.compileContentForTest
 import io.gitlab.arturbosch.detekt.api.Config
 import org.assertj.core.api.Assertions.assertThat
@@ -20,15 +17,15 @@ class KtLintMultiRuleSpec {
             ktlintRule.visitFile(compileContentForTest(""))
             val sortedRules = ktlintRule.getSortedRules()
             assertThat(sortedRules).isNotEmpty
-            assertThat(sortedRules.indexOfFirst { it.wrapping is RestrictToRoot })
+            assertThat(sortedRules.indexOfFirst { it.runOnRootNodeOnly })
                 .isGreaterThan(-1)
-                .isLessThan(sortedRules.indexOfFirst { it.wrapping !is RestrictToRoot })
-            assertThat(sortedRules.indexOfFirst { it.wrapping !is RestrictToRoot })
+                .isLessThan(sortedRules.indexOfFirst { !it.runOnRootNodeOnly })
+            assertThat(sortedRules.indexOfFirst { !it.runOnRootNodeOnly })
                 .isGreaterThan(-1)
-                .isLessThan(sortedRules.indexOfFirst { it.wrapping is RestrictToRootLast })
-            assertThat(sortedRules.indexOfFirst { it.wrapping is RestrictToRootLast })
+                .isLessThan(sortedRules.indexOfFirst { it.runOnRootNodeOnly && it.runAsLateAsPossible })
+            assertThat(sortedRules.indexOfFirst { it.runOnRootNodeOnly && it.runAsLateAsPossible })
                 .isGreaterThan(-1)
-                .isLessThan(sortedRules.indexOfFirst { it.wrapping is Last })
+                .isLessThan(sortedRules.indexOfFirst { it.runAsLateAsPossible && !it.runOnRootNodeOnly })
         }
     }
 }

detekt-formatting/src/test/kotlin/io/gitlab/arturbosch/detekt/formatting/ParameterListWrappingSpec.kt

@@ -20,27 +20,6 @@ class ParameterListWrappingSpec {
     @Nested
     inner class `ParameterListWrapping rule` {
 
-        @Nested
-        inner class `indent size equals 1` {
-
-            val code = """
-                fun f(
-                 a: Int
-                ) {}
-            """.trimIndent()
-
-            @Test
-            fun `reports wrong indent size`() {
-                assertThat(subject.lint(code)).hasSize(1)
-            }
-
-            @Test
-            fun `does not report when using an indentation level config of 1`() {
-                val config = TestConfig("indentSize" to "1")
-                assertThat(ParameterListWrapping(config).lint(code)).isEmpty()
-            }
-        }
-
         @Test
         fun `does not report correct ParameterListWrapping level`() {
             val code = """

detekt-formatting/src/test/kotlin/io/gitlab/arturbosch/detekt/formatting/UnnecessaryParenthesesBeforeTrailingLambdaSpec.kt

@@ -0,0 +1,32 @@
+package io.gitlab.arturbosch.detekt.formatting
+
+import io.gitlab.arturbosch.detekt.api.Config
+import io.gitlab.arturbosch.detekt.formatting.wrappers.UnnecessaryParenthesesBeforeTrailingLambda
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.jupiter.api.Nested
+import org.junit.jupiter.api.Test
+
+class UnnecessaryParenthesesBeforeTrailingLambdaSpec {
+
+    @Nested
+    inner class `UnnecessaryParenthesesBeforeTrailingLambda rule` {
+
+        @Test
+        fun `reports unnecessary parentheses before trailing lambda`() {
+            val code = """
+                fun countDash(input: String) =
+                    "some-string".count() { it == '-' }
+            """.trimIndent()
+            assertThat(UnnecessaryParenthesesBeforeTrailingLambda(Config.empty).lint(code)).hasSize(1)
+        }
+
+        @Test
+        fun `does not report unnecessary parentheses before trailing lambda`() {
+            val code = """
+                fun countDash(input: String) =
+                    "some-string".count { it == '-' }
+            """.trimIndent()
+            assertThat(UnnecessaryParenthesesBeforeTrailingLambda(Config.empty).lint(code)).isEmpty()
+        }
+    }
+}

gradle/libs.versions.toml

@@ -2,7 +2,7 @@
 dokka = "1.6.10"
 jacoco = "0.8.7"
 kotlin = "1.6.10"
-ktlint = "0.43.2"
+ktlint = "0.44.0"
 spek = "2.0.18"
 junit = "5.8.2"