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/unittests/Format/FormatTestRawStrings.cpp | |
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/unittests/Format/FormatTestRawStrings.cpp')
-rw-r--r-- | clang/unittests/Format/FormatTestRawStrings.cpp | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/clang/unittests/Format/FormatTestRawStrings.cpp b/clang/unittests/Format/FormatTestRawStrings.cpp index 3ec6bb9cb44..307394341d7 100644 --- a/clang/unittests/Format/FormatTestRawStrings.cpp +++ b/clang/unittests/Format/FormatTestRawStrings.cpp @@ -862,6 +862,32 @@ int f() { Style)); } +TEST_F(FormatTestRawStrings, + DoNotFormatUnrecognizedDelimitersInRecognizedFunctions) { + FormatStyle Style = getRawStringPbStyleWithColumns(60); + Style.RawStringFormats[0].EnclosingFunctions.push_back( + "EqualsProto"); + // EqualsProto is a recognized function, but the Raw delimiter is + // unrecognized. Do not touch the string in this case, since it might be + // special. + expect_eq(R"test( +void f() { + aaaaaaaaa(bbbbbbbbb, EqualsProto(R"Raw( +item { + key: value +} +)Raw")); +})test", + format(R"test( +void f() { + aaaaaaaaa(bbbbbbbbb, EqualsProto(R"Raw( +item { + key: value +} +)Raw")); +})test", + Style)); +} } // end namespace } // end namespace format |