From cf42b687e6698029ea23a3b6df0b5ad0a0b40632 Mon Sep 17 00:00:00 2001 From: Angelo Suzuki <1063155+tinsukE@users.noreply.github.com> Date: Wed, 16 Aug 2023 20:28:19 +0200 Subject: [PATCH] Kotlin - Enable trailing comma --- .editorconfig | 4 +++- .../java/com/keylesspalace/tusky/components/report/Screen.kt | 2 +- .../tusky/components/scheduled/ScheduledStatusActivity.kt | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.editorconfig b/.editorconfig index 47d830da0..499ac15ad 100644 --- a/.editorconfig +++ b/.editorconfig @@ -7,11 +7,13 @@ indent_style = space insert_final_newline = true trim_trailing_whitespace = true +[*.{java,kt}] # Disable wildcard imports -[*.{java, kt}] ij_kotlin_name_count_to_use_star_import = 999 ij_kotlin_name_count_to_use_star_import_for_members = 999 ij_java_class_count_to_use_import_on_demand = 999 +# Enable trailing comma +ktlint_disabled_rules=trailing-comma-on-call-site,trailing-comma-on-declaration-site [*.{yml,yaml}] indent_size = 2 diff --git a/app/src/main/java/com/keylesspalace/tusky/components/report/Screen.kt b/app/src/main/java/com/keylesspalace/tusky/components/report/Screen.kt index fb0b15cae..e3c5c197d 100644 --- a/app/src/main/java/com/keylesspalace/tusky/components/report/Screen.kt +++ b/app/src/main/java/com/keylesspalace/tusky/components/report/Screen.kt @@ -20,5 +20,5 @@ enum class Screen { Note, Done, Back, - Finish + Finish, } diff --git a/app/src/main/java/com/keylesspalace/tusky/components/scheduled/ScheduledStatusActivity.kt b/app/src/main/java/com/keylesspalace/tusky/components/scheduled/ScheduledStatusActivity.kt index a53c08928..38df7fd4a 100644 --- a/app/src/main/java/com/keylesspalace/tusky/components/scheduled/ScheduledStatusActivity.kt +++ b/app/src/main/java/com/keylesspalace/tusky/components/scheduled/ScheduledStatusActivity.kt @@ -163,8 +163,8 @@ class ScheduledStatusActivity : visibility = item.params.visibility, scheduledAt = item.scheduledAt, sensitive = item.params.sensitive, - kind = ComposeActivity.ComposeKind.EDIT_SCHEDULED - ) + kind = ComposeActivity.ComposeKind.EDIT_SCHEDULED, + ), ) startActivity(intent) }