https://github.com/owenca created
https://github.com/llvm/llvm-project/pull/111229
…ptions
Fixes #54848.
>From 8849f09458363a96dc3dd080b9e87aa785f6958f Mon Sep 17 00:00:00 2001
From: Owen Pan <owenpi...@gmail.com>
Date: Fri, 4 Oct 2024 21:21:43 -0700
Subject: [PATCH] [clang-format] Don't insert spaces after keywords in protobuf
field options
Fixes #54848.
---
clang/lib/Format/TokenAnnotator.cpp | 26 ++++++++++++----------
clang/unittests/Format/FormatTestProto.cpp | 1 +
2 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/clang/lib/Format/TokenAnnotator.cpp
b/clang/lib/Format/TokenAnnotator.cpp
index d537855fef4564..f6e5798057bbd2 100644
--- a/clang/lib/Format/TokenAnnotator.cpp
+++ b/clang/lib/Format/TokenAnnotator.cpp
@@ -4910,6 +4910,8 @@ bool TokenAnnotator::spaceRequiredBefore(const
AnnotatedLine &Line,
if (Left.is(tok::star) && Right.is(tok::comment))
return true;
+ const auto *BeforeLeft = Left.Previous;
+
if (IsCpp) {
if (Left.is(TT_OverloadedOperator) &&
Right.isOneOf(TT_TemplateOpener, TT_TemplateCloser)) {
@@ -4962,7 +4964,7 @@ bool TokenAnnotator::spaceRequiredBefore(const
AnnotatedLine &Line,
if (Left.Tok.getIdentifierInfo() && Right.Tok.isLiteral())
return true;
} else if (Style.isProto()) {
- if (Right.is(tok::period) &&
+ if (Right.is(tok::period) && !(BeforeLeft && BeforeLeft->is(tok::period))
&&
Left.isOneOf(Keywords.kw_optional, Keywords.kw_required,
Keywords.kw_repeated, Keywords.kw_extend)) {
return true;
@@ -5070,8 +5072,8 @@ bool TokenAnnotator::spaceRequiredBefore(const
AnnotatedLine &Line,
if (Left.is(TT_FatArrow))
return true;
// for await ( ...
- if (Right.is(tok::l_paren) && Left.is(Keywords.kw_await) && Left.Previous
&&
- Left.Previous->is(tok::kw_for)) {
+ if (Right.is(tok::l_paren) && Left.is(Keywords.kw_await) && BeforeLeft &&
+ BeforeLeft->is(tok::kw_for)) {
return true;
}
if (Left.is(Keywords.kw_async) && Right.is(tok::l_paren) &&
@@ -5108,7 +5110,7 @@ bool TokenAnnotator::spaceRequiredBefore(const
AnnotatedLine &Line,
return false;
// Valid JS method names can include keywords, e.g. `foo.delete()` or
// `bar.instanceof()`. Recognize call positions by preceding period.
- if (Left.Previous && Left.Previous->is(tok::period) &&
+ if (BeforeLeft && BeforeLeft->is(tok::period) &&
Left.Tok.getIdentifierInfo()) {
return false;
}
@@ -5126,22 +5128,22 @@ bool TokenAnnotator::spaceRequiredBefore(const
AnnotatedLine &Line,
// "of" is only a keyword if it appears after another identifier
// (e.g. as "const x of y" in a for loop), or after a destructuring
// operation (const [x, y] of z, const {a, b} of c).
- (Left.is(Keywords.kw_of) && Left.Previous &&
- (Left.Previous->is(tok::identifier) ||
- Left.Previous->isOneOf(tok::r_square, tok::r_brace)))) &&
- (!Left.Previous || Left.Previous->isNot(tok::period))) {
+ (Left.is(Keywords.kw_of) && BeforeLeft &&
+ (BeforeLeft->is(tok::identifier) ||
+ BeforeLeft->isOneOf(tok::r_square, tok::r_brace)))) &&
+ (!BeforeLeft || BeforeLeft->isNot(tok::period))) {
return true;
}
- if (Left.isOneOf(tok::kw_for, Keywords.kw_as) && Left.Previous &&
- Left.Previous->is(tok::period) && Right.is(tok::l_paren)) {
+ if (Left.isOneOf(tok::kw_for, Keywords.kw_as) && BeforeLeft &&
+ BeforeLeft->is(tok::period) && Right.is(tok::l_paren)) {
return false;
}
if (Left.is(Keywords.kw_as) &&
Right.isOneOf(tok::l_square, tok::l_brace, tok::l_paren)) {
return true;
}
- if (Left.is(tok::kw_default) && Left.Previous &&
- Left.Previous->is(tok::kw_export)) {
+ if (Left.is(tok::kw_default) && BeforeLeft &&
+ BeforeLeft->is(tok::kw_export)) {
return true;
}
if (Left.is(Keywords.kw_is) && Right.is(tok::l_brace))
diff --git a/clang/unittests/Format/FormatTestProto.cpp
b/clang/unittests/Format/FormatTestProto.cpp
index 30ce57c545ec76..61c10f8412c7d6 100644
--- a/clang/unittests/Format/FormatTestProto.cpp
+++ b/clang/unittests/Format/FormatTestProto.cpp
@@ -190,6 +190,7 @@ TEST_F(FormatTestProto, MessageFieldAttributes) {
" aaaaaaaaaaaaaaaa: true\n"
" }\n"
"];");
+ verifyFormat("repeated A a = 1 [(annotation).int32.repeated.test = true];");
}
TEST_F(FormatTestProto, DoesntWrapFileOptions) {
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
