]> granicus.if.org Git - clang/commit
clang-format/java: Unbreak genenrics formatting after r299952.
authorNico Weber <nicolasweber@gmx.de>
Wed, 27 Sep 2017 17:57:50 +0000 (17:57 +0000)
committerNico Weber <nicolasweber@gmx.de>
Wed, 27 Sep 2017 17:57:50 +0000 (17:57 +0000)
commitd80dab7c4537912c95d6df6e12c76ba4f72cd44c
treeca0a20aeb8ed7f2d560025cca04da04aa8fa195b
parentdac8182904f34698a8627ecc802db3b94e372853
clang-format/java: Unbreak genenrics formatting after r299952.

https://reviews.llvm.org/rL299952 merged '>>>' tokens into a single
JavaRightLogicalShift token. This broke formatting of generics nested more than
two deep, e.g. Foo<Bar<Baz>>> because the '>>>' now weren't three '>' for
parseAngle().

Luckily, just deleting JavaRightLogicalShift fixes things without breaking the
test added in r299952, so do that.

https://reviews.llvm.org/D38291

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@314325 91177308-0d34-0410-b5e6-96231b3b80d8
lib/Format/FormatTokenLexer.cpp
lib/Format/TokenAnnotator.cpp
unittests/Format/FormatTestJava.cpp