clang-format: Fix breaking before nested 'operator' in function declarations

[djasper]

One remark, otherwise looks good!

lib/Format/ContinuationIndenter.cpp

602

Is NextNonComment->Previous != Current? (Except for the fact that NextNonComment->Previous could be a comment in:

void SomeType:: // whyever someone would put a comment here
    operator+() { ...

[Eugene.Zelenko]

Looks like patch was not committed.

[shafik]

@Eugene.Zelenko it this still relevant or should this be closed?

lib/Format/ContinuationIndenter.cpp

unsigned ContinuationIndenter::getNewLineColumn(const LineState &State) {
   if (Previous.is(tok::comma) && State.Stack.back().VariablePos != 0)
     return State.Stack.back().VariablePos;
   if ((PreviousNonComment &&
        (PreviousNonComment->ClosesTemplateDeclaration ||
         PreviousNonComment->isOneOf(
             TT_AttributeParen, TT_FunctionAnnotationRParen, TT_JavaAnnotation,
             TT_LeadingJavaAnnotation))) ||
       (!Style.IndentWrappedFunctionNames &&
-       NextNonComment->isOneOf(tok::kw_operator, TT_FunctionDeclarationName)))
+       (NextNonComment->is(TT_FunctionDeclarationName) ||
+        (NextNonComment->is(tok::kw_operator) &&
+         !NextNonComment->Previous->is(tok::coloncolon)))))
     return std::max(State.Stack.back().LastSpace, State.Stack.back().Indent);
   if (NextNonComment->is(TT_SelectorName)) {
     if (!State.Stack.back().ObjCSelectorNameFound) {
       if (NextNonComment->LongestObjCSelectorName == 0)
         return State.Stack.back().Indent;
       return (Style.IndentWrappedFunctionNames
                   ? std::max(State.Stack.back().Indent,
                              State.FirstIndent + Style.ContinuationIndentWidth)

unittests/Format/FormatTest.cpp

verifyFormat(
       getGoogleStyle());
 
   // 4) break before after nested name specifiers.
   verifyFormat(
       "Aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
       "SomeClasssssssssssssssssssssssssssssssssssssss::\n"
       "    bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb(Cccccccccccccc cccccccccc);",
       getGoogleStyle());
+  verifyFormat(
+      "Aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
+      "SomeClasssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss::\n"
+      "    operator+=(Cccccccccccccc cccccccccc);",
+      getGoogleStyle());
 
   // However, there are exceptions, if a sufficient amount of lines can be
   // saved.
   // FIXME: The precise cut-offs wrt. the number of saved lines might need some
   // more adjusting.
   verifyFormat("Aaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbb(Cccccccccccccc cccccccccc,\n"
                "                                  Cccccccccccccc cccccccccc,\n"
                "                                  Cccccccccccccc cccccccccc,\n"