clang-format: Last line in incomplete block is indented incorrectly

Marianne Mailhot-Sarrasin · Marianne Mailhot-Sarrasin · commit 03137c65382e · 2016-04-14T14:56:49.000Z
Indentation of the last line was reset to the initial indentation of the block when reaching EOF. Patch by Maxime Beaulieu Differential Revision: http://reviews.llvm.org/D19065 llvm-svn: 266321
diff --git a/clang/lib/Format/UnwrappedLineParser.cpp b/clang/lib/Format/UnwrappedLineParser.cpp
@@ -430,6 +430,9 @@ void UnwrappedLineParser::parseBlock(bool MustBeDeclaration, bool AddLevel,
     ++Line->Level;
   parseLevel(/*HasOpeningBrace=*/true);
 
+  if (eof())
+    return;
+
   if (MacroBlock ? !FormatTok->is(TT_MacroBlockEnd)
                  : !FormatTok->is(tok::r_brace)) {
     Line->Level = InitialLevel;
diff --git a/clang/unittests/Format/FormatTest.cpp b/clang/unittests/Format/FormatTest.cpp
@@ -7110,10 +7110,9 @@ TEST_F(FormatTest, BlockCommentsAtEndOfLine) {
 }
 
 TEST_F(FormatTest, IndentLineCommentsInStartOfBlockAtEndOfFile) {
-  // FIXME: This is not what we want...
   verifyFormat("{\n"
-               "// a"
-               "// b");
+               "  // a\n"
+               "  // b");
 }
 
 TEST_F(FormatTest, FormatStarDependingOnContext) {

Original file line number	Diff line number	Diff line change
`@@ -7110,10 +7110,9 @@ TEST_F(FormatTest, BlockCommentsAtEndOfLine) {`
`7110`	`7110`	`}`
`7111`	`7111`
`7112`	`7112`	`TEST_F(FormatTest, IndentLineCommentsInStartOfBlockAtEndOfFile) {`
`7113`		`- // FIXME: This is not what we want...`
`7114`	`7113`	`verifyFormat("{\n"`
`7115`		`- "// a"`
`7116`		`- "// b");`
	`7114`	`+ " // a\n"`
	`7115`	`+ " // b");`
`7117`	`7116`	`}`
`7118`	`7117`
`7119`	`7118`	`TEST_F(FormatTest, FormatStarDependingOnContext) {`