diff options
| author | Alexander Kornienko <alexfh@google.com> | 2017-04-11 09:55:00 +0000 |
|---|---|---|
| committer | Alexander Kornienko <alexfh@google.com> | 2017-04-11 09:55:00 +0000 |
| commit | d4fa2e634876672a680a300442ed917761a8c3ff (patch) | |
| tree | 7f4503b025bc11c7af8ebd4d3097fe07420945e4 /clang/lib/Format/FormatTokenLexer.h | |
| parent | 4fc5f3c02e57136c7c4055bd2f83a56bb79d37e5 (diff) | |
| download | bcm5719-llvm-d4fa2e634876672a680a300442ed917761a8c3ff.tar.gz bcm5719-llvm-d4fa2e634876672a680a300442ed917761a8c3ff.zip | |
[clang-format] Handle NSString literals by merging tokens.
Summary:
This fixes a few outstanding bugs:
* incorrect breaking of NSString literals containing double-width characters;
* inconsistent formatting of ObjC dictionary literals containing NSString
literals;
* AlwaysBreakBeforeMultilineStrings ignoring implicitly-concatenated NSString
literals.
Reviewers: djasper
Reviewed By: djasper
Subscribers: klimek, cfe-commits
Differential Revision: https://reviews.llvm.org/D31706
llvm-svn: 299927
Diffstat (limited to 'clang/lib/Format/FormatTokenLexer.h')
| -rw-r--r-- | clang/lib/Format/FormatTokenLexer.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/clang/lib/Format/FormatTokenLexer.h b/clang/lib/Format/FormatTokenLexer.h index c47b0e725d3..bf10f09cd11 100644 --- a/clang/lib/Format/FormatTokenLexer.h +++ b/clang/lib/Format/FormatTokenLexer.h @@ -47,6 +47,7 @@ private: void tryMergePreviousTokens(); bool tryMergeLessLess(); + bool tryMergeNSStringLiteral(); bool tryMergeTokens(ArrayRef<tok::TokenKind> Kinds, TokenType NewType); |
