Skip to content

Commit b7f6310

Browse files
authored
Rollup merge of #145823 - lolbinarycat:editorconfig-fix, r=GuillaumeGomez
editorconfig: don't use nonexistent syntax reading through the editorconfig spec, using `!` to negate an entire glob is simply not a feature. you can use `!` to negate a charachter class, but that's not what was going on here.
2 parents 8b790d7 + 3b627b5 commit b7f6310

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

.editorconfig

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,23 @@ root = true
88
end_of_line = lf
99
charset = utf-8
1010
insert_final_newline = true
11+
trim_trailing_whitespace = true
12+
indent_style = space
13+
indent_size = 4
1114

1215
# some tests need trailing whitespace in output snapshots
13-
[!tests/]
14-
trim_trailing_whitespace = true
16+
[tests/**]
17+
trim_trailing_whitespace = false
1518
# for actual source code files of test, we still don't want trailing whitespace
1619
[tests/**.{rs,js}]
1720
trim_trailing_whitespace = true
1821
# these specific source files need to have trailing whitespace.
1922
[tests/ui/{frontmatter/frontmatter-whitespace-3.rs,parser/shebang/shebang-space.rs}]
2023
trim_trailing_whitespace = false
2124

22-
[!src/llvm-project]
23-
indent_style = space
24-
indent_size = 4
25+
[src/llvm-project]
26+
indent_style = unset
27+
indent_size = unset
2528

2629
[*.rs]
2730
max_line_length = 100

0 commit comments

Comments
 (0)