From 417d3e2a05c31aa291cc38366b8ee05240122547 Mon Sep 17 00:00:00 2001 From: John Lillis Date: Tue, 10 Nov 2020 16:54:20 -0500 Subject: [PATCH 1/4] Add .editorconfig file --- .editorconfig | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 000000000..369380845 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,11 @@ +# top-most EditorConfig file +root = true + +[*] +insert_final_newline = true +trim_trailing_whitespace = true + +[*.lua] +indent_style = space +indent_size = 4 +end_of_line = crlf From 7d3ea49556c0dbc08430a2aed2dd5435b96bb82d Mon Sep 17 00:00:00 2001 From: John Lillis Date: Thu, 12 Nov 2020 21:08:09 -0500 Subject: [PATCH 2/4] Comment out eol definition in .gitattributes temporarily --- .gitattributes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitattributes b/.gitattributes index e3412b963..2c7c48b20 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,4 +1,4 @@ -* text=auto eol=lf +#* text=auto eol=lf # Ignored files by `git archive` /.github export-ignore From 0c0611046f6bb86f4c965dcd469f1db7fe7b726e Mon Sep 17 00:00:00 2001 From: John Lillis Date: Fri, 19 Mar 2021 14:45:27 -0400 Subject: [PATCH 3/4] Add charset, EOL, and js/css rules to .editorconfig --- .editorconfig | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.editorconfig b/.editorconfig index 369380845..0600cb9dc 100644 --- a/.editorconfig +++ b/.editorconfig @@ -2,10 +2,15 @@ root = true [*] +charset = utf-8 +end_of_line = crlf insert_final_newline = true trim_trailing_whitespace = true [*.lua] indent_style = space indent_size = 4 -end_of_line = crlf + +[*.{js,css}] +indent_style = space +indent_size = 2 From 9d63c7d22ba19a7b154d74e51800309d13824a16 Mon Sep 17 00:00:00 2001 From: John Lillis Date: Fri, 26 Mar 2021 00:48:25 -0400 Subject: [PATCH 4/4] Update line endings in .gitattributes to match --- .gitattributes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitattributes b/.gitattributes index 2c7c48b20..07d172fd9 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,4 +1,4 @@ -#* text=auto eol=lf +#* text=auto eol=crlf # Ignored files by `git archive` /.github export-ignore