Skip to content

Commit 796a899

Browse files
danoli32bbb
andauthored
Tabs or spaces - Added EditorConfig to help fix problems (#8096)
* change Xcode settings about indentation from space to tab (cherry picked from commit d15c301) * Add Editor Config for developer code formatting --------- Co-authored-by: 2bit <github@2bit.jp>
1 parent 48c1783 commit 796a899

File tree

6 files changed

+49
-3
lines changed

6 files changed

+49
-3
lines changed

.editorconfig

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
# EditorConfig https://editorconfig.org
2+
root = true
3+
4+
# Default settings for all files
5+
[*]
6+
indent_style = tab
7+
indent_size = 4
8+
tab_width = 4
9+
insert_final_newline = true
10+
trim_trailing_whitespace = true
11+
12+
[*.{js,py}]
13+
charset = utf-8
14+
15+
[*.sh]
16+
indent_style = tab
17+
indent_size = 4
18+
tab_width = 4
19+
insert_final_newline = true
20+
trim_trailing_whitespace = true
21+
22+
# Override JSON
23+
[*.json]
24+
indent_style = space
25+
indent_size = 2
26+
tab_width = 2
27+
28+
# Override YAML
29+
[*.yml]
30+
indent_style = space
31+
indent_size = 2
32+
tab_width = 2
33+
34+
[*.html]
35+
indent_style = space
36+
indent_size = 2
37+
38+
[*.js]
39+
indent_style = space
40+
indent_size = 2

libs/openFrameworksCompiled/project/ios/iOS+OFLib.xcodeproj/project.pbxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -681,7 +681,7 @@
681681
name = CustomTemplate;
682682
sourceTree = "<group>";
683683
tabWidth = 4;
684-
usesTabs = 0;
684+
usesTabs = 1;
685685
};
686686
29B97323FDCFA39411CA2CEA /* core frameworks */ = {
687687
isa = PBXGroup;

libs/openFrameworksCompiled/project/osx/openFrameworksLib.xcodeproj/project.pbxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -555,7 +555,7 @@
555555
indentWidth = 4;
556556
sourceTree = "<group>";
557557
tabWidth = 4;
558-
usesTabs = 0;
558+
usesTabs = 1;
559559
};
560560
E4F3BA5212F4C4BF002D19BB /* 3d */ = {
561561
isa = PBXGroup;

libs/openFrameworksCompiled/project/tvOS/tvOS+OFLib.xcodeproj/project.pbxproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -441,6 +441,9 @@
441441
BFF80A4A2C50AFEB00784E74 /* Frameworks */,
442442
);
443443
sourceTree = "<group>";
444+
indentWidth = 4;
445+
tabWidth = 4;
446+
usesTabs = 1;
444447
};
445448
8446395D1BC343E000F24926 /* Products */ = {
446449
isa = PBXGroup;

scripts/templates/ios/emptyExample.xcodeproj/project.pbxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@
124124
"COMPRESS_PNG_FILES": "NO",
125125
"GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL": "NO",
126126
"GCC_OPTIMIZATION_LEVEL": "0",
127-
"GCC_C_LANGUAGE_STANDARD": "c11",
127+
"GCC_C_LANGUAGE_STANDARD": "c17",
128128
"TARGETED_DEVICE_FAMILY": "1",
129129
"GCC_WARN_PROTOTYPE_CONVERSION": "NO",
130130
"GCC_WARN_64_TO_32_BIT_CONVERSION[arch=*64]": "NO",

scripts/templates/tvOS/emptyExample.xcodeproj/project.pbxproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,9 @@
206206
);
207207
path = src;
208208
sourceTree = SOURCE_ROOT;
209+
indentWidth = 4;
210+
tabWidth = 4;
211+
usesTabs = 1;
209212
};
210213
9998920A1BF4D40400DCECB0 /* mediaAssets */ = {
211214
isa = PBXGroup;

0 commit comments

Comments
 (0)