github-actions[bot] wrote:
@galenelias 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 bui
https://github.com/owenca closed
https://github.com/llvm/llvm-project/pull/105597
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
https://github.com/owenca updated
https://github.com/llvm/llvm-project/pull/105597
>From 93eb3d89652607173f4f68fce7dcc5b2bd33f266 Mon Sep 17 00:00:00 2001
From: Galen Elias
Date: Wed, 21 Aug 2024 16:33:42 -0700
Subject: [PATCH 01/18] clang-format: Add "AllowShortNamespacesOnASingleLine"
option
https://github.com/owenca updated
https://github.com/llvm/llvm-project/pull/105597
>From 93eb3d89652607173f4f68fce7dcc5b2bd33f266 Mon Sep 17 00:00:00 2001
From: Galen Elias
Date: Wed, 21 Aug 2024 16:33:42 -0700
Subject: [PATCH 01/17] clang-format: Add "AllowShortNamespacesOnASingleLine"
option
https://github.com/owenca commented:
Final NFC cleanup.
https://github.com/llvm/llvm-project/pull/105597
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
@@ -28314,6 +28320,116 @@ TEST_F(FormatTest, KeepFormFeed) {
Style);
}
+TEST_F(FormatTest, ShortNamespacesOption) {
+ auto BaseStyle = getLLVMStyle();
+ BaseStyle.AllowShortNamespacesOnASingleLine = true;
+ BaseStyle.FixNamespaceComments = false;
+ BaseStyle
@@ -616,6 +626,71 @@ class LineJoiner {
return 1;
}
+ unsigned tryMergeNamespace(SmallVectorImpl::const_iterator
I,
+ SmallVectorImpl::const_iterator
E,
+ unsigned Limit) {
+if (Limit == 0)
+ return 0;
+
@@ -28314,6 +28320,116 @@ TEST_F(FormatTest, KeepFormFeed) {
Style);
}
+TEST_F(FormatTest, ShortNamespacesOption) {
+ auto BaseStyle = getLLVMStyle();
+ BaseStyle.AllowShortNamespacesOnASingleLine = true;
+ BaseStyle.FixNamespaceComments = false;
+ BaseStyle
@@ -28314,6 +28320,116 @@ TEST_F(FormatTest, KeepFormFeed) {
Style);
}
+TEST_F(FormatTest, ShortNamespacesOption) {
+ auto BaseStyle = getLLVMStyle();
+ BaseStyle.AllowShortNamespacesOnASingleLine = true;
+ BaseStyle.FixNamespaceComments = false;
+ BaseStyle
@@ -28314,6 +28320,116 @@ TEST_F(FormatTest, KeepFormFeed) {
Style);
}
+TEST_F(FormatTest, ShortNamespacesOption) {
+ auto BaseStyle = getLLVMStyle();
+ BaseStyle.AllowShortNamespacesOnASingleLine = true;
+ BaseStyle.FixNamespaceComments = false;
+ BaseStyle
@@ -28314,6 +28320,116 @@ TEST_F(FormatTest, KeepFormFeed) {
Style);
}
+TEST_F(FormatTest, ShortNamespacesOption) {
+ auto BaseStyle = getLLVMStyle();
+ BaseStyle.AllowShortNamespacesOnASingleLine = true;
+ BaseStyle.FixNamespaceComments = false;
+ BaseStyle
https://github.com/owenca edited
https://github.com/llvm/llvm-project/pull/105597
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
@@ -4504,6 +4504,16 @@ TEST_F(FormatTest, FormatsCompactNamespaces) {
"} // namespace bb\n"
"} // namespace aa",
Style);
+
+ verifyFormat("namespace a { namespace b { namespace c {\n"
+ "}}} // namespace a::b::
https://github.com/galenelias updated
https://github.com/llvm/llvm-project/pull/105597
>From 93eb3d89652607173f4f68fce7dcc5b2bd33f266 Mon Sep 17 00:00:00 2001
From: Galen Elias
Date: Wed, 21 Aug 2024 16:33:42 -0700
Subject: [PATCH 01/16] clang-format: Add "AllowShortNamespacesOnASingleLine"
op
@@ -4504,6 +4504,16 @@ TEST_F(FormatTest, FormatsCompactNamespaces) {
"} // namespace bb\n"
"} // namespace aa",
Style);
+
+ verifyFormat("namespace a { namespace b { namespace c {\n"
+ "}}} // namespace a::b::
@@ -4504,6 +4504,16 @@ TEST_F(FormatTest, FormatsCompactNamespaces) {
"} // namespace bb\n"
"} // namespace aa",
Style);
+
+ verifyFormat("namespace a { namespace b { namespace c {\n"
+ "}}} // namespace a::b::
https://github.com/owenca commented:
Also, additional cleanup of `tryMergeNamespace()`:
```cpp
if (Limit == 0)
return 0;
-if (I[1]->InPPDirective != (*I)->InPPDirective ||
-(I[1]->InPPDirective && I[1]->First->HasUnescapedNewline)) {
+
+assert(I[1]);
+const auto &L
@@ -916,6 +983,21 @@ class LineJoiner {
return 1 + I[1]->Last->TotalLength + 1 + I[2]->Last->TotalLength <= Limit;
}
+ bool nextNLinesFitInto(SmallVectorImpl::const_iterator I,
+ SmallVectorImpl::const_iterator E,
+ unsign
@@ -4484,7 +4484,7 @@ TEST_F(FormatTest, FormatsCompactNamespaces) {
"} // namespace A",
Style);
- Style.ColumnLimit = 40;
+ Style.ColumnLimit = 41;
owenca wrote:
```suggestion
Style.ColumnLimit = 40;
```
See below.
https://
https://github.com/owenca edited
https://github.com/llvm/llvm-project/pull/105597
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
https://github.com/galenelias updated
https://github.com/llvm/llvm-project/pull/105597
>From 93eb3d89652607173f4f68fce7dcc5b2bd33f266 Mon Sep 17 00:00:00 2001
From: Galen Elias
Date: Wed, 21 Aug 2024 16:33:42 -0700
Subject: [PATCH 01/15] clang-format: Add "AllowShortNamespacesOnASingleLine"
op
https://github.com/owenca approved this pull request.
https://github.com/llvm/llvm-project/pull/105597
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
@@ -361,9 +361,19 @@ class LineJoiner {
const auto *FirstNonComment = TheLine->getFirstNonComment();
if (!FirstNonComment)
return 0;
+
// FIXME: There are probably cases where we should use FirstNonComment
// instead of TheLine->First.
+if (TheLine
https://github.com/owenca edited
https://github.com/llvm/llvm-project/pull/105597
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
https://github.com/galenelias updated
https://github.com/llvm/llvm-project/pull/105597
>From 93eb3d89652607173f4f68fce7dcc5b2bd33f266 Mon Sep 17 00:00:00 2001
From: Galen Elias
Date: Wed, 21 Aug 2024 16:33:42 -0700
Subject: [PATCH 01/14] clang-format: Add "AllowShortNamespacesOnASingleLine"
op
@@ -616,6 +627,63 @@ class LineJoiner {
return 1;
}
+ unsigned tryMergeNamespace(SmallVectorImpl::const_iterator
I,
+ SmallVectorImpl::const_iterator
E,
+ unsigned Limit) {
+if (Limit == 0)
+ return 0;
+
https://github.com/owenca edited
https://github.com/llvm/llvm-project/pull/105597
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
https://github.com/owenca edited
https://github.com/llvm/llvm-project/pull/105597
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
https://github.com/owenca edited
https://github.com/llvm/llvm-project/pull/105597
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
https://github.com/owenca commented:
Please rebase and run `ninja clang-format-style`.
https://github.com/llvm/llvm-project/pull/105597
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
@@ -616,6 +627,63 @@ class LineJoiner {
return 1;
}
+ unsigned tryMergeNamespace(SmallVectorImpl::const_iterator
I,
+ SmallVectorImpl::const_iterator
E,
+ unsigned Limit) {
+if (Limit == 0)
+ return 0;
+
@@ -988,6 +988,10 @@ struct FormatStyle {
/// \version 3.7
bool AllowShortLoopsOnASingleLine;
+ /// If ``true``, ``namespace a { class b; }`` can be put on a single line.
+ /// \version 20
+ bool AllowShortNamespacesOnASingleLine;
owenca wrote:
You nee
https://github.com/owenca edited
https://github.com/llvm/llvm-project/pull/105597
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
galenelias wrote:
Ping
https://github.com/llvm/llvm-project/pull/105597
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
https://github.com/galenelias updated
https://github.com/llvm/llvm-project/pull/105597
>From 4118b7dde9adbee7b6aaf5d094d34cb6b64f6c77 Mon Sep 17 00:00:00 2001
From: Galen Elias
Date: Wed, 21 Aug 2024 16:33:42 -0700
Subject: [PATCH 01/12] clang-format: Add "AllowShortNamespacesOnASingleLine"
op
https://github.com/owenca edited
https://github.com/llvm/llvm-project/pull/105597
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
galenelias wrote:
> I don't think we want to add any tests whose formats are questionable or
> still under discussion. WDYT @mydeveloperday @HazardyKnusperkeks @rymiel ?
Ok, that's fair. I have removed these tests. Thanks for the detailed response
and context.
https://github.com/llvm/llvm-p
https://github.com/galenelias updated
https://github.com/llvm/llvm-project/pull/105597
>From 4118b7dde9adbee7b6aaf5d094d34cb6b64f6c77 Mon Sep 17 00:00:00 2001
From: Galen Elias
Date: Wed, 21 Aug 2024 16:33:42 -0700
Subject: [PATCH 01/11] clang-format: Add "AllowShortNamespacesOnASingleLine"
op
owenca wrote:
> > I'm inclined to think that all the AllowShort options should work the same
> > way whether ColumnLimit is 0. However, a couple of them I checked
> > (AllowShortLoops and AllowShortBlocks) have no effect unless set to false.
> > I suggest that we mark the test as a FIXME or do
galenelias wrote:
> I'm inclined to think that all the AllowShort options should work the same
> way whether ColumnLimit is 0. However, a couple of them I checked
> (AllowShortLoops and AllowShortBlocks) have no effect unless set to false. I
> suggest that we mark the test as a FIXME or don't
https://github.com/galenelias updated
https://github.com/llvm/llvm-project/pull/105597
>From 4118b7dde9adbee7b6aaf5d094d34cb6b64f6c77 Mon Sep 17 00:00:00 2001
From: Galen Elias
Date: Wed, 21 Aug 2024 16:33:42 -0700
Subject: [PATCH 01/10] clang-format: Add "AllowShortNamespacesOnASingleLine"
op
@@ -616,6 +627,62 @@ class LineJoiner {
return 1;
}
+ unsigned tryMergeNamespace(SmallVectorImpl::const_iterator
I,
+ SmallVectorImpl::const_iterator
E,
+ unsigned Limit) {
+if (Limit == 0)
+ return 0;
+
@@ -616,6 +626,62 @@ class LineJoiner {
return 1;
}
+ unsigned tryMergeNamespace(SmallVectorImpl::const_iterator
I,
+ SmallVectorImpl::const_iterator
E,
+ unsigned Limit) {
+if (Limit == 0)
+ return 0;
+
@@ -616,6 +627,62 @@ class LineJoiner {
return 1;
}
+ unsigned tryMergeNamespace(SmallVectorImpl::const_iterator
I,
+ SmallVectorImpl::const_iterator
E,
+ unsigned Limit) {
+if (Limit == 0)
+ return 0;
+
@@ -27981,6 +27981,132 @@ TEST_F(FormatTest, BreakBinaryOperations) {
Style);
}
+TEST_F(FormatTest, ShortNamespacesOption) {
+ auto BaseStyle = getLLVMStyle();
+ BaseStyle.AllowShortNamespacesOnASingleLine = true;
+ BaseStyle.FixNamespaceComments = false;
+
+
@@ -972,6 +972,11 @@ struct FormatStyle {
/// \version 3.7
bool AllowShortLoopsOnASingleLine;
+ /// If ``true``, ``namespace a { class b; }`` can be put on a single a single
+ /// line.
owenca wrote:
You need to rerun `dump_format_style.py`.
https://gi
https://github.com/owenca edited
https://github.com/llvm/llvm-project/pull/105597
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
https://github.com/owenca commented:
Please update the release notes.
https://github.com/llvm/llvm-project/pull/105597
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
owenca wrote:
> > The following are missing:
> >
> > * Run `dump_format_style.py`.
> > * Add a `ConfigParseTest` for the new option.
> >
> > How does the new option interact with `CompactNamespaces`? For example:
> >
> > * `AllowShortNamespacesOnASingleLine: true` and `CompactNamespaces: false
galenelias wrote:
Ping
https://github.com/llvm/llvm-project/pull/105597
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
https://github.com/galenelias updated
https://github.com/llvm/llvm-project/pull/105597
>From 4118b7dde9adbee7b6aaf5d094d34cb6b64f6c77 Mon Sep 17 00:00:00 2001
From: Galen Elias
Date: Wed, 21 Aug 2024 16:33:42 -0700
Subject: [PATCH 1/9] clang-format: Add "AllowShortNamespacesOnASingleLine"
opti
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 c557d8520413476221a4f3bf2b7b3fed17681691
ad1fdbb0131b10acf213b7fe49b0421856eadbc8 --e
@@ -27981,6 +27981,132 @@ TEST_F(FormatTest, BreakBinaryOperations) {
Style);
}
+TEST_F(FormatTest, ShortNamespacesOption) {
+ auto BaseStyle = getLLVMStyle();
+ BaseStyle.AllowShortNamespacesOnASingleLine = true;
+ BaseStyle.FixNamespaceComments = false;
+
+
https://github.com/galenelias updated
https://github.com/llvm/llvm-project/pull/105597
>From 4118b7dde9adbee7b6aaf5d094d34cb6b64f6c77 Mon Sep 17 00:00:00 2001
From: Galen Elias
Date: Wed, 21 Aug 2024 16:33:42 -0700
Subject: [PATCH 1/8] clang-format: Add "AllowShortNamespacesOnASingleLine"
opti
@@ -616,6 +626,62 @@ class LineJoiner {
return 1;
}
+ unsigned tryMergeNamespace(SmallVectorImpl::const_iterator
I,
+ SmallVectorImpl::const_iterator
E,
+ unsigned Limit) {
+if (Limit == 0)
+ return 0;
+
@@ -616,6 +626,62 @@ class LineJoiner {
return 1;
}
+ unsigned tryMergeNamespace(SmallVectorImpl::const_iterator
I,
+ SmallVectorImpl::const_iterator
E,
+ unsigned Limit) {
+if (Limit == 0)
g
@@ -27981,6 +27981,132 @@ TEST_F(FormatTest, BreakBinaryOperations) {
Style);
}
+TEST_F(FormatTest, ShortNamespacesOption) {
+ auto BaseStyle = getLLVMStyle();
+ BaseStyle.AllowShortNamespacesOnASingleLine = true;
+ BaseStyle.FixNamespaceComments = false;
+
+
@@ -616,6 +626,62 @@ class LineJoiner {
return 1;
}
+ unsigned tryMergeNamespace(SmallVectorImpl::const_iterator
I,
+ SmallVectorImpl::const_iterator
E,
+ unsigned Limit) {
+if (Limit == 0)
+ return 0;
+
@@ -616,6 +626,62 @@ class LineJoiner {
return 1;
}
+ unsigned tryMergeNamespace(SmallVectorImpl::const_iterator
I,
+ SmallVectorImpl::const_iterator
E,
+ unsigned Limit) {
+if (Limit == 0)
+ return 0;
+
@@ -27981,6 +27981,132 @@ TEST_F(FormatTest, BreakBinaryOperations) {
Style);
}
+TEST_F(FormatTest, ShortNamespacesOption) {
+ auto BaseStyle = getLLVMStyle();
+ BaseStyle.AllowShortNamespacesOnASingleLine = true;
+ BaseStyle.FixNamespaceComments = false;
+
+
@@ -616,6 +626,62 @@ class LineJoiner {
return 1;
}
+ unsigned tryMergeNamespace(SmallVectorImpl::const_iterator
I,
+ SmallVectorImpl::const_iterator
E,
+ unsigned Limit) {
+if (Limit == 0)
+ return 0;
+
@@ -616,6 +626,62 @@ class LineJoiner {
return 1;
}
+ unsigned tryMergeNamespace(SmallVectorImpl::const_iterator
I,
+ SmallVectorImpl::const_iterator
E,
+ unsigned Limit) {
+if (Limit == 0)
+ return 0;
+
@@ -616,6 +626,62 @@ class LineJoiner {
return 1;
}
+ unsigned tryMergeNamespace(SmallVectorImpl::const_iterator
I,
+ SmallVectorImpl::const_iterator
E,
+ unsigned Limit) {
+if (Limit == 0)
+ return 0;
+
@@ -616,6 +626,62 @@ class LineJoiner {
return 1;
}
+ unsigned tryMergeNamespace(SmallVectorImpl::const_iterator
I,
+ SmallVectorImpl::const_iterator
E,
+ unsigned Limit) {
+if (Limit == 0)
+ return 0;
+
@@ -616,6 +626,62 @@ class LineJoiner {
return 1;
}
+ unsigned tryMergeNamespace(SmallVectorImpl::const_iterator
I,
+ SmallVectorImpl::const_iterator
E,
+ unsigned Limit) {
+if (Limit == 0)
o
@@ -361,9 +361,18 @@ class LineJoiner {
const auto *FirstNonComment = TheLine->getFirstNonComment();
if (!FirstNonComment)
return 0;
+
// FIXME: There are probably cases where we should use FirstNonComment
// instead of TheLine->First.
+if (TheLine
@@ -616,6 +626,62 @@ class LineJoiner {
return 1;
}
+ unsigned tryMergeNamespace(SmallVectorImpl::const_iterator
I,
+ SmallVectorImpl::const_iterator
E,
+ unsigned Limit) {
+if (Limit == 0)
+ return 0;
+
@@ -27981,6 +27981,132 @@ TEST_F(FormatTest, BreakBinaryOperations) {
Style);
}
+TEST_F(FormatTest, ShortNamespacesOption) {
+ auto BaseStyle = getLLVMStyle();
+ BaseStyle.AllowShortNamespacesOnASingleLine = true;
+ BaseStyle.FixNamespaceComments = false;
+
+
@@ -27981,6 +27981,132 @@ TEST_F(FormatTest, BreakBinaryOperations) {
Style);
}
+TEST_F(FormatTest, ShortNamespacesOption) {
+ auto BaseStyle = getLLVMStyle();
+ BaseStyle.AllowShortNamespacesOnASingleLine = true;
+ BaseStyle.FixNamespaceComments = false;
+
+
@@ -972,6 +972,11 @@ struct FormatStyle {
/// \version 3.7
bool AllowShortLoopsOnASingleLine;
+ /// If ``true``, ``namespace a { class b; }`` can be put on a single a single
+ /// line.
owenca wrote:
```suggestion
/// If ``true``, ``namespace a { clas
https://github.com/galenelias deleted
https://github.com/llvm/llvm-project/pull/105597
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
@@ -27981,6 +27981,118 @@ TEST_F(FormatTest, BreakBinaryOperations) {
Style);
}
+TEST_F(FormatTest, ShortNamespacesOption) {
+ FormatStyle Style = getLLVMStyle();
+ Style.AllowShortNamespacesOnASingleLine = true;
+ Style.FixNamespaceComments = false;
+
+ //
@@ -27981,6 +27981,118 @@ TEST_F(FormatTest, BreakBinaryOperations) {
Style);
}
+TEST_F(FormatTest, ShortNamespacesOption) {
+ FormatStyle Style = getLLVMStyle();
+ Style.AllowShortNamespacesOnASingleLine = true;
+ Style.FixNamespaceComments = false;
+
+ //
https://github.com/owenca edited
https://github.com/llvm/llvm-project/pull/105597
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
@@ -27981,6 +27981,118 @@ TEST_F(FormatTest, BreakBinaryOperations) {
Style);
}
+TEST_F(FormatTest, ShortNamespacesOption) {
+ FormatStyle Style = getLLVMStyle();
+ Style.AllowShortNamespacesOnASingleLine = true;
+ Style.FixNamespaceComments = false;
+
+ //
@@ -27981,6 +27981,118 @@ TEST_F(FormatTest, BreakBinaryOperations) {
Style);
}
+TEST_F(FormatTest, ShortNamespacesOption) {
+ FormatStyle Style = getLLVMStyle();
+ Style.AllowShortNamespacesOnASingleLine = true;
+ Style.FixNamespaceComments = false;
+
+ //
https://github.com/owenca commented:
The following are missing:
- Run `dump_format_style.py`.
- Add a `ConfigParseTest` for the new option.
How does the new option interact with `CompactNamespaces`? For example:
- `AllowShortNamespacesOnASingleLine: true` and `CompactNamespaces: false`
```
names
@@ -27981,6 +27981,118 @@ TEST_F(FormatTest, BreakBinaryOperations) {
Style);
}
+TEST_F(FormatTest, ShortNamespacesOption) {
+ FormatStyle Style = getLLVMStyle();
owenca wrote:
```suggestion
auto Style = getLLVMStyle();
```
https://github.c
https://github.com/galenelias updated
https://github.com/llvm/llvm-project/pull/105597
>From 4118b7dde9adbee7b6aaf5d094d34cb6b64f6c77 Mon Sep 17 00:00:00 2001
From: Galen Elias
Date: Wed, 21 Aug 2024 16:33:42 -0700
Subject: [PATCH 1/4] clang-format: Add "AllowShortNamespacesOnASingleLine"
opti
@@ -972,6 +972,11 @@ struct FormatStyle {
/// \version 3.7
bool AllowShortLoopsOnASingleLine;
+ /// If ``true``, ``namespace a { class b; }`` can be put on a single a single
+ /// line.
+ /// \version 19
mydeveloperday wrote:
19 is now wrong it should
https://github.com/mydeveloperday requested changes to this pull request.
https://github.com/llvm/llvm-project/pull/105597
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
https://github.com/galenelias updated
https://github.com/llvm/llvm-project/pull/105597
>From 4118b7dde9adbee7b6aaf5d094d34cb6b64f6c77 Mon Sep 17 00:00:00 2001
From: Galen Elias
Date: Wed, 21 Aug 2024 16:33:42 -0700
Subject: [PATCH 1/3] clang-format: Add "AllowShortNamespacesOnASingleLine"
opti
@@ -916,6 +981,23 @@ class LineJoiner {
return 1 + I[1]->Last->TotalLength + 1 + I[2]->Last->TotalLength <= Limit;
}
+ bool nextNLinesFitInto(SmallVectorImpl::const_iterator I,
+ SmallVectorImpl::const_iterator E,
+ unsign
@@ -27981,6 +27981,118 @@ TEST_F(FormatTest, BreakBinaryOperations) {
Style);
}
+TEST_F(FormatTest, ShortNamespacesOption) {
+ FormatStyle Style = getLLVMStyle();
+ Style.AllowShortNamespacesOnASingleLine = true;
+ Style.FixNamespaceComments = false;
+
+ //
@@ -616,6 +625,62 @@ class LineJoiner {
return 1;
}
+ unsigned tryMergeNamespace(SmallVectorImpl::const_iterator
I,
+ SmallVectorImpl::const_iterator
E,
+ unsigned Limit) {
+if (Limit == 0)
+ return 0;
+
@@ -916,6 +981,23 @@ class LineJoiner {
return 1 + I[1]->Last->TotalLength + 1 + I[2]->Last->TotalLength <= Limit;
}
+ bool nextNLinesFitInto(SmallVectorImpl::const_iterator I,
+ SmallVectorImpl::const_iterator E,
+ unsign
https://github.com/galenelias updated
https://github.com/llvm/llvm-project/pull/105597
>From 4118b7dde9adbee7b6aaf5d094d34cb6b64f6c77 Mon Sep 17 00:00:00 2001
From: Galen Elias
Date: Wed, 21 Aug 2024 16:33:42 -0700
Subject: [PATCH 1/2] clang-format: Add "AllowShortNamespacesOnASingleLine"
opti
@@ -616,6 +625,62 @@ class LineJoiner {
return 1;
}
+ unsigned tryMergeNamespace(SmallVectorImpl::const_iterator
I,
+ SmallVectorImpl::const_iterator
E,
+ unsigned Limit) {
+if (Limit == 0)
+ return 0;
+
https://github.com/mydeveloperday requested changes to this pull request.
https://github.com/llvm/llvm-project/pull/105597
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
https://github.com/galenelias updated
https://github.com/llvm/llvm-project/pull/105597
>From 4118b7dde9adbee7b6aaf5d094d34cb6b64f6c77 Mon Sep 17 00:00:00 2001
From: Galen Elias
Date: Wed, 21 Aug 2024 16:33:42 -0700
Subject: [PATCH] clang-format: Add "AllowShortNamespacesOnASingleLine" option
T
https://github.com/galenelias updated
https://github.com/llvm/llvm-project/pull/105597
>From 3819c15c8c6258d1d29a38fcfb71db8567fb34e5 Mon Sep 17 00:00:00 2001
From: Galen Elias
Date: Wed, 21 Aug 2024 15:46:35 -0700
Subject: [PATCH] clang-format: Add "AllowShortNamespacesOnASingleLine" option
T
llvmbot wrote:
@llvm/pr-subscribers-clang-format
Author: Galen Elias (galenelias)
Changes
This addresses: https://github.com/llvm/llvm-project/issues/101363 which is a
resurrection of a previously opened but never completed review:
https://reviews.llvm.org/D11851
The feature is to allow
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
https://github.com/galenelias created
https://github.com/llvm/llvm-project/pull/105597
This addresses: https://github.com/llvm/llvm-project/issues/101363 which is a
resurrection of a previously opened but never completed review:
https://reviews.llvm.org/D11851
The feature is to allow code lik
94 matches
Mail list logo