style [*]: restore the Kotlin code style that was agreed upon previously

The old format was overridden by old Kotlin default format during editorconfig migration, which caused line wrapping to be disabled

This commit moves all Kotlin codestyle configuration to editorconfig, which becomes the single source of truth

GitOrigin-RevId: 91451d14417f3981dd44809e1f9873df520fe8b0
This commit is contained in:
Ivan Semenov
2025-12-02 13:25:31 +00:00
committed by intellij-monorepo-bot
parent e9f5be1ee7
commit 29a87e4f7f
2 changed files with 25 additions and 33 deletions
+25 -1
View File
@@ -15,4 +15,28 @@ ij_any_block_comment_at_first_column = false
ij_any_line_comment_at_first_column = false
ij_javascript_force_semicolon_style = true
ij_javascript_use_semicolon_after_statement = false
ij_kotlin_code_style_defaults = KOTLIN_OLD_DEFAULTS
;======Kotlin=====
[{*.kt,*.kts}]
ij_kotlin_code_style_defaults = KOTLIN_OFFICIAL
ij_kotlin_else_on_new_line = true
ij_kotlin_while_on_new_line = true
ij_kotlin_catch_on_new_line = true
ij_kotlin_finally_on_new_line = true
ij_kotlin_line_break_after_multiline_when_entry = false
; should break, but it is not configurable for now
ij_kotlin_align_multiline_binary_operation = true
ij_kotlin_align_multiline_parameters_in_calls = true
ij_kotlin_align_multiline_extends_list = true
; so that a comma is appended to the multiline function parameter list
ij_kotlin_allow_trailing_comma = true
; the official styleguide forces newlines and we don't want to reformat the whole repo
ij_kotlin_call_parameters_right_paren_on_new_line = unset
ij_kotlin_call_parameters_new_line_after_left_paren = unset
ij_kotlin_if_rparen_on_new_line = unset
;=====Kotlin=====
-32
View File
@@ -34,18 +34,6 @@
<package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
</value>
</option>
<option name="LINE_BREAK_AFTER_MULTILINE_WHEN_ENTRY" value="false" />
<option name="CONTINUATION_INDENT_IN_PARAMETER_LISTS" value="false" />
<option name="CONTINUATION_INDENT_IN_ARGUMENT_LISTS" value="false" />
<option name="CONTINUATION_INDENT_FOR_EXPRESSION_BODIES" value="false" />
<option name="CONTINUATION_INDENT_FOR_CHAINED_CALLS" value="false" />
<option name="CONTINUATION_INDENT_IN_SUPERTYPE_LISTS" value="false" />
<option name="CONTINUATION_INDENT_IN_IF_CONDITIONS" value="false" />
<option name="CONTINUATION_INDENT_IN_ELVIS" value="false" />
<option name="WRAP_EXPRESSION_BODY_FUNCTIONS" value="1" />
<option name="IF_RPAREN_ON_NEW_LINE" value="true" />
<option name="ALLOW_TRAILING_COMMA" value="true" />
<option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OLD_DEFAULTS" />
</JetCodeStyleSettings>
<Properties>
<option name="KEEP_BLANK_LINES" value="true" />
@@ -438,25 +426,5 @@
<option name="WHILE_BRACE_FORCE" value="1" />
<option name="FOR_BRACE_FORCE" value="1" />
</codeStyleSettings>
<codeStyleSettings language="kotlin">
<option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OLD_DEFAULTS" />
<option name="LINE_COMMENT_AT_FIRST_COLUMN" value="false" />
<option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
<option name="ELSE_ON_NEW_LINE" value="true" />
<option name="WHILE_ON_NEW_LINE" value="true" />
<option name="CATCH_ON_NEW_LINE" value="true" />
<option name="FINALLY_ON_NEW_LINE" value="true" />
<option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
<option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
<option name="ALIGN_MULTILINE_EXTENDS_LIST" value="true" />
<option name="CALL_PARAMETERS_WRAP" value="1" />
<option name="METHOD_PARAMETERS_WRAP" value="5" />
<option name="FIELD_ANNOTATION_WRAP" value="0" />
<indentOptions>
<option name="INDENT_SIZE" value="2" />
<option name="CONTINUATION_INDENT_SIZE" value="2" />
<option name="TAB_SIZE" value="2" />
</indentOptions>
</codeStyleSettings>
</code_scheme>
</component>