[clang-format] Fix MatchingOpeningBlockLineIndex computation

[Typz]

Summary

Computed line index must be relative to the current 'parent' node, and
thus use CurrentLines instead of Lines.

Without this, a child line's MatchingOpeningBlockLineIndex is out of
range of the parent's list of line, which can cause crash or unexpected
behavior if this field is used in childs.

[krasimir]

Thank you! A test would be nice.

lib/Format/UnwrappedLineParser.cpp

432 ↗

(On Diff #96681)

Could you please reformat and use '//'-style comments?

[Typz]

I tried to add some test, but could not find a simple way: I could not find any 'parser' tests from which to start, and I don't see with current master how this can be an issue (though it becomes an issue with some of other patches).

Any hint how to implement the test?

[Typz]

Reformat and remove unneeded comment

[krasimir]

I can't think of a test case either. Thanks!

[Typz]

This comment was removed by Typz.

[krasimir]

Do you need me to commit this?

[Typz]

Indeed, I don't have commit access. But I was wondering if I should not get it, to simplify landing the patches after review.
I read http://llvm.org/docs/DeveloperPolicy.html#obtaining-commit-access about this, but I am still wondering what is considered a "track record of submitting high quality patches"...

I have uploaded 9 patches for review at the moment, if that is track record enough I will request access; otherwise please submit already :-)
Thanks,

[krasimir]

It should be enough for commit access. Mention your patches while requesting commit access. I'll submit this in the meantime.

cfe/trunk/lib/Format/UnwrappedLineParser.cpp

void UnwrappedLineParser::parseBlock(bool MustBeDeclaration, bool AddLevel,
 
   unsigned InitialLevel = Line->Level;
   nextToken();
 
   if (MacroBlock && FormatTok->is(tok::l_paren))
     parseParens();
 
   addUnwrappedLine();
-  size_t OpeningLineIndex =
-      Lines.empty() ? (UnwrappedLine::kInvalidIndex) : (Lines.size() - 1);
+  size_t OpeningLineIndex = CurrentLines->empty()
+                                ? (UnwrappedLine::kInvalidIndex)
+                                : (CurrentLines->size() - 1);
 
   ScopedDeclarationState DeclarationState(*Line, DeclarationScopeStack,
                                           MustBeDeclaration);
   if (AddLevel)
     ++Line->Level;
   parseLevel(/*HasOpeningBrace=*/true);
 
   if (eof())