From 3ab298900808f75821bcd76df166d3e12586e1bc Mon Sep 17 00:00:00 2001 From: Daniel Jasper Date: Wed, 6 May 2015 14:53:50 +0000 Subject: [PATCH] clang-format: Allow ternary expressions inside template parameters if the template parameters aren't inside an expression context. This fixes llvm.org/PR23270. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@236603 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Format/TokenAnnotator.cpp | 9 +++++++-- unittests/Format/FormatTest.cpp | 2 ++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/lib/Format/TokenAnnotator.cpp b/lib/Format/TokenAnnotator.cpp index be29239c06..793746137a 100644 --- a/lib/Format/TokenAnnotator.cpp +++ b/lib/Format/TokenAnnotator.cpp @@ -47,6 +47,11 @@ private: FormatToken *Left = CurrentToken->Previous; Left->ParentBracket = Contexts.back().ContextKind; ScopedContextCreator ContextCreator(*this, tok::less, 10); + + // If this angle is in the context of an expression, we need to be more + // hesitant to detect it as opening template parameters. + bool InExprContext = Contexts.back().IsExpression; + Contexts.back().IsExpression = false; // If there's a template keyword before the opening angle bracket, this is a // template parameter, not an argument. @@ -70,8 +75,8 @@ private: next(); continue; } - if (CurrentToken->isOneOf(tok::r_paren, tok::r_square, tok::r_brace, - tok::colon, tok::question)) + if (CurrentToken->isOneOf(tok::r_paren, tok::r_square, tok::r_brace) || + (CurrentToken->isOneOf(tok::colon, tok::question) && InExprContext)) return false; // If a && or || is found and interpreted as a binary operator, this set // of angles is likely part of something like "a < b && c > d". If the diff --git a/unittests/Format/FormatTest.cpp b/unittests/Format/FormatTest.cpp index cb1f7bd539..b4c8c26664 100644 --- a/unittests/Format/FormatTest.cpp +++ b/unittests/Format/FormatTest.cpp @@ -5144,6 +5144,8 @@ TEST_F(FormatTest, UnderstandsTemplateParameters) { verifyFormat("f();"); verifyFormat("template void f() {}"); verifyFormat("struct A::type>;"); + verifyFormat("struct A::type>;"); // Not template parameters. verifyFormat("return a < b && c > d;"); -- 2.40.0