summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Brassel <nick@tzarc.org>2024-03-02 23:23:34 +1100
committerGitHub <noreply@github.com>2024-03-02 23:23:34 +1100
commit21276de7d5331a0e8ff9b27a732264a70bdf8007 (patch)
treeae69ca19b7fce851eeded8fd386e0f299a7714e9
parentc06087669290fe72d5fb85c7b37d20cf5ebe149d (diff)
Normalise .editorconfig. (#23186)
-rw-r--r--.editorconfig46
1 files changed, 23 insertions, 23 deletions
diff --git a/.editorconfig b/.editorconfig
index 60827f04ba..3a537d01b2 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -4,39 +4,39 @@
root = true
[*]
+end_of_line = lf
indent_style = space
indent_size = 4
-
-# We recommend you to keep these unchanged
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
+[{*.yaml,*.yml}] # To match GitHub Actions formatting
+indent_size = 2
+
[*.md]
trim_trailing_whitespace = false
-indent_size = 4
-
-[{qmk,*.py}]
-charset = utf-8
-max_line_length = 200
-
-# Make these match what we have in .gitattributes
-[*.mk]
-end_of_line = lf
-indent_style = tab
-[Makefile]
-end_of_line = lf
+[{Makefile,*.mk}]
indent_style = tab
-[*.sh]
-end_of_line = lf
-
-# The gitattributes file will handle the line endings conversion properly according to the operating system settings for other files
-
-
-# We don't have gitattributes properly for these
-# So if the user have for example core.autocrlf set to true
-# the line endings would be wrong.
+# Don't override anything in `lib/`...
[lib/**]
+indent_style = unset
+indent_size = unset
+tab_width = unset
end_of_line = unset
+charset = unset
+spelling_language = unset
+trim_trailing_whitespace = unset
+insert_final_newline = unset
+
+# ...except QMK's `lib/python`.
+[{*.py,lib/python/**.py}]
+end_of_line = lf
+indent_style = space
+indent_size = 4
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+max_line_length = 200