Skip to content

Commit 65ada39

Browse files
committed
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
1 parent 10b208f commit 65ada39

File tree

1 file changed

+10
-23
lines changed

1 file changed

+10
-23
lines changed

.editorconfig

Lines changed: 10 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3,45 +3,32 @@
33
root = true
44

55
[*]
6+
trim_trailing_whitespace = true
7+
insert_final_newline = true
8+
end_of_line = lf
9+
charset = utf-8
610
tab_width = 4
711

8-
[*.{c,h,y,awk,w32,bat,mk,frag,cpp}]
9-
charset = utf-8
10-
end_of_line = lf
12+
[{*.{awk,bat,c,cpp,d,h,l,mk,re,skl,w32,y},Makefile*}]
1113
indent_size = 4
1214
indent_style = tab
13-
trim_trailing_whitespace = true
14-
insert_final_newline = true
1515

16-
[*.{php,phpt,inc}]
17-
charset = utf-8
18-
end_of_line = lf
16+
[*.{dtd,html,inc,php,phpt,rng,wsdl,xml,xsd,xsl}]
1917
indent_size = 4
2018
indent_style = space
21-
trim_trailing_whitespace = true
22-
insert_final_newline = true
2319

24-
[*.{yml,m4,sh}]
25-
charset = utf-8
26-
end_of_line = lf
20+
[*.{ac,m4,sh,yml}]
2721
indent_size = 2
2822
indent_style = space
29-
trim_trailing_whitespace = true
30-
insert_final_newline = true
3123

3224
[*.md]
33-
charset = utf-8
34-
end_of_line = lf
3525
indent_style = space
36-
trim_trailing_whitespace = true
37-
insert_final_newline = true
3826
max_line_length = 80
3927

4028
[COMMIT_EDITMSG]
41-
charset = utf-8
42-
end_of_line = lf
4329
indent_size = 4
4430
indent_style = space
45-
trim_trailing_whitespace = true
46-
insert_final_newline = true
4731
max_line_length = 80
32+
33+
[*.patch]
34+
trim_trailing_whitespace = false

0 commit comments

Comments
 (0)