r186535 - clang-format: Add space in corner case.
Daniel Jasper
djasper at google.com
Wed Jul 17 13:25:02 PDT 2013
Author: djasper
Date: Wed Jul 17 15:25:02 2013
New Revision: 186535
URL: http://llvm.org/viewvc/llvm-project?rev=186535&view=rev
Log:
clang-format: Add space in corner case.
Before:
SomeType s __attribute__((unused))(InitValue);
After:
SomeType s __attribute__((unused)) (InitValue);
Modified:
cfe/trunk/lib/Format/TokenAnnotator.cpp
cfe/trunk/unittests/Format/FormatTest.cpp
Modified: cfe/trunk/lib/Format/TokenAnnotator.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Format/TokenAnnotator.cpp?rev=186535&r1=186534&r2=186535&view=diff
==============================================================================
--- cfe/trunk/lib/Format/TokenAnnotator.cpp (original)
+++ cfe/trunk/lib/Format/TokenAnnotator.cpp Wed Jul 17 15:25:02 2013
@@ -1151,6 +1151,10 @@ bool TokenAnnotator::spaceRequiredBetwee
if (Left.is(tok::l_paren))
return false;
if (Right.is(tok::l_paren)) {
+ if (Left.is(tok::r_paren) && Left.MatchingParen &&
+ Left.MatchingParen->Previous &&
+ Left.MatchingParen->Previous->is(tok::kw___attribute))
+ return true;
return Line.Type == LT_ObjCDecl ||
Left.isOneOf(tok::kw_if, tok::kw_for, tok::kw_while, tok::kw_switch,
tok::kw_return, tok::kw_catch, tok::kw_new,
Modified: cfe/trunk/unittests/Format/FormatTest.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Format/FormatTest.cpp?rev=186535&r1=186534&r2=186535&view=diff
==============================================================================
--- cfe/trunk/unittests/Format/FormatTest.cpp (original)
+++ cfe/trunk/unittests/Format/FormatTest.cpp Wed Jul 17 15:25:02 2013
@@ -3546,6 +3546,10 @@ TEST_F(FormatTest, UnderstandsUsesOfStar
verifyFormat("delete *x;", PointerLeft);
}
+TEST_F(FormatTest, UnderstandsAttributes) {
+ verifyFormat("SomeType s __attribute__((unused)) (InitValue);");
+}
+
TEST_F(FormatTest, UnderstandsEllipsis) {
verifyFormat("int printf(const char *fmt, ...);");
verifyFormat("template <class... Ts> void Foo(Ts... ts) { Foo(ts...); }");
More information about the cfe-commits
mailing list