Update dependency com.pinterest.ktlint:ktlint-ruleset-standard to v0.…

…50.0 (#6239) * Update dependency com.pinterest.ktlint:ktlint-ruleset-standard to v0.50.0 * Update test code to align to new rule behaviour * Fix new issues raised by ktlint * Fix a typo --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Matthew Haughton <3flex@users.noreply.github.com>
detekt · Jul 15, 2023 · 7ee3b8a · 7ee3b8a
1 parent e44a7e8
commit 7ee3b8a
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 7 deletions.
diff --git a/detekt-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/KtTreeCompiler.kt b/detekt-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/KtTreeCompiler.kt
@@ -44,7 +44,10 @@ class KtTreeCompiler(
             val service = settings.taskPool
             val tasks = kotlinFiles.map { path ->
                 service.task { compiler.compile(basePath, path) }
-                    .recover { settings.error("Could not compile '$path'.", it); null }
+                    .recover {
+                        settings.error("Could not compile '$path'.", it)
+                        null
+                    }
             }.toList()
             return awaitAll(tasks).filterNotNull()
         } else {

diff --git a/detekt-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/extensions/Loading.kt b/detekt-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/extensions/Loading.kt
@@ -18,5 +18,8 @@ inline fun <reified T : Extension> loadExtensions(
         .filter(predicate)
         .sortedBy { it.priority }
         .asReversed()
-        .onEach { it.init(settings.config); it.init(settings) }
+        .onEach {
+            it.init(settings.config)
+            it.init(settings)
+        }
         .also { settings.debug { "Loaded extensions: $LIST_ITEM_SPACING${it.joinToString(LIST_ITEM_SPACING)}" } }
diff --git a/...tting/src/test/kotlin/io/gitlab/arturbosch/detekt/formatting/ParameterListWrappingSpec.kt b/...tting/src/test/kotlin/io/gitlab/arturbosch/detekt/formatting/ParameterListWrappingSpec.kt
@@ -29,7 +29,9 @@ class ParameterListWrappingSpec {
     @Test
     fun `reports when max line length is exceeded`() {
         val code = """
-            fun f(a: Int, b: Int, c: Int) {}
+            
+            fun f(a: Int, b: Int, c: Int) {
+            }
         """.trimIndent()
         val config = TestConfig("maxLineLength" to "10")
         assertThat(ParameterListWrapping(config).lint(code)).hasSize(4)

diff --git a/detekt-psi-utils/src/test/kotlin/io/gitlab/arturbosch/detekt/rules/MethodSignatureSpec.kt b/detekt-psi-utils/src/test/kotlin/io/gitlab/arturbosch/detekt/rules/MethodSignatureSpec.kt
@@ -73,7 +73,10 @@ class MethodSignatureSpec {
             "'protected',true",
             "'private',false"
         )
-        fun `should return x for finalize function with y access modifier`(accessModifier: String, isFinalize: Boolean) {
+        fun `should return x for finalize function with y access modifier`(
+            accessModifier: String,
+            isFinalize: Boolean,
+        ) {
             val namedFunction = makeFunction("$accessModifier fun finalize() {}")
             assertThat(namedFunction.isJvmFinalizeFunction()).isEqualTo(isFinalize)
         }
@@ -85,7 +88,7 @@ class MethodSignatureSpec {
         }
 
         @Test
-        fun `should return false for overriden finalize function`() {
+        fun `should return false for overridden finalize function`() {
             val namedFunction = makeFunction("override fun finalize()")
             assertThat(namedFunction.isJvmFinalizeFunction()).isFalse()
         }

diff --git a/.../src/main/kotlin/io/gitlab/arturbosch/detekt/rules/complexity/StringLiteralDuplication.kt b/.../src/main/kotlin/io/gitlab/arturbosch/detekt/rules/complexity/StringLiteralDuplication.kt
@@ -113,7 +113,10 @@ class StringLiteralDuplication(config: Config = Config.empty) : Rule(config) {
         private fun add(str: KtStringTemplateExpression) {
             val text = str.plainContent
             literals.compute(text) { _, oldValue -> oldValue?.plus(1) ?: 1 }
-            literalReferences.compute(text) { _, entries -> entries?.add(str); entries ?: mutableListOf(str) }
+            literalReferences.compute(text) { _, entries ->
+                entries?.add(str)
+                entries ?: mutableListOf(str)
+            }
         }
     }
 

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -2,7 +2,7 @@
 dokka = "1.8.10"
 jacoco = "0.8.10"
 kotlin = "1.8.22"
-ktlint = "0.49.1"
+ktlint = "0.50.0"
 junit = "5.9.3"
 contester = "0.2.0"