diff options
| author | George Marques <george@gmarqu.es> | 2021-02-28 16:52:06 -0300 |
|---|---|---|
| committer | George Marques <george@gmarqu.es> | 2021-02-28 16:57:34 -0300 |
| commit | cba90d630177ce6c57b5537e74ef3eab4e9c1ea2 (patch) | |
| tree | 439897c2673d4f0af2635abffe73699d0cae6a01 /.clang-format | |
| parent | 77d41fa179e40560f1e264ed483638bf51713779 (diff) | |
| download | redot-cpp-cba90d630177ce6c57b5537e74ef3eab4e9c1ea2.tar.gz | |
Update clang-format to version 11
This is taken from the Godot repository, so formatting is similar. This
updates the style rules as well.
Also fix style in files to conform with this version.
Diffstat (limited to '.clang-format')
| -rw-r--r-- | .clang-format | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/.clang-format b/.clang-format index 3a2c39a..1c26421 100644 --- a/.clang-format +++ b/.clang-format @@ -13,9 +13,9 @@ AlignAfterOpenBracket: DontAlign AlignTrailingComments: false AllowAllParametersOfDeclarationOnNextLine: false # AllowShortBlocksOnASingleLine: false -AllowShortCaseLabelsOnASingleLine: true +# AllowShortCaseLabelsOnASingleLine: false AllowShortFunctionsOnASingleLine: Inline -AllowShortIfStatementsOnASingleLine: true +# AllowShortIfStatementsOnASingleLine: false # AllowShortLoopsOnASingleLine: false # AlwaysBreakAfterDefinitionReturnType: None # AlwaysBreakAfterReturnType: None @@ -76,7 +76,7 @@ IndentWidth: 4 # IndentWrappedFunctionNames: false # JavaScriptQuotes: Leave # JavaScriptWrapImports: true -# KeepEmptyLinesAtTheStartOfBlocks: true +KeepEmptyLinesAtTheStartOfBlocks: false # MacroBlockBegin: '' # MacroBlockEnd: '' # MaxEmptyLinesToKeep: 1 @@ -112,10 +112,11 @@ UseTab: Always --- ### C++ specific config ### Language: Cpp -Standard: Cpp03 +Standard: Cpp11 --- ### ObjC specific config ### Language: ObjC +Standard: Cpp11 ObjCBlockIndentWidth: 4 # ObjCSpaceAfterProperty: false # ObjCSpaceBeforeProtocolList: true @@ -123,4 +124,5 @@ ObjCBlockIndentWidth: 4 ### Java specific config ### Language: Java # BreakAfterJavaFieldAnnotations: false +JavaImportGroups: ['org.godotengine', 'android', 'androidx', 'com.android', 'com.google', 'java', 'javax'] ... |