Fixes bug 19983 - SBPO_Always not covering all the cases

[lifted]

Summary

http://llvm.org/bugs/show_bug.cgi?id=19983

clang-format: Add a space between function template explicit template arguments
and left parenthesis if SBPO_Always option is set.

Before:

auto i = std::make_unique<int>(5);

After:

auto i = std::make_unique<int> (5);

[djasper]

Looks good. Thanks!

[lifted]

Daniel, could you please commit this patch? I have no commit access yet.

Thanks in advance.

[mcrosier]

Committed r214904.

lib/Format/TokenAnnotator.cpp

bool TokenAnnotator::spaceRequiredBefore(const AnnotatedLine &Line,
   if (!Style.SpaceBeforeAssignmentOperators &&
       Tok.getPrecedence() == prec::Assignment)
     return false;
   if ((Tok.Type == TT_BinaryOperator && !Tok.Previous->is(tok::l_paren)) ||
       Tok.Previous->Type == TT_BinaryOperator ||
       Tok.Previous->Type == TT_ConditionalExpr)
     return true;
   if (Tok.Previous->Type == TT_TemplateCloser && Tok.is(tok::l_paren))
-    return false;
+    return Style.SpaceBeforeParens == FormatStyle::SBPO_Always;
   if (Tok.is(tok::less) && Tok.Previous->isNot(tok::l_paren) &&
       Line.First->is(tok::hash))
     return true;
   if (Tok.Type == TT_TrailingUnaryOperator)
     return false;
   if (Tok.Previous->Type == TT_RegexLiteral)
     return false;
   return spaceRequiredBetween(Line, *Tok.Previous, Tok);

unittests/Format/FormatTest.cpp

verifyFormat("if(true)\n"
                "  f();", NoSpace);
   verifyFormat("do {\n"
                "  do_something();\n"
                "} while(something());", NoSpace);
   verifyFormat("switch(x) {\n"
                "default:\n"
                "  break;\n"
                "}", NoSpace);
+  verifyFormat("auto i = std::make_unique<int>(5);", NoSpace);
 
   FormatStyle Space = getLLVMStyle();
   Space.SpaceBeforeParens = FormatStyle::SBPO_Always;
 
   verifyFormat("int f ();", Space);
   verifyFormat("void f (int a, T b) {\n"
                "  while (true)\n"
                "    continue;\n"
verifyFormat("*(&a + 1);\n"
                "a[(b + c) * d];\n"
                "(((a + 1) * 2) + 3) * 4;",
                Space);
   verifyFormat("#define A(x) x", Space);
   verifyFormat("#define A (x) x", Space);
   verifyFormat("#if defined(x)\n"
                "#endif",
                Space);
+  verifyFormat("auto i = std::make_unique<int> (5);", Space);
 }
 
 TEST_F(FormatTest, ConfigurableSpacesInParentheses) {
   FormatStyle Spaces = getLLVMStyle();
 
   Spaces.SpacesInParentheses = true;
   verifyFormat("call( x, y, z );", Spaces);
   verifyFormat("while ( (bool)1 )\n"