This revision was automatically updated to reflect the committed changes. Closed by commit rG8d7bd5752648: [clang-format] Fix SpacesInSquareBrackets for Lambdas with Initial "&ref"… (authored by mitchell-stellar).
Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D69649/new/ https://reviews.llvm.org/D69649 Files: clang/lib/Format/TokenAnnotator.cpp clang/unittests/Format/FormatTest.cpp Index: clang/unittests/Format/FormatTest.cpp =================================================================== --- clang/unittests/Format/FormatTest.cpp +++ clang/unittests/Format/FormatTest.cpp @@ -10572,6 +10572,10 @@ // 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) { Index: clang/lib/Format/TokenAnnotator.cpp =================================================================== --- clang/lib/Format/TokenAnnotator.cpp +++ clang/lib/Format/TokenAnnotator.cpp @@ -2567,7 +2567,7 @@ 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)
Index: clang/unittests/Format/FormatTest.cpp =================================================================== --- clang/unittests/Format/FormatTest.cpp +++ clang/unittests/Format/FormatTest.cpp @@ -10572,6 +10572,10 @@ // 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) { Index: clang/lib/Format/TokenAnnotator.cpp =================================================================== --- clang/lib/Format/TokenAnnotator.cpp +++ clang/lib/Format/TokenAnnotator.cpp @@ -2567,7 +2567,7 @@ 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)
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits