From f322eb5c450162a975123b2c1446a86739d865f5 Mon Sep 17 00:00:00 2001 From: Daniel Jasper Date: Thu, 23 Oct 2014 20:22:22 +0000 Subject: [PATCH] clang-format: Fix incorrect space after "<". Before: bool a = 2 <::SomeFunction(); After: bool a = 2 < ::SomeFunction(); llvm-svn: 220505 --- clang/lib/Format/TokenAnnotator.cpp | 7 ++++--- clang/unittests/Format/FormatTest.cpp | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp index 285c231..1800862 100644 --- a/clang/lib/Format/TokenAnnotator.cpp +++ b/clang/lib/Format/TokenAnnotator.cpp @@ -1701,9 +1701,10 @@ bool TokenAnnotator::spaceRequiredBefore(const AnnotatedLine &Line, Right.getPrecedence() == prec::Assignment) return false; if (Right.is(tok::coloncolon) && Left.isNot(tok::l_brace)) - return (Left.is(tok::less) && Style.Standard == FormatStyle::LS_Cpp03) || - !Left.isOneOf(tok::identifier, tok::greater, tok::l_paren, - tok::r_paren, tok::less); + return (Left.Type == TT_TemplateOpener && + Style.Standard == FormatStyle::LS_Cpp03) || + !(Left.isOneOf(tok::identifier, tok::l_paren, tok::r_paren) || + Left.Type == TT_TemplateCloser || Left.Type == TT_TemplateOpener); if ((Left.Type == TT_TemplateOpener) != (Right.Type == TT_TemplateCloser)) return Style.SpacesInAngles; if ((Right.Type == TT_BinaryOperator && !Left.is(tok::l_paren)) || diff --git a/clang/unittests/Format/FormatTest.cpp b/clang/unittests/Format/FormatTest.cpp index 7c2e6c3..5642b0f 100644 --- a/clang/unittests/Format/FormatTest.cpp +++ b/clang/unittests/Format/FormatTest.cpp @@ -111,6 +111,7 @@ TEST_F(FormatTest, NestedNameSpecifiers) { verifyFormat("vector<::Type> v;"); verifyFormat("::ns::SomeFunction(::ns::SomeOtherFunction())"); verifyFormat("static constexpr bool Bar = decltype(bar())::value;"); + verifyFormat("bool a = 2 < ::SomeFunction();"); } TEST_F(FormatTest, OnlyGeneratesNecessaryReplacements) { -- 2.7.4