소스 검색

Style: Unify `.editorconfig` logic

Thaddeus Crews 6 달 전
부모
커밋
9d0c41a489
4개의 변경된 파일6개의 추가작업 그리고 20개의 파일을 삭제
  1. 3 9
      .editorconfig
  2. 0 3
      modules/gdscript/.editorconfig
  3. 1 8
      modules/mono/.editorconfig
  4. 2 0
      platform/android/.editorconfig

+ 3 - 9
.editorconfig

@@ -3,24 +3,18 @@ root = true
 [*]
 charset = utf-8
 end_of_line = lf
+indent_size = 4
 indent_style = tab
 insert_final_newline = true
-
-[*.{cpp,hpp,c,h,mm}]
+max_line_length = 120
 trim_trailing_whitespace = true
 
-[{*.gradle,AndroidManifest.xml}]
-indent_style = space
-indent_size = 4
-
 [{*.py,SConstruct,SCsub}]
 indent_style = space
-indent_size = 4
 
-# YAML requires indentation with spaces instead of tabs.
 [{*.{yml,yaml},.clang{-format,-tidy,d}}]
-indent_style = space
 indent_size = 2
+indent_style = space
 
 [*.svg]
 insert_final_newline = false

+ 0 - 3
modules/gdscript/.editorconfig

@@ -1,3 +0,0 @@
-[*.gd]
-indent_size = 4
-trim_trailing_whitespace = true

+ 1 - 8
modules/mono/.editorconfig

@@ -2,21 +2,14 @@
 end_of_line = crlf
 charset = utf-8-bom
 
-[*.sln]
-indent_style = tab
-
 [*.{csproj,props,targets,nuspec,resx}]
 indent_style = space
 indent_size = 2
 
 [*.cs]
 indent_style = space
-indent_size = 4
-insert_final_newline = true
-trim_trailing_whitespace = true
-max_line_length = 120
-csharp_indent_case_contents_when_block = false
 
+csharp_indent_case_contents_when_block = false
 csharp_new_line_before_open_brace = all
 csharp_new_line_before_else = true
 csharp_new_line_before_catch = true

+ 2 - 0
platform/android/.editorconfig

@@ -0,0 +1,2 @@
+[{*.gradle,AndroidManifest.xml}]
+indent_style = space