Skip to content

Wrap conditions after-first - #7

Merged
constantintin merged 2 commits into
masterfrom
fix/wrap-conditions-after-first
Aug 27, 2026
Merged

Wrap conditions after-first#7
constantintin merged 2 commits into
masterfrom
fix/wrap-conditions-after-first

Conversation

@constantintin

@constantintin constantintin commented Aug 27, 2026

Copy link
Copy Markdown

Also fixed existing test failures on the objc side.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
@constantintin constantintin self-assigned this Aug 27, 2026
test.sh has been failing since cba5551 ("Merge remote-tracking branch
'square/master'"), which swapped the clang-format binary from 19.1.4 to the
21.0.0git 60b43ef build, rewrote a number of .clang-format settings, and added
new custom pre/post processors -- but left the expected-output fixtures alone.

Every difference is explained by an intentional change in that commit:

  SortIncludes false -> true, IncludeBlocks: Merge   reordered imports
  BraceWrapping.AfterObjCDeclaration true -> false   dropped blank lines
  ObjCSpaceAfterProperty: true removed               @Property (x) -> @Property(x)
  SpacesInContainerLiterals true -> false            @[ x ] -> @[x], @"k" : v -> @"k": v
  AllowShortFunctionsOnASingleLine All -> None       inline ctor bodies split
  AlignTrailingComments true -> false                macro continuation alignment
  new custom/RemoveVoidBlockDeclaration.py           ^(void) { -> ^{

The config is the correct side here, not the fixtures: Fantastical's committed
Objective-C already uses the new container-literal style by a wide margin
(@[x] 1932 occurrences vs @[ x ] 2).

Regenerated FormattedExample.m and UnicodeFormattedExample.m from
format-objc-file-dry-run.sh. The other four cases already passed. Full suite,
including the idempotence and in-place checks, now passes.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
@constantintin
constantintin merged commit 45dd3b6 into master Aug 27, 2026
1 check passed
@constantintin
constantintin deleted the fix/wrap-conditions-after-first branch August 27, 2026 13:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants