In D94500#2605515, @HazardyKnusperkeks wrote:

In D94500#2604754, @timwoj wrote:

Rebase onto master again

master or main? Please rebase on main. That is where the pushes land. (And as far as I can see master hasn't been updated in quite some time.

Rebase onto master again

In D94500#2594394, @HazardyKnusperkeks wrote:

In D94500#2593229, @timwoj wrote:

In D94500#2592448, @HazardyKnusperkeks wrote:

Do you need someone to push this?

Yes I do. I don't have committer access.

Please state the name and mail for the commit.

In D94500#2592448, @HazardyKnusperkeks wrote:

Do you need someone to push this?

Rebased on main

Added release note entry

https://bugs.llvm.org/show_bug.cgi?id=48668 already exists as a bug report linked to this review. I'm not sure "the Zeek project would like to start using this" is a good enough reason to block an LLVM release though. I'm fairly certain there aren't a whole lot of people in the world using Whitesmiths. That said, there's already at least one clang-format bug in the release-blocker list.

No problem, sorry it took a bit of back-and-forth there. Is there any way this can sneak into 12.0?

• Make LineLevel an enum class
• Combine multiple duplicate checks into a named variable
• Minor formatting fixes

Restored lost single-nesting namespace test

Add tests for Whitesmiths with all of the NamespaceIndentation options

Fixing diff to look at the right commit

Updates from review:

• Fixed handling of IndentCaseLabels
• Fixed indentation of namespace braces
• Replaced bool argument to addUnwrappedLine with an enum

This fixes https://bugs.llvm.org/show_bug.cgi?id=48569, amongst other things.

I know that 10.0 was branch recently. Any chance this can make it over?

Thanks for the consideration on committer access, but I'm going to have to pass for the time being.

Fix ordering

In D68346#1708384, @timwoj wrote:

Changed option name to SpacesInConditionalStatement, added isKeywordWithCondition method, added some extra tests

Changed option name to SpacesInConditionalStatement, added isKeywordWithCondition method, added some extra tests

I don't have push access for master. Can someone merge this?

Marked failing tests as FIXME

I updated this patch to remove all of the code from ContinuationIndenter and to use the newer BraceWrapping style option instead of setting each one individually in UnwrappedLineParser.