From 32a270c7a767df7eb54f1412ec0f33545ad91f38 Mon Sep 17 00:00:00 2001 From: MrJeremyFisher Date: Fri, 21 Jun 2024 17:49:37 -0400 Subject: [PATCH] Standardize editorconfig --- plugins/{civmodcore-paper => }/.editorconfig | 8 +-- plugins/essenceglue-paper/.editorconfig | 21 ------- plugins/factorymod-paper/.editorconfig | 25 --------- plugins/finale-paper/.editorconfig | 58 -------------------- plugins/hiddenore-paper/.editorconfig | 25 --------- plugins/railswitch-paper/.editorconfig | 16 ------ 6 files changed, 2 insertions(+), 151 deletions(-) rename plugins/{civmodcore-paper => }/.editorconfig (92%) delete mode 100644 plugins/essenceglue-paper/.editorconfig delete mode 100644 plugins/factorymod-paper/.editorconfig delete mode 100644 plugins/finale-paper/.editorconfig delete mode 100644 plugins/hiddenore-paper/.editorconfig delete mode 100644 plugins/railswitch-paper/.editorconfig diff --git a/plugins/civmodcore-paper/.editorconfig b/plugins/.editorconfig similarity index 92% rename from plugins/civmodcore-paper/.editorconfig rename to plugins/.editorconfig index 2305ab84f..1eb461bec 100644 --- a/plugins/civmodcore-paper/.editorconfig +++ b/plugins/.editorconfig @@ -6,11 +6,10 @@ root = true # Unix-style newlines with a newline ending every file [*] charset = utf-8 -indent_style = tab +indent_style = space indent_size = 4 end_of_line = lf insert_final_newline = true -continuation_indent_size = 8 ij_continuation_indent_size = 4 ij_formatter_off_tag = @formatter:off @@ -30,11 +29,9 @@ ij_java_names_count_to_use_import_on_demand = 999 ij_java_use_single_class_imports = true [*.java] -indent_style = tab -indent_size = 4 ij_java_imports_layout = -[*.{xml, yml}] +[*.{xml,yml}] indent_style = space indent_size = 2 @@ -50,7 +47,6 @@ end_of_line = crlf [*.sh] end_of_line = lf - [*.properties] ij_properties_align_group_field_declarations = false ij_properties_keep_blank_lines = false diff --git a/plugins/essenceglue-paper/.editorconfig b/plugins/essenceglue-paper/.editorconfig deleted file mode 100644 index bbdd807d0..000000000 --- a/plugins/essenceglue-paper/.editorconfig +++ /dev/null @@ -1,21 +0,0 @@ -# Editorconfig is awesome: http://EditorConfig.org - -# top-most EditorConfig file -root = true - -# Unix-style newlines with a newline ending every file -[*] -charset = utf-8 -indent_style = tab -end_of_line = lf -insert_final_newline = true - -[*.java] -indent_style = tab - -[*.{xml, yml}] -indent_style = space -indent_size = 2 - -[*.csv] -insert_final_newline = false diff --git a/plugins/factorymod-paper/.editorconfig b/plugins/factorymod-paper/.editorconfig deleted file mode 100644 index 9887763dc..000000000 --- a/plugins/factorymod-paper/.editorconfig +++ /dev/null @@ -1,25 +0,0 @@ -# Editorconfig is awesome: http://EditorConfig.org - -# top-most EditorConfig file -root = true - -# Unix-style newlines with a newline ending every file -[*] -charset = utf-8 -indent_style = tab -indent_size = 4 -end_of_line = lf -insert_final_newline = true -continuation_indent_size = 8 - -[*.java] -indent_style = tab -indent_size = 4 - -[*.xml] -indent_style = tab -indent_size = 2 - -[*.yml] -indent_style = space -indent_size = 2 diff --git a/plugins/finale-paper/.editorconfig b/plugins/finale-paper/.editorconfig deleted file mode 100644 index 2305ab84f..000000000 --- a/plugins/finale-paper/.editorconfig +++ /dev/null @@ -1,58 +0,0 @@ -# Editorconfig is awesome: http://EditorConfig.org - -# top-most EditorConfig file -root = true - -# Unix-style newlines with a newline ending every file -[*] -charset = utf-8 -indent_style = tab -indent_size = 4 -end_of_line = lf -insert_final_newline = true -continuation_indent_size = 8 - -ij_continuation_indent_size = 4 -ij_formatter_off_tag = @formatter:off -ij_formatter_on_tag = @formatter:on -ij_formatter_tags_enabled = false -ij_smart_tabs = false -ij_wrap_on_typing = false -ij_java_blank_lines_after_imports = 1 -ij_java_blank_lines_after_package = 1 -ij_java_blank_lines_after_anonymous_class_header = 0 -ij_java_blank_lines_after_class_header = 1 -ij_java_blank_lines_before_imports = 1 -ij_java_class_count_to_use_import_on_demand = 999 -ij_java_imports_layout = $*,|,* -ij_java_layout_static_imports_separately = true -ij_java_names_count_to_use_import_on_demand = 999 -ij_java_use_single_class_imports = true - -[*.java] -indent_style = tab -indent_size = 4 -ij_java_imports_layout = - -[*.{xml, yml}] -indent_style = space -indent_size = 2 - -[*.csv] -insert_final_newline = false - -[*.md] -trim_trailing_whitespace = false - -[*.{cmd,bat}] -end_of_line = crlf - -[*.sh] -end_of_line = lf - - -[*.properties] -ij_properties_align_group_field_declarations = false -ij_properties_keep_blank_lines = false -ij_properties_key_value_delimiter = equals -ij_properties_spaces_around_key_value_delimiter = false diff --git a/plugins/hiddenore-paper/.editorconfig b/plugins/hiddenore-paper/.editorconfig deleted file mode 100644 index 9887763dc..000000000 --- a/plugins/hiddenore-paper/.editorconfig +++ /dev/null @@ -1,25 +0,0 @@ -# Editorconfig is awesome: http://EditorConfig.org - -# top-most EditorConfig file -root = true - -# Unix-style newlines with a newline ending every file -[*] -charset = utf-8 -indent_style = tab -indent_size = 4 -end_of_line = lf -insert_final_newline = true -continuation_indent_size = 8 - -[*.java] -indent_style = tab -indent_size = 4 - -[*.xml] -indent_style = tab -indent_size = 2 - -[*.yml] -indent_style = space -indent_size = 2 diff --git a/plugins/railswitch-paper/.editorconfig b/plugins/railswitch-paper/.editorconfig deleted file mode 100644 index c6bb9baec..000000000 --- a/plugins/railswitch-paper/.editorconfig +++ /dev/null @@ -1,16 +0,0 @@ -# Editorconfig is awesome: http://EditorConfig.org - -# top-most EditorConfig file -root = true - -# Unix-style newlines with a newline ending every file -[*] -charset = utf-8 -indent_style = space -indent_size = 4 -end_of_line = crlf -insert_final_newline = true -continuation_indent_size = 8 - -[{*.xml, *.yml}] -indent_size = 2