diff options
| author | Krasimir Georgiev <krasimir@google.com> | 2018-06-28 16:58:24 +0000 |
|---|---|---|
| committer | Krasimir Georgiev <krasimir@google.com> | 2018-06-28 16:58:24 +0000 |
| commit | 2d69f5d82e9caac6ae1607693df1e7c37a2adbcf (patch) | |
| tree | 2db7c42bcded2eee0deda40c3ba0a20123bb60f9 /clang/lib | |
| parent | cefbf9aca1d52505ecd0a4a526f5b914ae760078 (diff) | |
| download | bcm5719-llvm-2d69f5d82e9caac6ae1607693df1e7c37a2adbcf.tar.gz bcm5719-llvm-2d69f5d82e9caac6ae1607693df1e7c37a2adbcf.zip | |
[clang-format] Do not format raw string literals inside a recognized function with a non-recognized delimiter
Summary:
This stops clang-format from touching raw string contents with unrecognized delimiters inside recognized functions.
Unrecognized delimiters signal that the string might be special.
Subscribers: cfe-commits
Differential Revision: https://reviews.llvm.org/D48728
llvm-svn: 335876
Diffstat (limited to 'clang/lib')
| -rw-r--r-- | clang/lib/Format/ContinuationIndenter.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/Format/ContinuationIndenter.cpp b/clang/lib/Format/ContinuationIndenter.cpp index 1a5a6deb042..bb8efd61a3b 100644 --- a/clang/lib/Format/ContinuationIndenter.cpp +++ b/clang/lib/Format/ContinuationIndenter.cpp @@ -1648,7 +1648,7 @@ ContinuationIndenter::getRawStringStyle(const FormatToken &Current, if (!Delimiter) return None; auto RawStringStyle = RawStringFormats.getDelimiterStyle(*Delimiter); - if (!RawStringStyle) + if (!RawStringStyle && Delimiter->empty()) RawStringStyle = RawStringFormats.getEnclosingFunctionStyle( getEnclosingFunctionName(Current)); if (!RawStringStyle) |
