[clang-format] Fix SpacesInSquareBrackets for Lambdas with Initial "&ref" Parameter

[mitchell-stellar]

Summary

This patch fixes an edge case in the SpacesInSquareBrackets option where an initial &ref lambda parameter is not padded with an initial space.

int foo = [&bar ]() {} is fixed to give int foo = [ &bar ]() {}

[MyDeveloperDay]

Thanks for the patch, sorry I must have missed this coming in. LGTM

[mitchell-stellar]

Thanks. Would you mind committing this on my behalf? It seems I wasn't migrated from SVN access to git access. It may take some time to sort out.

[mitchell-stellar]

Never mind, I got it resolved and pushed. Sorry for the noise.

clang/lib/Format/TokenAnnotator.cpp

if (Style.Language == FormatStyle::LK_TextProto ||
       return !Style.Cpp11BracedListStyle;
     }
     return false;
   }
   if (Right.is(tok::ellipsis))
     return Left.Tok.isLiteral() || (Left.is(tok::identifier) && Left.Previous &&
                                     Left.Previous->is(tok::kw_case));
   if (Left.is(tok::l_square) && Right.is(tok::amp))
-    return false;
+    return Style.SpacesInSquareBrackets;
   if (Right.is(TT_PointerOrReference)) {
     if (Left.is(tok::r_paren) && Line.MightBeFunctionDecl) {
       if (!Left.MatchingParen)
         return true;
       FormatToken *TokenBeforeMatchingParen =
           Left.MatchingParen->getPreviousNonComment();
       if (!TokenBeforeMatchingParen ||
           !TokenBeforeMatchingParen->isOneOf(tok::kw_typeof, tok::kw_decltype,

clang/unittests/Format/FormatTest.cpp

verifyFormat("double &operator[](int i) { return 0; }\n"
                "int i;",
                Spaces);
   verifyFormat("std::unique_ptr<int[]> foo() {}", Spaces);
   verifyFormat("int i = a[ a ][ a ]->f();", Spaces);
   verifyFormat("int i = (*b)[ a ]->f();", Spaces);
   // Lambdas.
   verifyFormat("int c = []() -> int { return 2; }();\n", Spaces);
   verifyFormat("return [ i, args... ] {};", Spaces);
+  verifyFormat("int foo = [ &bar ]() {};", Spaces);
+  verifyFormat("int foo = [ = ]() {};", Spaces);
+  verifyFormat("int foo = [ =, &bar ]() {};", Spaces);
+  verifyFormat("int foo = [ &bar, = ]() {};", Spaces);
 }
 
 TEST_F(FormatTest, ConfigurableSpaceBeforeAssignmentOperators) {
   verifyFormat("int a = 5;");
   verifyFormat("a += 42;");
   verifyFormat("a or_eq 8;");
 
   FormatStyle Spaces = getLLVMStyle();