Skip to content

Commit 56a15d1

Browse files
AntsyLichcuong-tran
authored andcommitted
Add more editor configs and move ktlint config to it (mihonapp/mihon#1731)
(cherry picked from commit 34d1e6fa278846dd8eb6ea82c936818d4610d3c2)
1 parent 20d0b87 commit 56a15d1

File tree

2 files changed

+21
-20
lines changed

2 files changed

+21
-20
lines changed

.editorconfig

+21-9
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,28 @@
1+
root = true
2+
3+
[*]
4+
charset = utf-8
5+
indent_size = 2
6+
indent_style = space
7+
insert_final_newline = true
8+
trim_trailing_whitespace = true
9+
10+
[*.xml]
11+
indent_size = 4
12+
13+
# noinspection EditorConfigKeyCorrectness
114
[*.{kt,kts}]
2-
max_line_length = 120
315
indent_size = 4
4-
insert_final_newline = true
16+
max_line_length = 120
17+
518
ij_kotlin_allow_trailing_comma = true
619
ij_kotlin_allow_trailing_comma_on_call_site = true
720
ij_kotlin_name_count_to_use_star_import = 2147483647
821
ij_kotlin_name_count_to_use_star_import_for_members = 2147483647
922

10-
ktlint_standard_filename = disabled
11-
ktlint_standard_argument-list-wrapping = disabled
12-
ktlint_standard_function-naming = disabled
13-
ktlint_standard_property-naming = disabled
14-
ktlint_standard_multiline-expression-wrapping = disabled
15-
ktlint_standard_string-template-indent = disabled
16-
ktlint_standard_comment-wrapping = disabled
23+
ktlint_code_style = intellij_idea
24+
ktlint_function_naming_ignore_when_annotated_with = Composable
25+
ktlint_standard_class-signature = disabled
26+
ktlint_standard_discouraged-comment-location = disabled
27+
ktlint_standard_function-expression-body = disabled
28+
ktlint_standard_function-signature = disabled

buildSrc/src/main/kotlin/mihon.code.lint.gradle.kts

-11
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,6 @@ spotless {
2323
target("**/*.kt", "**/*.kts")
2424
targetExclude("**/build/**/*.kt")
2525
ktlint(libs.ktlint.core.get().version)
26-
.editorConfigOverride(mapOf(
27-
"ktlint_function_naming_ignore_when_annotated_with" to "Composable",
28-
"ktlint_standard_class-signature" to "disabled",
29-
"ktlint_standard_discouraged-comment-location" to "disabled",
30-
"ktlint_standard_function-expression-body" to "disabled",
31-
"ktlint_standard_function-signature" to "disabled",
32-
"ktlint_standard_max-line-length" to "disabled",
33-
"ktlint_standard_type-argument-comment" to "disabled",
34-
"ktlint_standard_value-argument-comment" to "disabled",
35-
"ktlint_standard_value-parameter-comment" to "disabled",
36-
))
3726
trimTrailingWhitespace()
3827
endWithNewline()
3928
}

0 commit comments

Comments
 (0)