Skip to content

Commit 9570977

Browse files
committed
Merge pull request godotengine#101235 from Repiteo/style/editorconfig
Style: Unify `.editorconfig` logic
2 parents 89f233a + 9d0c41a commit 9570977

File tree

4 files changed

+6
-20
lines changed

4 files changed

+6
-20
lines changed

.editorconfig

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,18 @@ root = true
33
[*]
44
charset = utf-8
55
end_of_line = lf
6+
indent_size = 4
67
indent_style = tab
78
insert_final_newline = true
8-
9-
[*.{cpp,hpp,c,h,mm}]
9+
max_line_length = 120
1010
trim_trailing_whitespace = true
1111

12-
[{*.gradle,AndroidManifest.xml}]
13-
indent_style = space
14-
indent_size = 4
15-
1612
[{*.py,SConstruct,SCsub}]
1713
indent_style = space
18-
indent_size = 4
1914

20-
# YAML requires indentation with spaces instead of tabs.
2115
[{*.{yml,yaml},.clang{-format,-tidy,d}}]
22-
indent_style = space
2316
indent_size = 2
17+
indent_style = space
2418

2519
[*.svg]
2620
insert_final_newline = false

modules/gdscript/.editorconfig

Lines changed: 0 additions & 3 deletions
This file was deleted.

modules/mono/.editorconfig

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,14 @@
22
end_of_line = crlf
33
charset = utf-8-bom
44

5-
[*.sln]
6-
indent_style = tab
7-
85
[*.{csproj,props,targets,nuspec,resx}]
96
indent_style = space
107
indent_size = 2
118

129
[*.cs]
1310
indent_style = space
14-
indent_size = 4
15-
insert_final_newline = true
16-
trim_trailing_whitespace = true
17-
max_line_length = 120
18-
csharp_indent_case_contents_when_block = false
1911

12+
csharp_indent_case_contents_when_block = false
2013
csharp_new_line_before_open_brace = all
2114
csharp_new_line_before_else = true
2215
csharp_new_line_before_catch = true

platform/android/.editorconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[{*.gradle,AndroidManifest.xml}]
2+
indent_style = space

0 commit comments

Comments
 (0)