summary refs log tree commit diff
path: root/.clang-format
diff options
context:
space:
mode:
authorNicolas Werner <nicolas.werner@hotmail.de>2021-11-22 00:32:49 +0100
committerNicolas Werner <nicolas.werner@hotmail.de>2021-11-22 00:33:43 +0100
commita13f492e7d587ade54606a77c4e9f497a0fea737 (patch)
treeffb115cd17450e8094e7e15e0d04f2d5d2e9a852 /.clang-format
parentMerge pull request #822 from Nheko-Reborn/dm-filter (diff)
downloadnheko-a13f492e7d587ade54606a77c4e9f497a0fea737.tar.xz
Make clang-format <13 and clang-format >=13 behave the same
I think old clang-format is just buggy in those cases, so we should
reenable those blocks, once everyone has 13 or up.
Diffstat (limited to '.clang-format')
-rw-r--r--.clang-format3
1 files changed, 2 insertions, 1 deletions
diff --git a/.clang-format b/.clang-format
index b5e2f017..e9ebcb6d 100644
--- a/.clang-format
+++ b/.clang-format
@@ -4,7 +4,7 @@ Standard: c++17
 AccessModifierOffset: -4
 AlignAfterOpenBracket: Align
 AlignConsecutiveAssignments: true
-AllowShortFunctionsOnASingleLine: true
+AllowShortFunctionsOnASingleLine: InlineOnly
 BasedOnStyle: Mozilla
 ColumnLimit: 100
 IndentCaseLabels: false
@@ -12,3 +12,4 @@ IndentWidth: 4
 KeepEmptyLinesAtTheStartOfBlocks: false
 PointerAlignment: Right
 Cpp11BracedListStyle: true
+PenaltyReturnTypeOnItsOwnLine: 0