Skip to content

Commit 72de224

Browse files
[tool] Add Kotlin autoformatting (flutter#5374)
Updates the tooling to fetch and use `ktfmt` for Kotlin code, the same way it currently does for the Google Java formatter, and applies that formatting (in the default mode; see discussion in the linked issue) to the repository. In the future we could revisit the formatter or mode, but since this currently seems to be the most consistent with our other languages and to google3 formatting this is likely the option we'll want to stick with. Fixes flutter/flutter#118756
1 parent 17bd92e commit 72de224

File tree

31 files changed

+1819
-1263
lines changed

31 files changed

+1819
-1263
lines changed

.ci.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,10 +131,11 @@ targets:
131131
target_file: repo_checks.yaml
132132
channel: master
133133
version_file: flutter_master.version
134-
# The format check requires clang-format.
134+
# The format check requires clang-format, and the current version of ktfmt requires JDK 11+.
135135
dependencies: >-
136136
[
137-
{"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"}
137+
{"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
138+
{"dependency": "open_jdk", "version": "version:17"}
138139
]
139140
140141
- name: Linux dart_unit_test_shard_1 master

packages/animations/example/android/app/src/main/kotlin/dev/flutter/packages/animations/example/MainActivity.kt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,4 @@ package dev.flutter.packages.animations.example
55

66
import io.flutter.embedding.android.FlutterActivity
77

8-
class MainActivity: FlutterActivity() {
9-
10-
}
8+
class MainActivity : FlutterActivity() {}

packages/dynamic_layouts/example/android/app/src/main/kotlin/com/example/example/MainActivity.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,4 @@ package com.example.example
55

66
import io.flutter.embedding.android.FlutterActivity
77

8-
class MainActivity: FlutterActivity() {
9-
}
8+
class MainActivity : FlutterActivity() {}

packages/file_selector/file_selector/example/android/app/src/main/kotlin/dev/flutter/plugins/file_selector_example/MainActivity.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,4 @@ package dev.flutter.plugins.file_selector_example
66

77
import io.flutter.embedding.android.FlutterActivity
88

9-
class MainActivity: FlutterActivity() {
10-
}
9+
class MainActivity : FlutterActivity() {}

packages/flutter_adaptive_scaffold/example/android/app/src/main/kotlin/dev/flutter/example/MainActivity.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,4 @@ package dev.flutter.example
66

77
import io.flutter.embedding.android.FlutterActivity
88

9-
class MainActivity: FlutterActivity() {
10-
}
9+
class MainActivity : FlutterActivity() {}

packages/flutter_image/example/android/app/src/main/kotlin/com/example/example/MainActivity.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,4 @@ package com.example.example
66

77
import io.flutter.embedding.android.FlutterActivity
88

9-
class MainActivity: FlutterActivity() {
10-
}
9+
class MainActivity : FlutterActivity() {}

packages/flutter_markdown/example/android/app/src/main/kotlin/io/flutter/packages/flutter_markdown_example/MainActivity.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,4 @@ package io.flutter.packages.flutter_markdown_example
55

66
import io.flutter.embedding.android.FlutterActivity
77

8-
class MainActivity: FlutterActivity() {
9-
}
8+
class MainActivity : FlutterActivity() {}

packages/go_router/example/android/app/src/main/kotlin/com/example/example/MainActivity.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,4 @@ package com.example.example
66

77
import io.flutter.embedding.android.FlutterActivity
88

9-
class MainActivity: FlutterActivity() {
10-
}
9+
class MainActivity : FlutterActivity() {}

packages/palette_generator/example/android/app/src/main/kotlin/io/flutter/packages/palettegenerator/example/MainActivity.kt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,4 @@ package io.flutter.packages.palettegenerator.imagecolors
55

66
import io.flutter.embedding.android.FlutterActivity
77

8-
class MainActivity: FlutterActivity() {
9-
10-
}
8+
class MainActivity : FlutterActivity() {}

packages/pigeon/example/README.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -146,14 +146,14 @@ private class PigeonApiImplementation: ExampleHostApi {
146146
### Kotlin
147147
<?code-excerpt "android/app/src/main/kotlin/dev/flutter/pigeon_example_app/MainActivity.kt (kotlin-class)"?>
148148
```kotlin
149-
private class PigeonApiImplementation: ExampleHostApi {
149+
private class PigeonApiImplementation : ExampleHostApi {
150150
override fun getHostLanguage(): String {
151151
return "Kotlin"
152152
}
153153

154154
override fun add(a: Long, b: Long): Long {
155155
if (a < 0L || b < 0L) {
156-
throw FlutterError("code", "message", "details");
156+
throw FlutterError("code", "message", "details")
157157
}
158158
return a + b
159159
}
@@ -258,9 +258,7 @@ private class PigeonFlutterApi {
258258
}
259259

260260
fun callFlutterMethod(aString: String, callback: (Result<String>) -> Unit) {
261-
flutterApi!!.flutterMethod(aString) {
262-
echo -> callback(Result.success(echo))
263-
}
261+
flutterApi!!.flutterMethod(aString) { echo -> callback(Result.success(echo)) }
264262
}
265263
}
266264
```

0 commit comments

Comments
 (0)