From 4a57f968f8f387ee209e22f1a89b01d2d2367bbd Mon Sep 17 00:00:00 2001 From: Philipp Date: Mon, 27 Feb 2023 19:51:03 +0100 Subject: [PATCH 1/4] Adapt .editorconfig for PHPStorm --- .editorconfig | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.editorconfig b/.editorconfig index 7692ac78..66406ca4 100644 --- a/.editorconfig +++ b/.editorconfig @@ -6,5 +6,13 @@ root = true [*] charset = utf-8 end_of_line = lf -trim_trailing_whitespaces = true indent_style = tab +trim_trailing_whitespace = true +insert_final_newline = true + +[*.yml] +indent_style = space +indent_size = 2 + +[composer.json] +indent_size = tab From ecdd62eb3cbcd742e9fbb2fc760d59621284083c Mon Sep 17 00:00:00 2001 From: Philipp Date: Mon, 27 Feb 2023 20:11:07 +0100 Subject: [PATCH 2/4] Revert quote_type --- .editorconfig | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.editorconfig b/.editorconfig index 66406ca4..c4555b08 100644 --- a/.editorconfig +++ b/.editorconfig @@ -9,6 +9,11 @@ end_of_line = lf indent_style = tab trim_trailing_whitespace = true insert_final_newline = true +quote_type = single + +[*.js] +quote_type = double +ij_javascript_use_double_quotes = true [*.yml] indent_style = space From c5d402ad62a7bc13a65d287e8f55d868ef168bbf Mon Sep 17 00:00:00 2001 From: Philipp Date: Mon, 27 Feb 2023 20:34:46 +0100 Subject: [PATCH 3/4] Adapt .editorconfig - Add .json rule - Add .xml rule --- .editorconfig | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.editorconfig b/.editorconfig index c4555b08..6287bcf4 100644 --- a/.editorconfig +++ b/.editorconfig @@ -10,6 +10,7 @@ indent_style = tab trim_trailing_whitespace = true insert_final_newline = true quote_type = single +max_line_length = off [*.js] quote_type = double @@ -19,5 +20,10 @@ ij_javascript_use_double_quotes = true indent_style = space indent_size = 2 -[composer.json] -indent_size = tab +[*.xml] +indent_style = space +indent_size = 4 + +[*.json] +indent_style = space +indent_size = 2 From 92c3d0cf6c54fa528e7335fb99bf7c99313ff320 Mon Sep 17 00:00:00 2001 From: Philipp Date: Mon, 27 Feb 2023 20:57:18 +0100 Subject: [PATCH 4/4] ident_size 2 is better for XML readability :) --- .editorconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.editorconfig b/.editorconfig index 6287bcf4..8565b274 100644 --- a/.editorconfig +++ b/.editorconfig @@ -22,7 +22,7 @@ indent_size = 2 [*.xml] indent_style = space -indent_size = 4 +indent_size = 2 [*.json] indent_style = space