diff options
| author | Nico Weber <nicolasweber@gmx.de> | 2017-02-24 19:10:12 +0000 |
|---|---|---|
| committer | Nico Weber <nicolasweber@gmx.de> | 2017-02-24 19:10:12 +0000 |
| commit | d96ae867351ece78d2aa2fe0fb463a626fbb3029 (patch) | |
| tree | 2781930994a16ea12577896489c0502d5bf6e6a1 /clang/lib/Format/FormatTokenLexer.cpp | |
| parent | 3f4a4b36818ace88fb0263ba7e999115a2c7d7af (diff) | |
| download | bcm5719-llvm-d96ae867351ece78d2aa2fe0fb463a626fbb3029.tar.gz bcm5719-llvm-d96ae867351ece78d2aa2fe0fb463a626fbb3029.zip | |
clang-format: Fix many Objective-C formatting regressions from r289428
r289428 added a separate language kind for Objective-C, but kept many
"Language == LK_Cpp" checks untouched. This introduced a "IsCpp()"
method that returns true for both C++ and Objective-C++, and replaces
all comparisons of Language with LK_Cpp with calls to this new method.
Also add a lot more test coverge for formatting things in LK_ObjC mode,
by having FormatTest's verifyFormat() test for LK_ObjC everything that's
being tested for LK_Cpp at the moment.
Fixes PR32060 and many other things.
llvm-svn: 296160
Diffstat (limited to 'clang/lib/Format/FormatTokenLexer.cpp')
| -rw-r--r-- | clang/lib/Format/FormatTokenLexer.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/clang/lib/Format/FormatTokenLexer.cpp b/clang/lib/Format/FormatTokenLexer.cpp index 5bd1168587f..90b80a45449 100644 --- a/clang/lib/Format/FormatTokenLexer.cpp +++ b/clang/lib/Format/FormatTokenLexer.cpp @@ -560,8 +560,7 @@ FormatToken *FormatTokenLexer::getNextToken() { Column = FormatTok->LastLineColumnWidth; } - if (Style.Language == FormatStyle::LK_Cpp || - Style.Language == FormatStyle::LK_ObjC) { + if (Style.IsCpp()) { if (!(Tokens.size() > 0 && Tokens.back()->Tok.getIdentifierInfo() && Tokens.back()->Tok.getIdentifierInfo()->getPPKeywordID() == tok::pp_define) && |
