Addi formatting tests for pointer template parameters.
Fix spacing before ",".
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@169746 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Format/Format.cpp b/lib/Format/Format.cpp
index 7f1131c..e8faa12 100644
--- a/lib/Format/Format.cpp
+++ b/lib/Format/Format.cpp
@@ -689,6 +689,8 @@
}
bool spaceRequiredBetween(Token Left, Token Right) {
+ if (Right.is(tok::r_paren) || Right.is(tok::semi) || Right.is(tok::comma))
+ return false;
if (Left.is(tok::kw_template) && Right.is(tok::less))
return true;
if (Left.is(tok::arrow) || Right.is(tok::arrow))
@@ -725,8 +727,6 @@
return false;
if (Left.is(tok::hash))
return false;
- if (Right.is(tok::r_paren) || Right.is(tok::semi) || Right.is(tok::comma))
- return false;
if (Right.is(tok::l_paren)) {
return !Left.isAnyIdentifier() || isIfForOrWhile(Left);
}
diff --git a/unittests/Format/FormatTest.cpp b/unittests/Format/FormatTest.cpp
index 79cefc4..d70442c 100644
--- a/unittests/Format/FormatTest.cpp
+++ b/unittests/Format/FormatTest.cpp
@@ -478,7 +478,17 @@
verifyFormat("int a = b * *c;");
verifyFormat("int main(int argc, char **argv) {\n}");
+ // FIXME: Is this desired for LLVM? Fix if not.
+ verifyFormat("A<int *> a;");
+ verifyFormat("A<int **> a;");
+ verifyFormat("A<int *, int *> a;");
+ verifyFormat("A<int **, int **> a;");
+
verifyGoogleFormat("int main(int argc, char** argv) {\n}");
+ verifyGoogleFormat("A<int*> a;");
+ verifyGoogleFormat("A<int**> a;");
+ verifyGoogleFormat("A<int*, int*> a;");
+ verifyGoogleFormat("A<int**, int**> a;");
}
TEST_F(FormatTest, LineStartsWithSpecialCharacter) {