From 475e4caffe5ecb1827549a59a7077d0a6bdbfd77 Mon Sep 17 00:00:00 2001 From: Volodymyr Buberenko Date: Mon, 27 Dec 2021 15:49:23 +0200 Subject: [PATCH 1/4] Update EditorConfig for different languages --- .editorconfig | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/.editorconfig b/.editorconfig index 7451d9ae75..0d32b7cc29 100644 --- a/.editorconfig +++ b/.editorconfig @@ -2,9 +2,22 @@ root = true [*] +end_of_line = lf +insert_final_newline = true +trim_trailing_whitespace = true + +[*.dart] indent_style = space indent_size = 2 -end_of_line = lf charset = utf-8 -trim_trailing_whitespace = true -insert_final_newline = true \ No newline at end of file + +# Groovy Gradle build scripts style (build.gradle files) +[*.gradle] +indent_style = space +indent_size = 4 +charset = utf-8 + +# Kotlin code style according to https://developer.android.com/kotlin/style-guide +[*.{kt,kts}] +indent_size=4 +max_line_length=100 From c9fc03abbf9d62506ebb40d9123f391ef52ba67f Mon Sep 17 00:00:00 2001 From: Volodymyr Buberenko Date: Tue, 28 Dec 2021 10:11:01 +0200 Subject: [PATCH 2/4] Fix config to have proper section definitions --- .editorconfig | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.editorconfig b/.editorconfig index 0d32b7cc29..1aa9c9963e 100644 --- a/.editorconfig +++ b/.editorconfig @@ -6,18 +6,18 @@ end_of_line = lf insert_final_newline = true trim_trailing_whitespace = true -[*.dart] +[**.dart] indent_style = space indent_size = 2 charset = utf-8 # Groovy Gradle build scripts style (build.gradle files) -[*.gradle] +[**.gradle] indent_style = space indent_size = 4 charset = utf-8 # Kotlin code style according to https://developer.android.com/kotlin/style-guide -[*.{kt,kts}] -indent_size=4 -max_line_length=100 +[**.{kt, kts}] +indent_size = 4 +max_line_length = 100 From 8fed16928e4cfc01825b7885ee9a2419bb34a815 Mon Sep 17 00:00:00 2001 From: Volodymyr Buberenko Date: Tue, 28 Dec 2021 10:18:32 +0200 Subject: [PATCH 3/4] Add YAML format to editorconfig --- .editorconfig | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.editorconfig b/.editorconfig index 1aa9c9963e..fb3b6dfb5a 100644 --- a/.editorconfig +++ b/.editorconfig @@ -6,18 +6,21 @@ end_of_line = lf insert_final_newline = true trim_trailing_whitespace = true -[**.dart] +[*.dart] indent_style = space indent_size = 2 charset = utf-8 # Groovy Gradle build scripts style (build.gradle files) -[**.gradle] +[*.gradle] indent_style = space indent_size = 4 charset = utf-8 # Kotlin code style according to https://developer.android.com/kotlin/style-guide -[**.{kt, kts}] +[*.{kt, kts}] indent_size = 4 max_line_length = 100 + +[*.yml] +indent_size = 2 \ No newline at end of file From 3fb80b80451a2765946cd701158e6dfffe635f62 Mon Sep 17 00:00:00 2001 From: Volodymyr Buberenko Date: Mon, 3 Jan 2022 13:16:55 +0200 Subject: [PATCH 4/4] Move charset property to a common part of editorconfig --- .editorconfig | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.editorconfig b/.editorconfig index fb3b6dfb5a..96eb00eff0 100644 --- a/.editorconfig +++ b/.editorconfig @@ -5,17 +5,16 @@ root = true end_of_line = lf insert_final_newline = true trim_trailing_whitespace = true +charset = utf-8 [*.dart] indent_style = space indent_size = 2 -charset = utf-8 # Groovy Gradle build scripts style (build.gradle files) [*.gradle] indent_style = space indent_size = 4 -charset = utf-8 # Kotlin code style according to https://developer.android.com/kotlin/style-guide [*.{kt, kts}] @@ -23,4 +22,4 @@ indent_size = 4 max_line_length = 100 [*.yml] -indent_size = 2 \ No newline at end of file +indent_size = 2