Format closing braces when reformatting the line containing the opening brace.
authorManuel Klimek <klimek@google.com>
Mon, 23 Apr 2018 09:34:26 +0000 (09:34 +0000)
committerManuel Klimek <klimek@google.com>
Mon, 23 Apr 2018 09:34:26 +0000 (09:34 +0000)
commit0dddcf78b89bd062a8de0cd41ce4903ee93b25c0
tree36094549cea8fbbb85914920b955542778e076ee
parentf0f716df8e758dc43836c70a8e2bcb459b42402d
Format closing braces when reformatting the line containing the opening brace.

This required a couple of yaks to be shaved:
1. MatchingOpeningBlockLineIndex was misused to also store the
   closing index; instead, use a second variable, as this doesn't
   work correctly for "} else {".
2. We needed to change the API of AffectedRangeManager to not
   use iterators; we always passed in begin / end for the whole
   container before, so there was no mismatch in generality.
3. We need an extra check to discontinue formatting at the top
   level, as we now sometimes change the indent of the closing
   brace, but want to bail out immediately afterwards, for
   example:
     void f() {
       if (a) {
     }
     void g();
   Previously:
     void f() {
       if (a) {
     }
     void g();
   Now:
     void f() {
       if (a) {
       }
     void g();

Differential Revision: https://reviews.llvm.org/D45726

llvm-svn: 330573
clang/lib/Format/AffectedRangeManager.cpp
clang/lib/Format/AffectedRangeManager.h
clang/lib/Format/Format.cpp
clang/lib/Format/NamespaceEndCommentsFixer.cpp
clang/lib/Format/SortJavaScriptImports.cpp
clang/lib/Format/TokenAnnotator.h
clang/lib/Format/UnwrappedLineFormatter.cpp
clang/lib/Format/UnwrappedLineParser.cpp
clang/lib/Format/UnwrappedLineParser.h
clang/lib/Format/UsingDeclarationsSorter.cpp
clang/unittests/Format/FormatTestSelective.cpp