[clang] clang-format: Add "AllowShortNamespacesOnASingleLine" option (PR #105597)
Owen Pan via cfe-commits
cfe-commits at lists.llvm.org
Sun Oct 13 13:50:33 PDT 2024
================
@@ -616,6 +627,62 @@ class LineJoiner {
return 1;
}
+ unsigned tryMergeNamespace(SmallVectorImpl<AnnotatedLine *>::const_iterator I,
+ SmallVectorImpl<AnnotatedLine *>::const_iterator E,
+ unsigned Limit) {
+ if (Limit == 0)
+ return 0;
+ if (I[1]->InPPDirective != (*I)->InPPDirective ||
+ (I[1]->InPPDirective && I[1]->First->HasUnescapedNewline)) {
+ return 0;
+ }
+ if (I + 2 == E || I[2]->Type == LT_Invalid)
+ return 0;
+
+ Limit = limitConsideringMacros(I + 1, E, Limit);
+
+ if (!nextTwoLinesFitInto(I, Limit))
+ return 0;
+
+ // Check if it's a namespace inside a namespace, and call recursively if so.
+ // '3' is the sizes of the whitespace and closing brace for " _inner_ }".
+ if (I[1]->First->is(tok::kw_namespace)) {
+ if (I[1]->Last->is(tok::comment))
----------------
owenca wrote:
```suggestion
if (I[1]->Last->is(tok::comment) || !Style.CompactNamespaces)
```
And adjust the test cases and/or turning `CompactNamespaces` on/off. See https://github.com/llvm/llvm-project/pull/105597#issuecomment-2408847951.
https://github.com/llvm/llvm-project/pull/105597
More information about the cfe-commits
mailing list