From 07740ae83ca2bd852d6b843a178b78a568f7665c Mon Sep 17 00:00:00 2001
From: AntsyLich <59261191+AntsyLich@users.noreply.github.com>
Date: Sat, 15 Feb 2025 19:51:10 +0600
Subject: [PATCH] Add more editor configs and move ktlint config to it (#1731)

(cherry picked from commit 34d1e6fa278846dd8eb6ea82c936818d4610d3c2)

# Conflicts:
#	.editorconfig
#	buildSrc/src/main/kotlin/mihon.code.lint.gradle.kts
---
 .editorconfig                                 | 30 +++++++++++++++++--
 .../main/kotlin/mihon.code.lint.gradle.kts    | 11 -------
 2 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 21cab425f..68b71dea1 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,12 +1,32 @@
-[*.{kt,kts}]
-max_line_length = 120
-indent_size = 4
+root = true
+
+[*]
+charset = utf-8
+indent_size = 2
+indent_style = space
 insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.xml]
+indent_size = 4
+
+# noinspection EditorConfigKeyCorrectness
+[*.{kt,kts}]
+indent_size = 4
+max_line_length = 120
+
 ij_kotlin_allow_trailing_comma = true
 ij_kotlin_allow_trailing_comma_on_call_site = true
 ij_kotlin_name_count_to_use_star_import = 2147483647
 ij_kotlin_name_count_to_use_star_import_for_members = 2147483647
 
+ktlint_code_style = intellij_idea
+ktlint_function_naming_ignore_when_annotated_with = Composable
+ktlint_standard_class-signature = disabled
+ktlint_standard_discouraged-comment-location = disabled
+ktlint_standard_function-expression-body = disabled
+ktlint_standard_function-signature = disabled
+# SY
 ktlint_standard_filename = disabled
 ktlint_standard_argument-list-wrapping = disabled
 ktlint_standard_function-naming = disabled
@@ -14,3 +34,7 @@ ktlint_standard_property-naming = disabled
 ktlint_standard_multiline-expression-wrapping = disabled
 ktlint_standard_string-template-indent = disabled
 ktlint_standard_comment-wrapping = disabled
+ktlint_standard_max-line-length = disabled
+ktlint_standard_type-argument-comment = disabled
+ktlint_standard_value-argument-comment = disabled
+ktlint_standard_value-parameter-comment = disabled
diff --git a/buildSrc/src/main/kotlin/mihon.code.lint.gradle.kts b/buildSrc/src/main/kotlin/mihon.code.lint.gradle.kts
index 7225c180b..99c3e99a1 100644
--- a/buildSrc/src/main/kotlin/mihon.code.lint.gradle.kts
+++ b/buildSrc/src/main/kotlin/mihon.code.lint.gradle.kts
@@ -23,17 +23,6 @@ spotless {
         target("**/*.kt", "**/*.kts")
         targetExclude("**/build/**/*.kt")
         ktlint(libs.ktlint.core.get().version)
-            .editorConfigOverride(mapOf(
-                "ktlint_function_naming_ignore_when_annotated_with" to "Composable",
-                "ktlint_standard_class-signature" to "disabled",
-                "ktlint_standard_discouraged-comment-location" to "disabled",
-                "ktlint_standard_function-expression-body" to "disabled",
-                "ktlint_standard_function-signature" to "disabled",
-                "ktlint_standard_max-line-length" to "disabled",
-                "ktlint_standard_type-argument-comment" to "disabled",
-                "ktlint_standard_value-argument-comment" to "disabled",
-                "ktlint_standard_value-parameter-comment" to "disabled",
-            ))
         trimTrailingWhitespace()
         endWithNewline()
     }