forked from OSchip/llvm-project
1462e8440f
Summary:
Previously, `clang-format` didn't understand lightweight
Objective-C generics, which have the form:
```
@interface Foo <KeyType,
ValueTypeWithConstraint : Foo,
AnotherValueTypeWithGenericConstraint: Bar<Baz>, ... > ...
```
The lightweight generic specifier list appears before the base
class, if present, but because it starts with < like the protocol
specifier list, `UnwrappedLineParser` was getting confused and
failed to parse interfaces with both generics and protocol lists:
```
@interface Foo <KeyType> : NSObject <NSCopying>
```
Since the parsed line would be incomplete, the format result
would be very confused (e.g., https://bugs.llvm.org/show_bug.cgi?id=24381).
This fixes the issue by explicitly parsing the ObjC lightweight
generic conformance list, so the line is fully parsed.
Fixes: https://bugs.llvm.org/show_bug.cgi?id=24381
Test Plan: New tests added. Ran tests with:
% make -j16 FormatTests && ./tools/clang/unittests/Format/FormatTests
Reviewers: djasper, jolesiak
Reviewed By: djasper
Subscribers: klimek, cfe-commits
Differential Revision: https://reviews.llvm.org/D45185
llvm-svn: 329298
|
||
|---|---|---|
| .. | ||
| AffectedRangeManager.cpp | ||
| AffectedRangeManager.h | ||
| BreakableToken.cpp | ||
| BreakableToken.h | ||
| CMakeLists.txt | ||
| ContinuationIndenter.cpp | ||
| ContinuationIndenter.h | ||
| Encoding.h | ||
| Format.cpp | ||
| FormatInternal.h | ||
| FormatToken.cpp | ||
| FormatToken.h | ||
| FormatTokenLexer.cpp | ||
| FormatTokenLexer.h | ||
| NamespaceEndCommentsFixer.cpp | ||
| NamespaceEndCommentsFixer.h | ||
| SortJavaScriptImports.cpp | ||
| SortJavaScriptImports.h | ||
| TokenAnalyzer.cpp | ||
| TokenAnalyzer.h | ||
| TokenAnnotator.cpp | ||
| TokenAnnotator.h | ||
| UnwrappedLineFormatter.cpp | ||
| UnwrappedLineFormatter.h | ||
| UnwrappedLineParser.cpp | ||
| UnwrappedLineParser.h | ||
| UsingDeclarationsSorter.cpp | ||
| UsingDeclarationsSorter.h | ||
| WhitespaceManager.cpp | ||
| WhitespaceManager.h | ||