[clang-tools-extra] b96ec49 - [clangd] Remove raw string literals in macros

[Oliver Stannard via cfe-commits]

Author: Oliver Stannard
Date: 2020-01-13T11:45:05Z
New Revision: b96ec492d34ecf31fd2c8d2f0033f00e36cc2b9c

URL: https://github.com/llvm/llvm-project/commit/b96ec492d34ecf31fd2c8d2f0033f00e36cc2b9c
DIFF: https://github.com/llvm/llvm-project/commit/b96ec492d34ecf31fd2c8d2f0033f00e36cc2b9c.diff

LOG: [clangd] Remove raw string literals in macros

Older (but still supported) versions of GCC don't handle C++11 raw
string literals in macro parameters correctly.

Added: 
    

Modified: 
    clang-tools-extra/clangd/unittests/FormattedStringTests.cpp

Removed: 
    


################################################################################
diff  --git a/clang-tools-extra/clangd/unittests/FormattedStringTests.cpp b/clang-tools-extra/clangd/unittests/FormattedStringTests.cpp
index 825bf5bbd866..80d0934bed3e 100644
--- a/clang-tools-extra/clangd/unittests/FormattedStringTests.cpp
+++ b/clang-tools-extra/clangd/unittests/FormattedStringTests.cpp
@@ -194,10 +194,10 @@ TEST(BulletList, Render) {
   EXPECT_EQ(L.asPlainText(), "- foo");
 
   L.addItem().addParagraph().appendText("bar");
-  EXPECT_EQ(L.asMarkdown(), R"md(- foo
-- bar)md");
-  EXPECT_EQ(L.asPlainText(), R"pt(- foo
-- bar)pt");
+  llvm::StringRef Expected = R"md(- foo
+- bar)md";
+  EXPECT_EQ(L.asMarkdown(), Expected);
+  EXPECT_EQ(L.asPlainText(), Expected);
 
   // Nested list, with a single item.
   Document &D = L.addItem();
@@ -215,24 +215,26 @@ TEST(BulletList, Render) {
   Document &DeepDoc = InnerList.addItem();
   DeepDoc.addParagraph().appendText("baz");
   DeepDoc.addParagraph().appendText("baz");
-  EXPECT_EQ(L.asMarkdown(), R"md(- foo
+  StringRef ExpectedMarkdown = R"md(- foo
 - bar
 - foo  
   baz  
   - foo  
     - baz  
-      baz)md");
-  EXPECT_EQ(L.asPlainText(), R"pt(- foo
+      baz)md";
+  EXPECT_EQ(L.asMarkdown(), ExpectedMarkdown);
+  StringRef ExpectedPlainText = R"pt(- foo
 - bar
 - foo
   baz
   - foo
     - baz
-      baz)pt");
+      baz)pt";
+  EXPECT_EQ(L.asPlainText(), ExpectedPlainText);
 
   // Termination
   Inner.addParagraph().appendText("after");
-  EXPECT_EQ(L.asMarkdown(), R"md(- foo
+  ExpectedMarkdown = R"md(- foo
 - bar
 - foo  
   baz  
@@ -240,15 +242,17 @@ TEST(BulletList, Render) {
     - baz  
       baz
     
-    after)md");
-  EXPECT_EQ(L.asPlainText(), R"pt(- foo
+    after)md";
+  EXPECT_EQ(L.asMarkdown(), ExpectedMarkdown);
+  ExpectedPlainText = R"pt(- foo
 - bar
 - foo
   baz
   - foo
     - baz
       baz
-    after)pt");
+    after)pt";
+  EXPECT_EQ(L.asPlainText(), ExpectedPlainText);
 }
 
 } // namespace