style: ktfmt 0.49 format

Leon406 · May 30, 2024 · 0f9d983 · 0f9d983
1 parent ed84b00
commit 0f9d983
Show file tree

Hide file tree

Showing 12 changed files with 16 additions and 28 deletions.
diff --git a/app/src/main/kotlin/me/leon/ext/File.kt b/app/src/main/kotlin/me/leon/ext/File.kt
@@ -136,8 +136,7 @@ fun File.realExtension() =
                         } else {
                             magics[key]
                         })
-                    }
-                    ?: "$extension(probably)".also { println("unknown magic number $this $name") }
+                    } ?: "$extension(probably)".also { println("unknown magic number $this $name") }
             }
         }
     } else {

diff --git a/app/src/main/kotlin/me/leon/ext/Net.kt b/app/src/main/kotlin/me/leon/ext/Net.kt
@@ -73,8 +73,7 @@ fun String.readBytesFromNet(
                 }
                 .takeIf { it.responseCode == RESPONSE_OK || it.responseCode == RESPONSE_NOT_FOUND }
                 ?.stream()
-                ?.readBytes()
-                ?: byteArrayOf()
+                ?.readBytes() ?: byteArrayOf()
         }
         .getOrElse {
             println("read bytes err ${it.stacktrace()} ")

diff --git a/app/src/main/kotlin/me/leon/ext/ocr/BaiduOcr.kt b/app/src/main/kotlin/me/leon/ext/ocr/BaiduOcr.kt
@@ -39,7 +39,6 @@ object BaiduOcr {
             .also { println(it) }
             .fromJson(BaiduOcrBean::class.java)
             .results
-            ?.joinToString(System.lineSeparator()) { it.words }
-            ?: error("request failed")
+            ?.joinToString(System.lineSeparator()) { it.words } ?: error("request failed")
     }
 }
diff --git a/app/src/main/kotlin/me/leon/view/EncodeView.kt b/app/src/main/kotlin/me/leon/view/EncodeView.kt
@@ -55,9 +55,7 @@ class EncodeView : Fragment(messages["encodeAndDecode"]) {
                 isEncode ||
                     encodeType in arrayOf(EncodeType.DECIMAL, EncodeType.OCTAL) ||
                     fileMode.get()
-            }
-                ?: taInput.text.takeUnless { decodeIgnoreSpace.get() }
-                    ?: taInput.text.stripAllSpace()
+            } ?: taInput.text.takeUnless { decodeIgnoreSpace.get() } ?: taInput.text.stripAllSpace()
 
     private val outputText: String
         get() = taOutput.text
@@ -350,8 +348,7 @@ class EncodeView : Fragment(messages["encodeAndDecode"]) {
                     ?.run {
                         encodeMethods.add(first)
                         encoded = second
-                    }
-                    ?: break
+                    } ?: break
             }
             encodeMethods.mapIndexed { i, type -> "${i + 1} $type" }.joinToString("-->")
         } ui

diff --git a/app/src/main/kotlin/me/leon/view/StringProcessView.kt b/app/src/main/kotlin/me/leon/view/StringProcessView.kt
@@ -601,8 +601,7 @@ class StringProcessView : Fragment(messages["stringProcess"]) {
                     .lines()
                     .filter { it.isNotEmpty() }
                     .map { it.toFile() }
-                    .firstOrNull { it.exists() && it.name.contains(dictType) }
-                    ?: defaultFile
+                    .firstOrNull { it.exists() && it.name.contains(dictType) } ?: defaultFile
             } else {
                 defaultFile
             }

diff --git a/benchmark/src/test/kotlin/me/leon/translate/VocabularyTranslateTest.kt b/benchmark/src/test/kotlin/me/leon/translate/VocabularyTranslateTest.kt
@@ -175,8 +175,7 @@ class TranslateTest {
             runCatching { translatedFile.readText() }
                 .getOrNull()
                 ?.lines()
-                ?.map { it.split("\t")[0] }
-                ?: emptyList()
+                ?.map { it.split("\t")[0] } ?: emptyList()
         val lines = toTranslate.readText().lines()
         val exclusion = noTranslation.readText().lines().toSet()
         val diff = lines - translated.toSet() - exclusion

diff --git a/config/codeQuality.gradle b/config/codeQuality.gradle
@@ -28,6 +28,6 @@ spotless {
     kotlin {
         target "src/**/*.kt"
         // https://github.com/facebookincubator/ktfmt/releases
-        ktfmt('0.44').kotlinlangStyle()
+        ktfmt('0.49').kotlinlangStyle()
     }
 }
diff --git a/config/detekt.yml b/config/detekt.yml
@@ -298,7 +298,7 @@ style:
   CanBeNonNullable:
     active: false
   CascadingCallWrapping:
-    active: true
+    active: false
   ClassOrdering:
     active: true
   CollapsibleIfStatements:

diff --git a/plugin-apipost/src/main/kotlin/me/leon/toolsfx/plugin/PlaceHolders.kt b/plugin-apipost/src/main/kotlin/me/leon/toolsfx/plugin/PlaceHolders.kt
@@ -65,6 +65,5 @@ fun String.methodParse(): String {
             tmp = tmp.methodParse()
         }
         replace(this.groupValues.first(), this.groupValues[1].methodCall(tmp))
-    }
-        ?: this
+    } ?: this
 }
diff --git a/plugin-apipost/src/main/kotlin/me/leon/toolsfx/plugin/net/HttpUrlUtil.kt b/plugin-apipost/src/main/kotlin/me/leon/toolsfx/plugin/net/HttpUrlUtil.kt
@@ -404,8 +404,7 @@ object HttpUrlUtil {
 
     fun Map<String, Any>.toParams(isEncode: Boolean = false) =
         entries.joinToString("&") {
-            (it.key.takeUnless { isEncode }
-                ?: it.key.urlEncoded) +
+            (it.key.takeUnless { isEncode } ?: it.key.urlEncoded) +
                 "=" +
                 (it.value.takeUnless { isEncode } ?: it.value.toString().urlEncoded)
         }

diff --git a/plugin-apipost/src/main/kotlin/me/leon/toolsfx/plugin/net/NetHelper.kt b/plugin-apipost/src/main/kotlin/me/leon/toolsfx/plugin/net/NetHelper.kt
@@ -18,16 +18,15 @@ object NetHelper {
             URLDecoder.decode(
                 response.getHeaderField("Content-Disposition")?.let { getFileName(it) }
                     ?: response.getHeaderField("content-disposition")?.let { getFileName(it) }
-                        ?: getUrlFileName(response.url.toString())
-                        ?: "unknownfile_${System.currentTimeMillis()}"
+                    ?: getUrlFileName(response.url.toString())
+                    ?: "unknownfile_${System.currentTimeMillis()}"
             )
         )
 
     private fun getCorrectUrl(url: String) =
         url.toByteArray(Charsets.ISO_8859_1).toString(Charsets.UTF_8).takeIf {
             REG_CHINESE.matcher(it).find()
-        }
-            ?: url
+        } ?: url
 
     /**
      * 通过 ‘？’ 和 ‘/’ 判断文件名

diff --git a/plugin-location/src/test/kotlin/me/leon/plugin/LocationParse.kt b/plugin-location/src/test/kotlin/me/leon/plugin/LocationParse.kt
@@ -122,10 +122,9 @@ class LocationParse {
                             ?: bean.pois?.firstOrNull {
                                 it.name?.run {
                                     contains(addr[2]) && contains("居委会|村委会|综合服务中心|党群服务中心".toRegex())
-                                }
-                                    ?: false
+                                } ?: false
                             }
-                                ?: bean.pois?.first().also {
+                            ?: bean.pois?.first().also {
                                 println("$location 可能不准确  \n\t\t${bean.pois}")
                             }
                     calculateDistance(poi, addr, location)