[clang] [clang-format] Fix clang-format issue with 'new' and 'delete' keywords in C files (PR #85470)
@@ -11450,6 +11450,11 @@ TEST_F(FormatTest, UnderstandsNewAndDelete) {
"void new (link p);\n"
"void delete (link p);");
+ verifyFormat("{ p->delete(); }\n"
+ "{ p->new(); }",
+ "{ p->delete (); }\n"
+ "{ p->new (); }");
owenca wrote:
My bad. Fixed in a2527e06d777.
https://github.com/llvm/llvm-project/pull/85470
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] [clang-format] Fix clang-format issue with 'new' and 'delete' keywords in C files (PR #85470)
@@ -11450,6 +11450,11 @@ TEST_F(FormatTest, UnderstandsNewAndDelete) {
"void new (link p);\n"
"void delete (link p);");
+ verifyFormat("{ p->delete(); }\n"
+ "{ p->new(); }",
+ "{ p->delete (); }\n"
+ "{ p->new (); }");
scythris wrote:
Thank you for the comment @owenca
Changing the order makes sense.
But if the changes to `TokenAnnotator::spaceRequiredBetween` are reverted, the
test without braces will not fail. That is why I included them. But it's not
really clear to me why they are needed.
https://github.com/llvm/llvm-project/pull/85470
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] [clang-format] Fix clang-format issue with 'new' and 'delete' keywords in C files (PR #85470)
https://github.com/owenca commented: I forgot to submit my review. https://github.com/llvm/llvm-project/pull/85470 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] [clang-format] Fix clang-format issue with 'new' and 'delete' keywords in C files (PR #85470)
@@ -11450,6 +11450,11 @@ TEST_F(FormatTest, UnderstandsNewAndDelete) {
"void new (link p);\n"
"void delete (link p);");
+ verifyFormat("{ p->delete(); }\n"
+ "{ p->new(); }",
+ "{ p->delete (); }\n"
+ "{ p->new (); }");
owenca wrote:
```suggestion
verifyFormat("p->new();\n"
"p->delete();",
"p->new ();\n"
"p->delete ();");
```
I would drop the braces and reverse the delete/new order.
https://github.com/llvm/llvm-project/pull/85470
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] [clang-format] Fix clang-format issue with 'new' and 'delete' keywords in C files (PR #85470)
https://github.com/owenca edited https://github.com/llvm/llvm-project/pull/85470 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] [clang-format] Fix clang-format issue with 'new' and 'delete' keywords in C files (PR #85470)
github-actions[bot] wrote: @scythris Congratulations on having your first Pull Request (PR) merged into the LLVM Project! Your changes will be combined with recent changes from other authors, then tested by our [build bots](https://lab.llvm.org/buildbot/). If there is a problem with a build, you may recieve a report in an email or a comment on this PR. Please check whether problems have been caused by your change specifically, as the builds can include changes from many authors. It is not uncommon for your change to be included in a build that fails due to someone else's changes, or infrastructure issues. How to do this, and the rest of the post-merge process, is covered in detail [here](https://llvm.org/docs/MyFirstTypoFix.html#myfirsttypofix-issues-after-landing-your-pr). If your change does cause a problem, it may be reverted, or you can revert it yourself. This is a normal part of [LLVM development](https://llvm.org/docs/DeveloperPolicy.html#patch-reversion-policy). You can fix your changes and open a new PR to merge them again. If you don't get any reports, no action is required from you. Your changes are working as expected, well done! https://github.com/llvm/llvm-project/pull/85470 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] [clang-format] Fix clang-format issue with 'new' and 'delete' keywords in C files (PR #85470)
https://github.com/HazardyKnusperkeks closed https://github.com/llvm/llvm-project/pull/85470 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] [clang-format] Fix clang-format issue with 'new' and 'delete' keywords in C files (PR #85470)
scythris wrote: Thank you @HazardyKnusperkeks Would somebody else be able to merge? I don't have access. https://github.com/llvm/llvm-project/pull/85470 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] [clang-format] Fix clang-format issue with 'new' and 'delete' keywords in C files (PR #85470)
https://github.com/HazardyKnusperkeks approved this pull request. https://github.com/llvm/llvm-project/pull/85470 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] [clang-format] Fix clang-format issue with 'new' and 'delete' keywords in C files (PR #85470)
https://github.com/scythris updated
https://github.com/llvm/llvm-project/pull/85470
>From 451a664dc3d325deff54ff7d582b0063569f54cd Mon Sep 17 00:00:00 2001
From: Trym Strand
Date: Fri, 15 Mar 2024 21:56:22 +0100
Subject: [PATCH] Fix clang-format issue with 'new' and 'delete' keywords in C
files
This patch resolves an issue in clang-format where 'new' and 'delete' were
incorrectly recognized as keywords in C files. The fix modifies the
TokenAnnotator::spaceRequiredBetween to correctly handle 'new' and 'delete' as
an identifier in C code, preventing incorrect formatting.
---
clang/lib/Format/TokenAnnotator.cpp | 2 +-
clang/unittests/Format/FormatTest.cpp | 5 +
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/clang/lib/Format/TokenAnnotator.cpp
b/clang/lib/Format/TokenAnnotator.cpp
index e464c2b5731a35..c58204ce33ae52 100644
--- a/clang/lib/Format/TokenAnnotator.cpp
+++ b/clang/lib/Format/TokenAnnotator.cpp
@@ -4607,7 +4607,7 @@ bool TokenAnnotator::spaceRequiredBetween(const
AnnotatedLine ,
return Style.SpaceBeforeParensOptions.AfterFunctionDefinitionName ||
spaceRequiredBeforeParens(Right);
}
-if (!Left.Previous || Left.Previous->isNot(tok::period)) {
+if (!Left.Previous || !Left.Previous->isOneOf(tok::period, tok::arrow)) {
if (Left.isOneOf(tok::kw_try, Keywords.kw___except, tok::kw_catch)) {
return Style.SpaceBeforeParensOptions.AfterControlStatements ||
spaceRequiredBeforeParens(Right);
diff --git a/clang/unittests/Format/FormatTest.cpp
b/clang/unittests/Format/FormatTest.cpp
index fc367a7a5a8981..a6f9a0941cb040 100644
--- a/clang/unittests/Format/FormatTest.cpp
+++ b/clang/unittests/Format/FormatTest.cpp
@@ -11450,6 +11450,11 @@ TEST_F(FormatTest, UnderstandsNewAndDelete) {
"void new (link p);\n"
"void delete (link p);");
+ verifyFormat("{ p->delete(); }\n"
+ "{ p->new(); }",
+ "{ p->delete (); }\n"
+ "{ p->new (); }");
+
FormatStyle AfterPlacementOperator = getLLVMStyle();
AfterPlacementOperator.SpaceBeforeParens = FormatStyle::SBPO_Custom;
EXPECT_TRUE(
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] [clang-format] Fix clang-format issue with 'new' and 'delete' keywords in C files (PR #85470)
github-actions[bot] wrote:
:warning: C/C++ code formatter, clang-format found issues in your code.
:warning:
You can test this locally with the following command:
``bash
git-clang-format --diff 60fa2b0670b874b702ddb9f81d098af692ea6875
1e815bb2090f7747da027a04f69906063db7b02a -- clang/lib/Format/TokenAnnotator.cpp
clang/unittests/Format/FormatTest.cpp
``
View the diff from clang-format here.
``diff
diff --git a/clang/unittests/Format/FormatTest.cpp
b/clang/unittests/Format/FormatTest.cpp
index 410e08ea58..a6f9a0941c 100644
--- a/clang/unittests/Format/FormatTest.cpp
+++ b/clang/unittests/Format/FormatTest.cpp
@@ -11449,7 +11449,7 @@ TEST_F(FormatTest, UnderstandsNewAndDelete) {
"void delete(link p);",
"void new (link p);\n"
"void delete (link p);");
-
+
verifyFormat("{ p->delete(); }\n"
"{ p->new(); }",
"{ p->delete (); }\n"
``
https://github.com/llvm/llvm-project/pull/85470
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] [clang-format] Fix clang-format issue with 'new' and 'delete' keywords in C files (PR #85470)
llvmbot wrote:
@llvm/pr-subscribers-clang-format
Author: None (scythris)
Changes
This resolves an issue in clang-format where `new` and `delete` were
incorrectly formatted as keywords in C files. The fix modifies
`TokenAnnotator::spaceRequiredBetween` to handle `new` and `delete` when used
as identifiers for function pointers in structs in C code.
---
Full diff: https://github.com/llvm/llvm-project/pull/85470.diff
2 Files Affected:
- (modified) clang/lib/Format/TokenAnnotator.cpp (+1-1)
- (modified) clang/unittests/Format/FormatTest.cpp (+5)
``diff
diff --git a/clang/lib/Format/TokenAnnotator.cpp
b/clang/lib/Format/TokenAnnotator.cpp
index e464c2b5731a35..c58204ce33ae52 100644
--- a/clang/lib/Format/TokenAnnotator.cpp
+++ b/clang/lib/Format/TokenAnnotator.cpp
@@ -4607,7 +4607,7 @@ bool TokenAnnotator::spaceRequiredBetween(const
AnnotatedLine ,
return Style.SpaceBeforeParensOptions.AfterFunctionDefinitionName ||
spaceRequiredBeforeParens(Right);
}
-if (!Left.Previous || Left.Previous->isNot(tok::period)) {
+if (!Left.Previous || !Left.Previous->isOneOf(tok::period, tok::arrow)) {
if (Left.isOneOf(tok::kw_try, Keywords.kw___except, tok::kw_catch)) {
return Style.SpaceBeforeParensOptions.AfterControlStatements ||
spaceRequiredBeforeParens(Right);
diff --git a/clang/unittests/Format/FormatTest.cpp
b/clang/unittests/Format/FormatTest.cpp
index fc367a7a5a8981..410e08ea589692 100644
--- a/clang/unittests/Format/FormatTest.cpp
+++ b/clang/unittests/Format/FormatTest.cpp
@@ -11449,6 +11449,11 @@ TEST_F(FormatTest, UnderstandsNewAndDelete) {
"void delete(link p);",
"void new (link p);\n"
"void delete (link p);");
+
+ verifyFormat("{ p->delete(); }\n"
+ "{ p->new(); }",
+ "{ p->delete (); }\n"
+ "{ p->new (); }");
FormatStyle AfterPlacementOperator = getLLVMStyle();
AfterPlacementOperator.SpaceBeforeParens = FormatStyle::SBPO_Custom;
``
https://github.com/llvm/llvm-project/pull/85470
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] [clang-format] Fix clang-format issue with 'new' and 'delete' keywords in C files (PR #85470)
github-actions[bot] wrote: Thank you for submitting a Pull Request (PR) to the LLVM Project! This PR will be automatically labeled and the relevant teams will be notified. If you wish to, you can add reviewers by using the "Reviewers" section on this page. If this is not working for you, it is probably because you do not have write permissions for the repository. In which case you can instead tag reviewers by name in a comment by using `@` followed by their GitHub username. If you have received no comments on your PR for a week, you can request a review by "ping"ing the PR by adding a comment “Ping”. The common courtesy "ping" rate is once a week. Please remember that you are asking for valuable time from other developers. If you have further questions, they may be answered by the [LLVM GitHub User Guide](https://llvm.org/docs/GitHub.html). You can also ask questions in a comment on this PR, on the [LLVM Discord](https://discord.com/invite/xS7Z362) or on the [forums](https://discourse.llvm.org/). https://github.com/llvm/llvm-project/pull/85470 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] [clang-format] Fix clang-format issue with 'new' and 'delete' keywords in C files (PR #85470)
https://github.com/scythris created
https://github.com/llvm/llvm-project/pull/85470
This resolves an issue in clang-format where `new` and `delete` were
incorrectly formatted as keywords in C files. The fix modifies
`TokenAnnotator::spaceRequiredBetween` to handle `new` and `delete` when used
as identifiers for function pointers in structs in C code.
>From 1e815bb2090f7747da027a04f69906063db7b02a Mon Sep 17 00:00:00 2001
From: Trym Strand
Date: Fri, 15 Mar 2024 21:56:22 +0100
Subject: [PATCH] Fix clang-format issue with 'delete' keyword in C files
This patch resolves an issue in clang-format where 'delete' was incorrectly
recognized as a keyword in C files. The fix modifies the TokenAnnotator rules
to correctly handle 'delete' as an identifier in C code, preventing incorrect
formatting.
---
clang/lib/Format/TokenAnnotator.cpp | 2 +-
clang/unittests/Format/FormatTest.cpp | 5 +
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/clang/lib/Format/TokenAnnotator.cpp
b/clang/lib/Format/TokenAnnotator.cpp
index e464c2b5731a35..c58204ce33ae52 100644
--- a/clang/lib/Format/TokenAnnotator.cpp
+++ b/clang/lib/Format/TokenAnnotator.cpp
@@ -4607,7 +4607,7 @@ bool TokenAnnotator::spaceRequiredBetween(const
AnnotatedLine ,
return Style.SpaceBeforeParensOptions.AfterFunctionDefinitionName ||
spaceRequiredBeforeParens(Right);
}
-if (!Left.Previous || Left.Previous->isNot(tok::period)) {
+if (!Left.Previous || !Left.Previous->isOneOf(tok::period, tok::arrow)) {
if (Left.isOneOf(tok::kw_try, Keywords.kw___except, tok::kw_catch)) {
return Style.SpaceBeforeParensOptions.AfterControlStatements ||
spaceRequiredBeforeParens(Right);
diff --git a/clang/unittests/Format/FormatTest.cpp
b/clang/unittests/Format/FormatTest.cpp
index fc367a7a5a8981..410e08ea589692 100644
--- a/clang/unittests/Format/FormatTest.cpp
+++ b/clang/unittests/Format/FormatTest.cpp
@@ -11449,6 +11449,11 @@ TEST_F(FormatTest, UnderstandsNewAndDelete) {
"void delete(link p);",
"void new (link p);\n"
"void delete (link p);");
+
+ verifyFormat("{ p->delete(); }\n"
+ "{ p->new(); }",
+ "{ p->delete (); }\n"
+ "{ p->new (); }");
FormatStyle AfterPlacementOperator = getLLVMStyle();
AfterPlacementOperator.SpaceBeforeParens = FormatStyle::SBPO_Custom;
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
