From 474e46211a141e4566c399b80ae26e3580b70c90 Mon Sep 17 00:00:00 2001 From: Daniel Jasper Date: Wed, 6 Feb 2013 22:04:05 +0000 Subject: [PATCH] Fix bug in the alignment of comments. Before: const char *test[] = { // A "aaaa", // B "aaaaa", }; After: const char *test[] = { // A "aaaa", // B "aaaaa", }; git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@174549 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Format/Format.cpp | 5 ++++- unittests/Format/FormatTest.cpp | 7 +++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/lib/Format/Format.cpp b/lib/Format/Format.cpp index 4128785f63..7f78ac0bcf 100644 --- a/lib/Format/Format.cpp +++ b/lib/Format/Format.cpp @@ -111,7 +111,10 @@ public: Comments.back().Tok = Tok.FormatTok; Comments.back().Spaces = Spaces; Comments.back().NewLines = NewLines; - Comments.back().MinColumn = WhitespaceStartColumn + Spaces; + if (NewLines == 0) + Comments.back().MinColumn = WhitespaceStartColumn + Spaces; + else + Comments.back().MinColumn = Spaces; Comments.back().MaxColumn = Style.ColumnLimit - Spaces - Tok.FormatTok.TokenLength; return; diff --git a/unittests/Format/FormatTest.cpp b/unittests/Format/FormatTest.cpp index 160126ba3d..10742a2609 100644 --- a/unittests/Format/FormatTest.cpp +++ b/unittests/Format/FormatTest.cpp @@ -485,6 +485,13 @@ TEST_F(FormatTest, UnderstandsSingleLineComments) { " parameter));"); verifyGoogleFormat("#endif // HEADER_GUARD"); + + verifyFormat("const char *test[] = {\n" + " // A\n" + " \"aaaa\",\n" + " // B\n" + " \"aaaaa\",\n" + "};"); } TEST_F(FormatTest, UnderstandsMultiLineComments) { -- 2.40.0