diff options
| -rw-r--r-- | lib/Format/Format.cpp | 3 | ||||
| -rw-r--r-- | unittests/Format/FormatTest.cpp | 12 |
2 files changed, 8 insertions, 7 deletions
diff --git a/lib/Format/Format.cpp b/lib/Format/Format.cpp index c8dc7bf55c..742b9a8d1c 100644 --- a/lib/Format/Format.cpp +++ b/lib/Format/Format.cpp @@ -1427,7 +1427,8 @@ private: std::vector<AnnotatedLine>::iterator E, unsigned Limit) { AnnotatedLine &Line = *I; - if (!(I + 1)->InPPDirective) return; + if (!(I + 1)->InPPDirective || (I + 1)->First.FormatTok.HasUnescapedNewline) + return; if (I + 2 != E && (I + 2)->InPPDirective && !(I + 2)->First.FormatTok.HasUnescapedNewline) return; diff --git a/unittests/Format/FormatTest.cpp b/unittests/Format/FormatTest.cpp index c088089211..daebc4ddab 100644 --- a/unittests/Format/FormatTest.cpp +++ b/unittests/Format/FormatTest.cpp @@ -1133,12 +1133,12 @@ TEST_F(FormatTest, LineStartsWithSpecialCharacter) { } TEST_F(FormatTest, HandlesIncludeDirectives) { - verifyFormat("#include <string>"); - verifyFormat("#include <a/b/c.h>"); - verifyFormat("#include \"a/b/string\""); - verifyFormat("#include \"string.h\""); - verifyFormat("#include \"string.h\""); - verifyFormat("#include <a-a>"); + verifyFormat("#include <string>\n" + "#include <a/b/c.h>\n" + "#include \"a/b/string\"\n" + "#include \"string.h\"\n" + "#include \"string.h\"\n" + "#include <a-a>"); verifyFormat("#import <string>"); verifyFormat("#import <a/b/c.h>"); |