Skip to content

Conversation

@rintaro
Copy link
Member

@rintaro rintaro commented Dec 16, 2025

Cherry-pick #1086 and #1088 into release/6.2

  • Explanation: Previously type specifiers with attributes (e.g. nonisolated(nonsending)) weren't correctly formatted because there're not handled.
  • Scope: Attribute list.
  • Risk: Low. The change is narrow scoped, and straight forward.
  • Testing: Added test cases
  • Issues: nonisolated(nonsending) is formatted incorrectly #1081
  • Reviewers: Tony Allevato (@allevato)

There's a few issues here:
1. Type specifiers can now have arguments (eg. `nonisolated(nonsending)`)
2. Some type specifiers can be specified "late", which are currently unhandled
3. We were using a mix of `.same` and `.continue` breaks (`.continue` for
   specifiers and `.same` for attributes)
4. Attributes were grouped separately to specifiers

Fixes swiftlang#1081

(cherry picked from commit b2091bd)
Causes quite a few changes in eg. sourcekit-lsp, so presumably will in
other codebases as well. Ideally we'd add this behind some new
versioning in the config.

As an example of a change this causes:
```
private let logMessageToIndexLog:
  @sendable (
    _ message: String, _ type: WindowMessageType, _ structure: LanguageServerProtocol.StructuredLogKind
  ) -> Void
```

To:
```
@sendable
  (
    _ message: String, _ type: WindowMessageType, _ structure: LanguageServerProtocol.StructuredLogKind
  ) -> Void
```

(cherry picked from commit d022b8b)
@rintaro rintaro requested a review from a team as a code owner December 16, 2025 18:13
@rintaro
Copy link
Member Author

rintaro commented Dec 16, 2025

@swift-ci Please test

bnbarham and others added 2 commits December 16, 2025 11:23
Now that workflows is a more stable, use the most recent tag instead of
main to avoid changes to default jobs preventing merging.

(cherry picked from commit 58125eb)
Exclude `"5.9"` from `windows_swift_versions` until swiftlang#1094 is resolved on swift-markdown's side

(cherry picked from commit 2c59487)
@rintaro rintaro merged commit 4a0c66c into swiftlang:release/6.2 Dec 16, 2025
27 checks passed
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.

4 participants