From 036eda5cac32a0cf2cd44ddadb2cab127a775f4d Mon Sep 17 00:00:00 2001 From: Richard J Hancock Date: Fri, 20 Sep 2024 16:44:15 -0500 Subject: [PATCH] Adjusted to 140 width. Added config for XML, MTF, and BLK as a precaution --- .editorconfig | 19 +- megamek/config/checkstyle/checkstyle.xml | 702 +++++++++++------------ 2 files changed, 369 insertions(+), 352 deletions(-) diff --git a/.editorconfig b/.editorconfig index 60d4a95d05c..274d11b5d75 100644 --- a/.editorconfig +++ b/.editorconfig @@ -7,10 +7,27 @@ indent_size = 4 end_of_line = lf trim_trailing_whitespace = true insert_final_newline = true -max_line_length = 100 # Google Style Guide +max_line_length = 140 # Google Style Guide curly_bracket_next_line = false spaces_around_operators = true spaces_around_brackets = "both" indent_brace_style = "K&R" wildcard_import_limit = 10 continuation_indent_size = 4 # Google Style Guid + +[*.xml] +indent_style = "space" +indent_size = 4 +end_of_line = lf +trim_trailing_whitespace = true +insert_final_newline = true + +[*.blk] +end_of_line = lf +trim_trailing_whitespace = true +insert_final_newline = true + +[*.mtf] +end_of_line = lf +trim_trailing_whitespace = true +insert_final_newline = true diff --git a/megamek/config/checkstyle/checkstyle.xml b/megamek/config/checkstyle/checkstyle.xml index 72a7eeb7379..3ed9c8d6b7c 100644 --- a/megamek/config/checkstyle/checkstyle.xml +++ b/megamek/config/checkstyle/checkstyle.xml @@ -19,116 +19,114 @@ https://raw.githubusercontent.com/checkstyle/checkstyle/master/src/main/resource --> + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + - - - - - + - - - - - - + + + + - - - - + + + + + + - - - - + + + + + - - + + + + + - - + + + + + + + + + + + + + + + + + + + + + - - - - + + - - - - - + + + - - - - - - - - + + + + + + - - - - - - - - - + + + + + + + - - - - - - + + + + - - - - + + - - - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + - - - + - - - - + + + - - - - + + - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + - - - - + + - - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + -