r198924 - clang-format: Slightly adapt line break in edge case.

[Chandler Carruth]

On Fri, Jan 10, 2014 at 12:40 AM, Daniel Jasper <djasper at google.com> wrote:

> Author: djasper
> Date: Fri Jan 10 02:40:17 2014
> New Revision: 198924
>
> URL: http://llvm.org/viewvc/llvm-project?rev=198924&view=rev
> Log:
> clang-format: Slightly adapt line break in edge case.
>
> Before:
>   SomeMap[std::pair(aaaaaaaaaaaa, bbbbbbbbbbbbbbb)]
>       .insert(ccccccccccccccccccccccc);
>
> After:
>   SomeMap[std::pair(aaaaaaaaaaaa, bbbbbbbbbbbbbbb)].insert(
>       ccccccccccccccccccccccc);
>
> This seems to be about 3:1 more common in Google and Chromium style and I
> found
> only a handful of instances inside the LLVM codebase.
>

Without any significant numbers in the LLVM codebase, I would prefer LLVM's
style stick to the first -- I think its significantly easier to read
personally. I'd also be interested in others' opinions since we don't
really have numbers here.


>
> Modified:
>     cfe/trunk/lib/Format/TokenAnnotator.cpp
>     cfe/trunk/unittests/Format/FormatTest.cpp
>
> Modified: cfe/trunk/lib/Format/TokenAnnotator.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Format/TokenAnnotator.cpp?rev=198924&r1=198923&r2=198924&view=diff
>
> ==============================================================================
> --- cfe/trunk/lib/Format/TokenAnnotator.cpp (original)
> +++ cfe/trunk/lib/Format/TokenAnnotator.cpp Fri Jan 10 02:40:17 2014
> @@ -1203,7 +1203,7 @@ unsigned TokenAnnotator::splitPenalty(co
>      return 2;
>
>    if (Right.isMemberAccess()) {
> -    if (Left.isOneOf(tok::r_paren, tok::r_square) && Left.MatchingParen &&
> +    if (Left.is(tok::r_paren) && Left.MatchingParen &&
>          Left.MatchingParen->ParameterCount > 0)
>        return 20; // Should be smaller than breaking at a nested comma.
>      return 150;
>
> Modified: cfe/trunk/unittests/Format/FormatTest.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Format/FormatTest.cpp?rev=198924&r1=198923&r2=198924&view=diff
>
> ==============================================================================
> --- cfe/trunk/unittests/Format/FormatTest.cpp (original)
> +++ cfe/trunk/unittests/Format/FormatTest.cpp Fri Jan 10 02:40:17 2014
> @@ -3910,8 +3910,8 @@ TEST_F(FormatTest, WrapsAtFunctionCallsI
>
>    verifyFormat("EXPECT_CALL(SomeObject, SomeFunction(Parameter))\n"
>                 "    .WillRepeatedly(Return(SomeValue));");
> -  verifyFormat("SomeMap[std::pair(aaaaaaaaaaaa, bbbbbbbbbbbbbbb)]\n"
> -               "    .insert(ccccccccccccccccccccccc);");
> +  verifyFormat("SomeMap[std::pair(aaaaaaaaaaaa,
> bbbbbbbbbbbbbbb)].insert(\n"
> +               "    ccccccccccccccccccccccc);");
>    verifyFormat("aaaaa(aaaaa(aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,\n"
>                 "
>  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa).aaaaa(aaaaa),\n"
>                 "      aaaaaaaaaaaaaaaaaaaaa);");
>
>
> _______________________________________________
> cfe-commits mailing list
> cfe-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20140110/696b1ab0/attachment.html>