diff options
| -rw-r--r-- | lib/Format/TokenAnnotator.cpp | 3 | ||||
| -rw-r--r-- | unittests/Format/FormatTest.cpp | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/Format/TokenAnnotator.cpp b/lib/Format/TokenAnnotator.cpp index ad3baae00d..8a384540d8 100644 --- a/lib/Format/TokenAnnotator.cpp +++ b/lib/Format/TokenAnnotator.cpp @@ -830,7 +830,8 @@ bool TokenAnnotator::spaceRequiredBetween(const AnnotatedLine &Line, if (Left.is(tok::coloncolon)) return false; if (Right.is(tok::coloncolon)) - return Left.isNot(tok::identifier) && Left.isNot(tok::greater); + return Left.isNot(tok::identifier) && Left.isNot(tok::greater) && + Left.isNot(tok::l_paren); if (Left.is(tok::less) || Right.is(tok::greater) || Right.is(tok::less)) return false; if (Right.is(tok::amp) || Right.is(tok::star)) diff --git a/unittests/Format/FormatTest.cpp b/unittests/Format/FormatTest.cpp index 6924e45504..8ea0ff1604 100644 --- a/unittests/Format/FormatTest.cpp +++ b/unittests/Format/FormatTest.cpp @@ -147,8 +147,9 @@ TEST_F(FormatTest, FormatsNestedCall) { verifyFormat("Method(f1(f2, (f3())));"); } -TEST_F(FormatTest, ImportantSpaces) { +TEST_F(FormatTest, NestedNameSpecifiers) { verifyFormat("vector< ::Type> v;"); + verifyFormat("::ns::SomeFunction(::ns::SomeOtherFunction())"); } TEST_F(FormatTest, OnlyGeneratesNecessaryReplacements) { |