summaryrefslogtreecommitdiff
path: root/.editorconfig
diff options
context:
space:
mode:
authorPeter Kokot <peterkokot@gmail.com>2019-06-09 22:53:58 +0200
committerPeter Kokot <peterkokot@gmail.com>2019-06-09 22:53:58 +0200
commit65ada393602ad6125928c33a5c18dd05c84c29fa (patch)
tree0e81b7e6c93f5772a7373ae68614940da7e2f9b0 /.editorconfig
parent10b208f28dd14b57c7d86ccad90a8cd386482e89 (diff)
downloadphp-git-65ada393602ad6125928c33a5c18dd05c84c29fa.tar.gz
Extend wildcard files section in EditorConfig [ci skip]
Changes: - Trim trailing whitespace for all files except patches. There isn't really any practical reason to not trim the trailing whitespace in all other files. Binary files or phpt files that include trailing whitespace as part of the test should be manually set in editors/IDEs or by disabling the editorconfig for particular editing. - Add *.ac, *.d, *.l, *.skl, *.re, *.wsdl, *.dtd, *.html, *.rng, *.xml, *.xsd, *.xsl, buildconf, and Makefile* files settings. Closes #4156
Diffstat (limited to '.editorconfig')
-rw-r--r--.editorconfig33
1 files changed, 10 insertions, 23 deletions
diff --git a/.editorconfig b/.editorconfig
index ff806cb98a..fae8810f15 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -3,45 +3,32 @@
root = true
[*]
+trim_trailing_whitespace = true
+insert_final_newline = true
+end_of_line = lf
+charset = utf-8
tab_width = 4
-[*.{c,h,y,awk,w32,bat,mk,frag,cpp}]
-charset = utf-8
-end_of_line = lf
+[{*.{awk,bat,c,cpp,d,h,l,mk,re,skl,w32,y},Makefile*}]
indent_size = 4
indent_style = tab
-trim_trailing_whitespace = true
-insert_final_newline = true
-[*.{php,phpt,inc}]
-charset = utf-8
-end_of_line = lf
+[*.{dtd,html,inc,php,phpt,rng,wsdl,xml,xsd,xsl}]
indent_size = 4
indent_style = space
-trim_trailing_whitespace = true
-insert_final_newline = true
-[*.{yml,m4,sh}]
-charset = utf-8
-end_of_line = lf
+[*.{ac,m4,sh,yml}]
indent_size = 2
indent_style = space
-trim_trailing_whitespace = true
-insert_final_newline = true
[*.md]
-charset = utf-8
-end_of_line = lf
indent_style = space
-trim_trailing_whitespace = true
-insert_final_newline = true
max_line_length = 80
[COMMIT_EDITMSG]
-charset = utf-8
-end_of_line = lf
indent_size = 4
indent_style = space
-trim_trailing_whitespace = true
-insert_final_newline = true
max_line_length = 80
+
+[*.patch]
+trim_trailing_whitespace = false