From 37efcb4afc5ae9273fab57362b6a2f846c1d8639 Mon Sep 17 00:00:00 2001 From: Sergejs Luhmirins Date: Mon, 12 Jan 2026 16:40:31 +0200 Subject: [PATCH 1/3] MS-1289 Update lint rule configuration to stop forcing empty lines in when statements --- .editorconfig | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.editorconfig b/.editorconfig index 9446997321..01eaac72b2 100644 --- a/.editorconfig +++ b/.editorconfig @@ -19,6 +19,13 @@ ktlint_standard_annotation = disabled # If enabled, this rules forces any multiline assignment to the new line regardless of length ktlint_standard_multiline-expression-wrapping = disabled +# If enabled, this rules forces braces to all branches if any single one has them +ktlint_standard_when-entry-bracing = disabled + +# If enabled, this rule forces blank line between when branches if there is a single multiline branch +ktlint_standard_blank-line-between-when-conditions = disabled +ij_kotlin_line_break_after_multiline_when_entry = false + # Default allows the expression body to be a single call to a wrapper # function (e.g. `runTest{}`) without a line break ktlint_function_signature_body_expression_wrapping = default From 1a731b9e671000daadb3f48c5c34e6274e0578cd Mon Sep 17 00:00:00 2001 From: Sergejs Luhmirins Date: Mon, 12 Jan 2026 16:41:20 +0200 Subject: [PATCH 2/3] MS-1289 Allow long test function names with backticks --- .editorconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.editorconfig b/.editorconfig index 01eaac72b2..55b2141589 100644 --- a/.editorconfig +++ b/.editorconfig @@ -32,3 +32,6 @@ ktlint_function_signature_body_expression_wrapping = default # In tests star imports are fine since there could be lots helper functions ij_kotlin_packages_to_use_import_on_demand=androidx.test.**,io.mockk.**,com.google.common.truth.** + +# Backticked function names are only used in tests and those names can be very long +ktlint_ignore_back_ticked_identifier=true From cbd9a02690fe342def9d4040448fe6e40a4df031 Mon Sep 17 00:00:00 2001 From: Sergejs Luhmirins Date: Mon, 12 Jan 2026 16:41:42 +0200 Subject: [PATCH 3/3] MS-1289 Re-enable no unused import rule --- .editorconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.editorconfig b/.editorconfig index 55b2141589..d740210478 100644 --- a/.editorconfig +++ b/.editorconfig @@ -35,3 +35,6 @@ ij_kotlin_packages_to_use_import_on_demand=androidx.test.**,io.mockk.**,com.goog # Backticked function names are only used in tests and those names can be very long ktlint_ignore_back_ticked_identifier=true + +# Unused import deletion is disabled by default due to a issue with +ktlint_standard_no-unused-imports = enabled