[PATCH] D75022: clang-format: Extend AllowShortLoopsOnASingleLine to do ... while loops.
Daan De Meyer via Phabricator via cfe-commits
cfe-commits at lists.llvm.org
Mon Feb 24 00:25:56 PST 2020
DaanDeMeyer updated this revision to Diff 246150.
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D75022/new/
https://reviews.llvm.org/D75022
Files:
clang/lib/Format/UnwrappedLineFormatter.cpp
Index: clang/lib/Format/UnwrappedLineFormatter.cpp
===================================================================
--- clang/lib/Format/UnwrappedLineFormatter.cpp
+++ clang/lib/Format/UnwrappedLineFormatter.cpp
@@ -404,7 +404,7 @@
? tryMergeSimpleControlStatement(I, E, Limit)
: 0;
}
- if (TheLine->First->isOneOf(tok::kw_for, tok::kw_while)) {
+ if (TheLine->First->isOneOf(tok::kw_for, tok::kw_while, tok::kw_do)) {
return Style.AllowShortLoopsOnASingleLine
? tryMergeSimpleControlStatement(I, E, Limit)
: 0;
@@ -449,7 +449,7 @@
return 0;
Limit = limitConsideringMacros(I + 1, E, Limit);
AnnotatedLine &Line = **I;
- if (Line.Last->isNot(tok::r_paren))
+ if (!Line.First->is(tok::kw_do) && Line.Last->isNot(tok::r_paren))
return 0;
if (1 + I[1]->Last->TotalLength > Limit)
return 0;
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D75022.246150.patch
Type: text/x-patch
Size: 921 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20200224/4c6bea99/attachment-0001.bin>
More information about the cfe-commits
mailing list