From bd04f2aa2247f2fda3fd8f3fee90479ba2c94499 Mon Sep 17 00:00:00 2001 From: Manuel Klimek Date: Thu, 31 Jan 2013 15:58:48 +0000 Subject: [PATCH] Never break inside something that was a preprocessor directive. Just put it in one unwrapped line and let the formatter handle it. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@174063 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Format/UnwrappedLineParser.cpp | 2 +- unittests/Format/FormatTest.cpp | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/Format/UnwrappedLineParser.cpp b/lib/Format/UnwrappedLineParser.cpp index e724c69eb8..19bca8d860 100644 --- a/lib/Format/UnwrappedLineParser.cpp +++ b/lib/Format/UnwrappedLineParser.cpp @@ -215,7 +215,7 @@ void UnwrappedLineParser::parsePPDirective() { nextToken(); if (FormatTok.Tok.getIdentifierInfo() == NULL) { - addUnwrappedLine(); + parsePPUnknown(); return; } diff --git a/unittests/Format/FormatTest.cpp b/unittests/Format/FormatTest.cpp index 5ffd351889..bffbbf5331 100644 --- a/unittests/Format/FormatTest.cpp +++ b/unittests/Format/FormatTest.cpp @@ -714,8 +714,10 @@ TEST_F(FormatTest, DoesNotBreakPureVirtualFunctionDefinition) { " OwningPtr &buffer) = 0;"); } -TEST_F(FormatTest, BreaksOnHashWhenDirectiveIsInvalid) { - EXPECT_EQ("#\n;", format("#;")); +TEST_F(FormatTest, LayoutUnknownPPDirective) { + EXPECT_EQ("#123 \"A string literal\"", + format(" # 123 \"A string literal\"")); + EXPECT_EQ("#;", format("#;")); verifyFormat("#\n;\n;\n;"); } -- 2.40.0