[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 git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@299927 91177308-0d34-0410-b5e6-96231b3b80d8
Showing
- lib/Format/BreakableToken.cpp 2 additions, 9 deletionslib/Format/BreakableToken.cpp
- lib/Format/ContinuationIndenter.cpp 5 additions, 11 deletionslib/Format/ContinuationIndenter.cpp
- lib/Format/FormatTokenLexer.cpp 18 additions, 0 deletionslib/Format/FormatTokenLexer.cpp
- lib/Format/FormatTokenLexer.h 1 addition, 0 deletionslib/Format/FormatTokenLexer.h
- lib/Format/TokenAnnotator.cpp 13 additions, 18 deletionslib/Format/TokenAnnotator.cpp
- unittests/Format/FormatTest.cpp 12 additions, 4 deletionsunittests/Format/FormatTest.cpp
Loading
Please register or sign in to comment