godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-13 13:31:48 +00:00
Code Releases Wiki Activity

Merge pull request #100830 from nikitalita/patch-3

Browse Source 
.clang-format: Change AllowShortFunctionsOnASingleLine back to `Inline`
This commit is contained in:
Thaddeus Crews
2024-12-29 09:35:03 -06:00
parent a8dfdc9487 2845995b02
commit f42e40baf1
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.clang-format
View File

@@ -44,7 +44,7 @@ AllowAllParametersOfDeclarationOnNextLine: false
# AllowShortBlocksOnASingleLine: Never # AllowShortBlocksOnASingleLine: Never
# AllowShortCaseLabelsOnASingleLine: false # AllowShortCaseLabelsOnASingleLine: false
# AllowShortEnumsOnASingleLine: true # AllowShortEnumsOnASingleLine: true
# AllowShortFunctionsOnASingleLine: All AllowShortFunctionsOnASingleLine: Inline
# AllowShortIfStatementsOnASingleLine: Never # AllowShortIfStatementsOnASingleLine: Never
# AllowShortLambdasOnASingleLine: All # AllowShortLambdasOnASingleLine: All
# AllowShortLoopsOnASingleLine: false # AllowShortLoopsOnASingleLine: false

1
misc/utility/.clang-format-glsl
View File

@@ -8,6 +8,7 @@ AlignTrailingComments:
Kind: Never Kind: Never
OverEmptyLines: 0 OverEmptyLines: 0
AllowAllParametersOfDeclarationOnNextLine: false AllowAllParametersOfDeclarationOnNextLine: false
AllowShortFunctionsOnASingleLine: Inline
BreakConstructorInitializers: AfterColon BreakConstructorInitializers: AfterColon
ColumnLimit: 0 ColumnLimit: 0
ConstructorInitializerIndentWidth: 8 ConstructorInitializerIndentWidth: 8