Merge "Merge remote-tracking branch 'origin/10.0' into 11.0" into 11.0

src/plugins/cppeditor/cpphighlighter.cpp

@@ -76,6 +76,7 @@ void CppHighlighter::highlightBlock(const QString &text)
                 setFormat(0, text.length(), formatForCategory(C_VISUAL_WHITESPACE));
         }
         TextDocumentLayout::setFoldingIndent(currentBlock(), foldingIndent);
+        TextDocumentLayout::setExpectedRawStringSuffix(currentBlock(), inheritedRawStringSuffix);
         return;
     }
 

src/plugins/cppeditor/testcases/highlightingtestcase.cpp

@@ -1,7 +1,7 @@
 auto func()
 {
     return R"(foo
-    foobar
+
         R"notaprefix!(
     barfoobar)" R"(second)" /* comment */ R"(third)";
 }