fix(style): better .editorconfig

.editorconfig

@@ -4,24 +4,17 @@ root = true
 
 # Unix-style newlines with a newline ending every file
 [*]
+charset = utf-8
 end_of_line = lf
-insert_final_newline = true
-indent_style = space
 indent_size = 4
-
-# Whitespace at the end of lines
+indent_style = space
+insert_final_newline = true
 trim_trailing_whitespace = true
 
-# Matches multiple files with brace expansion notation
-# Set default charset
-[*.{js,json}]
-charset = utf-8
-indent_size = 2
-
-[*.py]
-charset = utf-8
+[*.{bat,cmd,ps1}]
+end_of_line = crlf
 
-[*.{yml,yaml,md,rb}]
+[*.{js,json,json5,yml,yaml,md,rb}]
 indent_size = 2
 
 [Makefile]

src/nitpick/resources/any/editorconfig.toml

@@ -8,24 +8,17 @@ root = true
 
 [".editorconfig"."*"]
 # Unix-style newlines with a newline ending every file
+charset = "utf-8"
 end_of_line = "lf"
-insert_final_newline = true
-indent_style = "space"
 indent_size = 4
-
-# Whitespace at the end of lines
+indent_style = "space"
+insert_final_newline = true
 trim_trailing_whitespace = true
 
-# Matches multiple files with brace expansion notation
-# Set default charset
-[".editorconfig"."*.{js,json}"]
-charset = "utf-8"
-indent_size = 2
-
-[".editorconfig"."*.py"]
-charset = "utf-8"
+[".editorconfig"."*.{bat,cmd,ps1}"]
+end_of_line = "crlf"
 
-[".editorconfig"."*.{yml,yaml,md,rb}"]
+[".editorconfig"."*.{js,json,json5,yml,yaml,md,rb}"]
 indent_size = 2
 
 [".editorconfig".Makefile]

tests/test_builtin/any/editorconfig/.editorconfig

@@ -1,20 +1,17 @@
 root = True
 
 [*]
+charset = utf-8
 end_of_line = lf
-insert_final_newline = True
-indent_style = space
 indent_size = 4
+indent_style = space
+insert_final_newline = True
 trim_trailing_whitespace = True
 
-[*.py]
-charset = utf-8
-
-[*.{js,json}]
-charset = utf-8
-indent_size = 2
+[*.{bat,cmd,ps1}]
+end_of_line = crlf
 
-[*.{yml,yaml,md,rb}]
+[*.{js,json,json5,yml,yaml,md,rb}]
 indent_size = 2
 
 [Makefile]