commit 2117132a29040d8429cdcad22bd6b9ad0a6b77f9
parent d5e01ec69f51016a618d80f9421ad5efc46b4e6c
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Date: Sat, 6 Dec 2025 16:45:08 +0000
Bug 2003775 - Use more consistent ktlint configs. r=android-reviewers,mcarare
Eventually we should unify them under a single shared config, but this at least
gets us using consistent rules across the different configs as a starting point.
Differential Revision: https://phabricator.services.mozilla.com/D274969
Diffstat:
4 files changed, 37 insertions(+), 57 deletions(-)
diff --git a/mobile/android/android-components/.editorconfig b/mobile/android/android-components/.editorconfig
@@ -6,37 +6,31 @@
root = True
-[*.kt]
+[*.{kt,kts}]
+ij_kotlin_allow_trailing_comma_on_call_site=true
+ij_kotlin_allow_trailing_comma=true
indent_size = 4
indent_style = space
+insert_final_newline = true
-ij_kotlin_allow_trailing_comma_on_call_site=true
-ij_kotlin_allow_trailing_comma=true
+ktlint_argument_list_wrapping_ignore_when_parameter_count_greater_or_equal_than = 13
ktlint_function_naming_ignore_when_annotated_with=Composable
-# disabled rules after 1.5.0 upgrade
+# disabled rules we should decide whether to enable or not
ktlint_standard_annotation = disabled
-ktlint_standard_argument-list-wrapping = disabled
ktlint_standard_blank-line-before-declaration = disabled
+ktlint_standard_blank-line-between-when-conditions = disabled
ktlint_standard_chain-method-continuation = disabled
ktlint_standard_class-signature = disabled
-ktlint_standard_condition-wrapping = disabled
ktlint_standard_enum-wrapping = disabled
ktlint_standard_function-expression-body = disabled
ktlint_standard_function-signature = disabled
+ktlint_standard_if-else-wrapping = disabled
ktlint_standard_indent = disabled
ktlint_standard_multiline-expression-wrapping = disabled
-ktlint_standard_no-blank-line-in-list = disabled
ktlint_standard_no-empty-first-line-in-class-body = disabled
-ktlint_standard_parameter-list-wrapping = disabled
ktlint_standard_statement-wrapping = disabled
ktlint_standard_string-template-indent = disabled
-
-ktlint_standard_if-else-wrapping = disabled
-ktlint_standard_multiline-if-else = disabled
-
-# disabled rules after 1.8.0 upgrade
-ktlint_standard_blank-line-between-when-conditions = disabled
ktlint_standard_when-entry-bracing = disabled
# rules that enforce style we don't want
diff --git a/mobile/android/fenix/.editorconfig b/mobile/android/fenix/.editorconfig
@@ -1,35 +1,26 @@
[*.{kt,kts}]
ij_kotlin_allow_trailing_comma_on_call_site=true
ij_kotlin_allow_trailing_comma=true
-
-[*]
insert_final_newline = true
+
+ktlint_argument_list_wrapping_ignore_when_parameter_count_greater_or_equal_than = 13
ktlint_function_naming_ignore_when_annotated_with=Composable
-# disabled rules after 1.5.0 upgrade
+# disabled rules we should decide whether to enable or not
ktlint_standard_annotation = disabled
-ktlint_standard_argument-list-wrapping = disabled
ktlint_standard_blank-line-before-declaration = disabled
+ktlint_standard_blank-line-between-when-conditions = disabled
ktlint_standard_chain-method-continuation = disabled
ktlint_standard_class-signature = disabled
+ktlint_standard_enum-wrapping = disabled
+ktlint_standard_function-expression-body = disabled
ktlint_standard_function-signature = disabled
+ktlint_standard_if-else-wrapping = disabled
ktlint_standard_indent = disabled
ktlint_standard_multiline-expression-wrapping = disabled
ktlint_standard_no-empty-first-line-in-class-body = disabled
-ktlint_standard_parameter-list-wrapping = disabled
ktlint_standard_statement-wrapping = disabled
ktlint_standard_string-template-indent = disabled
-ktlint_standard_condition-wrapping = disabled
-ktlint_standard_enum-wrapping = disabled
-ktlint_standard_function-expression-body = disabled
-ktlint_standard_no-blank-line-in-list = disabled
-
-ktlint_standard_property-wrapping = disabled
-ktlint_standard_no-empty-first-line-in-class-body = disabled
-ktlint_standard_if-else-wrapping = disabled
-
-# disabled rules after 1.8.0 upgrade
-ktlint_standard_blank-line-between-when-conditions = disabled
ktlint_standard_when-entry-bracing = disabled
# rules that enforce style we don't want
@@ -37,4 +28,3 @@ ktlint_standard_backing-property-naming = disabled # it would force making backe
ktlint_standard_expression-operand-wrapping = disabled # noisy and doesn't improve readability much
ktlint_standard_max-line-length = disabled # already enabled in detekt
ktlint_standard_no-consecutive-comments = disabled # it would limit one line comments to one per line
-
diff --git a/mobile/android/focus-android/.editorconfig b/mobile/android/focus-android/.editorconfig
@@ -1,34 +1,30 @@
[*.{kt,kts}]
ij_kotlin_allow_trailing_comma_on_call_site=true
ij_kotlin_allow_trailing_comma=true
+insert_final_newline = true
-ktlint_standard_filename = disabled
+ktlint_argument_list_wrapping_ignore_when_parameter_count_greater_or_equal_than = 13
ktlint_function_naming_ignore_when_annotated_with=Composable
-# disabled rules after 1.5.0 upgrade
+# disabled rules we should decide whether to enable or not
ktlint_standard_annotation = disabled
ktlint_standard_blank-line-before-declaration = disabled
+ktlint_standard_blank-line-between-when-conditions = disabled
ktlint_standard_chain-method-continuation = disabled
ktlint_standard_class-signature = disabled
+ktlint_standard_enum-wrapping = disabled
+ktlint_standard_function-expression-body = disabled
ktlint_standard_function-signature = disabled
+ktlint_standard_if-else-wrapping = disabled
ktlint_standard_indent = disabled
ktlint_standard_multiline-expression-wrapping = disabled
ktlint_standard_no-empty-first-line-in-class-body = disabled
-ktlint_standard_parameter-list-wrapping = disabled
ktlint_standard_statement-wrapping = disabled
ktlint_standard_string-template-indent = disabled
-ktlint_standard_function-expression-body = disabled
-ktlint_standard_enum-wrapping = disabled
-ktlint_standard_if-else-wrapping = disabled
-ktlint_standard_no-blank-line-in-list = disabled
-ktlint_standard_condition-wrapping = disabled
-
-# disabled rules after 1.8.0 upgrade
-ktlint_standard_blank-line-between-when-conditions = disabled
ktlint_standard_when-entry-bracing = disabled
# rules that enforce style we don't want
ktlint_standard_backing-property-naming = disabled # it would force making backed properties public.
ktlint_standard_expression-operand-wrapping = disabled # noisy and doesn't improve readability much
ktlint_standard_max-line-length = disabled # already enabled in detekt
-ktlint_standard_no-consecutive-comments = disabled # it would limit one line comments to one per line
-\ No newline at end of file
+ktlint_standard_no-consecutive-comments = disabled # it would limit one line comments to one per line
diff --git a/mobile/android/geckoview/.editorconfig b/mobile/android/geckoview/.editorconfig
@@ -1,30 +1,31 @@
root = True
-[*.kt]
-# disabled rules after 1.5.0 upgrade
+[*.{kt,kts}]
+ij_kotlin_allow_trailing_comma_on_call_site=true
+ij_kotlin_allow_trailing_comma=true
+insert_final_newline = true
+
+ktlint_argument_list_wrapping_ignore_when_parameter_count_greater_or_equal_than = 13
+
+# disabled rules we should decide whether to enable or not
ktlint_standard_annotation = disabled
-ktlint_standard_argument-list-wrapping = disabled
ktlint_standard_blank-line-before-declaration = disabled
+ktlint_standard_blank-line-between-when-conditions = disabled
ktlint_standard_chain-method-continuation = disabled
ktlint_standard_class-signature = disabled
ktlint_standard_enum-wrapping = disabled
-ktlint_standard_expression-operand-wrapping = disabled
ktlint_standard_function-expression-body = disabled
ktlint_standard_function-signature = disabled
ktlint_standard_if-else-wrapping = disabled
ktlint_standard_indent = disabled
-ktlint_standard_max-line-length = disabled
ktlint_standard_multiline-expression-wrapping = disabled
-ktlint_standard_no-consecutive-comments = disabled
ktlint_standard_no-empty-first-line-in-class-body = disabled
-ktlint_standard_property-naming = disabled
ktlint_standard_statement-wrapping = disabled
ktlint_standard_string-template-indent = disabled
-
-# disabled rules after 1.8.0 upgrade
-ktlint_standard_blank-line-between-when-conditions = disabled
ktlint_standard_when-entry-bracing = disabled
-# The following rules are different from the other projects
-ktlint_standard_no-single-line-block-comment = disabled
-ktlint_standard_try-catch-finally-spacing = disabled
+# rules that enforce style we don't want
+ktlint_standard_backing-property-naming = disabled # it would force making backed properties public.
+ktlint_standard_expression-operand-wrapping = disabled # noisy and doesn't improve readability much
+ktlint_standard_max-line-length = disabled # already enabled in detekt
+ktlint_standard_no-consecutive-comments = disabled # it would limit one line comments to one per line
