From b1be9d6e7437ccf921ae6bfb273dc10cb92cb48c Mon Sep 17 00:00:00 2001 From: Alexander Kornienko Date: Wed, 3 Apr 2013 12:38:53 +0000 Subject: Even better way to handle comments adjacent to preprocessor directives. Summary: It turns out that we don't need to store CommentsBeforeNextToken in the line state, but rather flush them before we start parsing preprocessor directives. This fixes wrong comment indentation in code blocks in macro calls (the test is included). Reviewers: klimek Reviewed By: klimek CC: cfe-commits Differential Revision: http://llvm-reviews.chandlerc.com/D617 llvm-svn: 178638 --- clang/unittests/Format/FormatTest.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'clang/unittests/Format/FormatTest.cpp') diff --git a/clang/unittests/Format/FormatTest.cpp b/clang/unittests/Format/FormatTest.cpp index 3f26b0a4821..92a2363bbdb 100644 --- a/clang/unittests/Format/FormatTest.cpp +++ b/clang/unittests/Format/FormatTest.cpp @@ -592,6 +592,14 @@ TEST_F(FormatTest, UnderstandsSingleLineComments) { verifyGoogleFormat( "aaaaaaaaaaaaaaaaaaaaaaaaaa(\n" " aaaaaaaaaaaaaaaaaaaaaa); // 81 cols with this comment"); + EXPECT_EQ("D(a, {\n" + " // test\n" + " int a;\n" + "});", + format("D(a, {\n" + "// test\n" + "int a;\n" + "});")); } TEST_F(FormatTest, CanFormatCommentsLocally) { -- cgit v1.2.3