summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Martin Stjernholm <mast@google.com> 2023-03-18 01:04:20 +0000
committer Martin Stjernholm <mast@google.com> 2023-03-24 22:46:11 +0000
commitb4f24501f71a6eb005de4b1cc87d2876a6bbac04 (patch)
tree482736f07b51ee4ca76a005dbbe7016ed2034471
parent4849c3cb59891321184cc141bcadccc4f913b1f9 (diff)
Align clang-format with the Checkstyle hook for short functions.
The latter doesn't allow non-empty methods on a single line. This is the same in both C++ and Java. Test CL: https://r.android.com/2507738 #codehealth Test: repo upload on a file with a short non-empty class method in C++ and Java formatted on multiple lines by clang-format. Test: repo upload on a file with a short empty class method in C++ and Java formatted on a single line by clang-format. Bug: 123456789 Change-Id: I9795cd753f0f31be97652859f5bd8b5ce3427c55
-rw-r--r--.clang-format2
1 files changed, 1 insertions, 1 deletions
diff --git a/.clang-format b/.clang-format
index 03af56d64062..021d9382d62b 100644
--- a/.clang-format
+++ b/.clang-format
@@ -2,7 +2,7 @@ BasedOnStyle: Google
AccessModifierOffset: -4
AlignOperands: false
-AllowShortFunctionsOnASingleLine: Inline
+AllowShortFunctionsOnASingleLine: Empty
AlwaysBreakBeforeMultilineStrings: false
ColumnLimit: 100
CommentPragmas: NOLINT:.*