Skip to content

Commit 3f5969f

Browse files
authored
Switch ktlint for ktfmt (#212)
* Switch ktlint for ktfmt * Reformat
1 parent 75c1d28 commit 3f5969f

File tree

7 files changed

+251
-195
lines changed

7 files changed

+251
-195
lines changed

.editorconfig

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
root = true
2+
3+
[*]
4+
indent_size = 2
5+
charset = utf-8
6+
trim_trailing_whitespace = true
7+
insert_final_newline = true
8+
9+
[*.{kt,kts}]
10+
ij_kotlin_allow_trailing_comma = true
11+
ij_kotlin_allow_trailing_comma_on_call_site = true
12+
ij_kotlin_imports_layout = *

build.gradle

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,7 @@ spotless {
1515
kotlin {
1616
target "**/*.kt"
1717
targetExclude "**/build/grammar/**/*.*", "**/generated/**/*.*", "src/test/fixtures/**/build/grammars/**/*.*"
18-
ktlint('0.49.1').editorConfigOverride([
19-
"indent_size": "2",
20-
"disabled_rules": "package-name",
21-
"ij_kotlin_allow_trailing_comma": "true",
22-
"ij_kotlin_allow_trailing_comma_on_call_site": "true",
23-
])
18+
ktfmt(libs.ktfmt.get().version).googleStyle()
2419
trimTrailingWhitespace()
2520
endWithNewline()
2621
}

gradle/libs.versions.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ kotlinPoet = { module = "com.squareup:kotlinpoet", version = "2.2.0" }
77
grammarKitPlugin = { module = "org.jetbrains.intellij.plugins:gradle-grammarkit-plugin", version = "2023.3.0.1" }
88
intelliJ = { module = "com.jetbrains.intellij.platform:analysis-impl", version.ref = "intelliJ" }
99
coroutines = "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2"
10+
ktfmt = "com.facebook:ktfmt:0.59"
1011

1112
[plugins]
1213
kotlinJvm = { id = "org.jetbrains.kotlin.jvm", version = "2.2.21" }

0 commit comments

Comments
 (0)