Skip to content

Commit e4bc0cd

Browse files
committed
fix: apply all kotlin code with ktlint
1 parent ad77f79 commit e4bc0cd

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ spotless {
2222
googleJavaFormat("1.17.0")
2323
}
2424
kotlin {
25-
target("app/src/main/java/com/osfans/trime/**/*.kt")
25+
target("**/*.kt")
2626
ktlint("0.49.1")
2727
trimTrailingWhitespace()
2828
indentWithSpaces()

codegen/src/main/java/com/osfans/trime/codegen/GenKeyMapping.kt

+12-12
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ import com.google.devtools.ksp.processing.SymbolProcessor
55
import com.google.devtools.ksp.processing.SymbolProcessorEnvironment
66
import com.google.devtools.ksp.processing.SymbolProcessorProvider
77
import com.google.devtools.ksp.symbol.KSAnnotated
8+
import com.squareup.kotlinpoet.FileSpec
89
import com.squareup.kotlinpoet.FunSpec
9-
import com.squareup.kotlinpoet.asTypeName
10-
import com.squareup.kotlinpoet.TypeSpec
11-
import com.squareup.kotlinpoet.PropertySpec
1210
import com.squareup.kotlinpoet.KModifier
13-
import com.squareup.kotlinpoet.FileSpec
11+
import com.squareup.kotlinpoet.PropertySpec
12+
import com.squareup.kotlinpoet.TypeSpec
13+
import com.squareup.kotlinpoet.asTypeName
1414
import com.squareup.kotlinpoet.ksp.writeTo
1515

1616
private typealias RimeKeyName = String
@@ -34,6 +34,7 @@ private typealias KeyPair = Pair<Pair<RimeKeyName, RimeKeyVal>, AndroidKeyCode>
3434
internal class GenKeyMappingProcessor(private val environment: SymbolProcessorEnvironment) :
3535
SymbolProcessor {
3636

37+
@Suppress("ktlint:standard:comment-wrapping")
3738
private val pairs: List<KeyPair> = listOf(
3839
"space" to 0x0020 to "KEYCODE_SPACE", /* U+0020 SPACE */
3940
// 0x0021 to KeyEvent.KEYCODE_EXCLAM, /* U+0021 EXCLAMATION MARK */
@@ -215,7 +216,7 @@ internal class GenKeyMappingProcessor(private val environment: SymbolProcessorEn
215216
| ${pairs.joinToString(separator = "\n| ") { (f, code) -> "${keyName(f)} -> KeyEvent.$code" }}
216217
| else -> KeyEvent.KEYCODE_UNKNOWN
217218
| }
218-
""".trimMargin()
219+
""".trimMargin(),
219220
)
220221
.build()
221222

@@ -241,7 +242,7 @@ internal class GenKeyMappingProcessor(private val environment: SymbolProcessorEn
241242
}
242243
| else -> RimeKey_VoidSymbol
243244
| }
244-
""".trimMargin()
245+
""".trimMargin(),
245246
)
246247
.build()
247248

@@ -253,10 +254,10 @@ internal class GenKeyMappingProcessor(private val environment: SymbolProcessorEn
253254
.addCode(
254255
"""
255256
| return when (name) {
256-
| ${pairs.joinToString(separator = "\n| ") { (f, _ ) -> "\"${f.first}\" -> ${keyName(f)}" }}
257+
| ${pairs.joinToString(separator = "\n| ") { (f, _) -> "\"${f.first}\" -> ${keyName(f)}" }}
257258
| else -> RimeKey_VoidSymbol
258259
| }
259-
""".trimMargin()
260+
""".trimMargin(),
260261
)
261262
.build()
262263

@@ -268,10 +269,10 @@ internal class GenKeyMappingProcessor(private val environment: SymbolProcessorEn
268269
.addCode(
269270
"""
270271
| return when (`val`) {
271-
| ${pairs.joinToString(separator = "\n| ") { (f, _ ) -> "${keyName(f)} -> \"${f.first}\"" }}
272+
| ${pairs.joinToString(separator = "\n| ") { (f, _) -> "${keyName(f)} -> \"${f.first}\"" }}
272273
| else -> "VoidSymbol"
273274
| }
274-
""".trimMargin()
275+
""".trimMargin(),
275276
)
276277
.build()
277278

@@ -288,7 +289,7 @@ internal class GenKeyMappingProcessor(private val environment: SymbolProcessorEn
288289
.builder(
289290
keyName(f),
290291
Int::class,
291-
KModifier.CONST
292+
KModifier.CONST,
292293
)
293294
.initializer(String.format("0x%04x", `val`))
294295
.build()
@@ -304,7 +305,6 @@ internal class GenKeyMappingProcessor(private val environment: SymbolProcessorEn
304305
.build()
305306
file.writeTo(environment.codeGenerator, false)
306307
}
307-
308308
}
309309

310310
class GenKeyMappingProvider : SymbolProcessorProvider {

0 commit comments

Comments
 (0)