From 2185f64771f039774d54a0be654cce39931580bf Mon Sep 17 00:00:00 2001 From: owenca Date: Mon, 15 Aug 2022 21:30:36 -0700 Subject: [PATCH] [clang-format] Handle comments between access specifier and colon Fixes #56740. Differential Revision: https://reviews.llvm.org/D131940 --- clang/lib/Format/FormatToken.h | 8 ++++++-- clang/unittests/Format/FormatTest.cpp | 10 ++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/clang/lib/Format/FormatToken.h b/clang/lib/Format/FormatToken.h index 7d963cf6af7f..21ed9bb5e04e 100644 --- a/clang/lib/Format/FormatToken.h +++ b/clang/lib/Format/FormatToken.h @@ -584,8 +584,12 @@ public: } bool isAccessSpecifier(bool ColonRequired = true) const { - return isOneOf(tok::kw_public, tok::kw_protected, tok::kw_private) && - (!ColonRequired || (Next && Next->is(tok::colon))); + if (!isOneOf(tok::kw_public, tok::kw_protected, tok::kw_private)) + return false; + if (!ColonRequired) + return true; + const auto NextNonComment = getNextNonComment(); + return NextNonComment && NextNonComment->is(tok::colon); } bool canBePointerOrReferenceQualifier() const { diff --git a/clang/unittests/Format/FormatTest.cpp b/clang/unittests/Format/FormatTest.cpp index ef68c528cb5c..dc450029ccc2 100644 --- a/clang/unittests/Format/FormatTest.cpp +++ b/clang/unittests/Format/FormatTest.cpp @@ -24799,6 +24799,11 @@ TEST_F(FormatTest, IndentAccessModifiers) { " int i;\n" "};\n", Style); + verifyFormat("class C {\n" + " public /* comment */:\n" + " int i;\n" + "};", + Style); verifyFormat("struct S {\n" " private:\n" " class C {\n" @@ -24827,6 +24832,11 @@ TEST_F(FormatTest, IndentAccessModifiers) { " int i;\n" "};\n", Style); + verifyFormat("class C {\n" + " public /**/:\n" + " int i;\n" + "};", + Style); } TEST_F(FormatTest, LimitlessStringsAndComments) {