[PATCH] D51294: Fix Bug 38713: clang-format mishandles a short block after "default:" in a switch statement
Owen Pan via Phabricator via cfe-commits
cfe-commits at lists.llvm.org
Tue Aug 28 16:55:06 PDT 2018
owenpan updated this revision to Diff 162989.
owenpan marked an inline comment as done.
owenpan added a comment.
Added a comment suggested by @sammccall
Repository:
rC Clang
https://reviews.llvm.org/D51294
Files:
lib/Format/UnwrappedLineFormatter.cpp
unittests/Format/FormatTest.cpp
Index: unittests/Format/FormatTest.cpp
===================================================================
--- unittests/Format/FormatTest.cpp
+++ unittests/Format/FormatTest.cpp
@@ -999,6 +999,24 @@
" }\n"
"});",
getLLVMStyle()));
+ EXPECT_EQ("switch (n) {\n"
+ "case 0: {\n"
+ " return false;\n"
+ "}\n"
+ "default: {\n"
+ " return true;\n"
+ "}\n"
+ "}",
+ format("switch (n)\n"
+ "{\n"
+ "case 0: {\n"
+ " return false;\n"
+ "}\n"
+ "default: {\n"
+ " return true;\n"
+ "}\n"
+ "}",
+ getLLVMStyle()));
verifyFormat("switch (a) {\n"
"case (b):\n"
" return;\n"
Index: lib/Format/UnwrappedLineFormatter.cpp
===================================================================
--- lib/Format/UnwrappedLineFormatter.cpp
+++ lib/Format/UnwrappedLineFormatter.cpp
@@ -483,6 +483,12 @@
if (Line.First->isOneOf(tok::kw_else, tok::kw_case) ||
(Line.First->Next && Line.First->Next->is(tok::kw_else)))
return 0;
+ // default: in switch statement
+ if (Line.First->is(tok::kw_default)) {
+ const FormatToken *Tok = Line.First->getNextNonComment();
+ if (Tok && Tok->is(tok::colon))
+ return 0;
+ }
if (Line.First->isOneOf(tok::kw_if, tok::kw_while, tok::kw_do, tok::kw_try,
tok::kw___try, tok::kw_catch, tok::kw___finally,
tok::kw_for, tok::r_brace, Keywords.kw___except)) {
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D51294.162989.patch
Type: text/x-patch
Size: 1729 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20180828/9f9f6795/attachment-0001.bin>
More information about the cfe-commits
mailing list