Skip to content

Merge main into release/6.2 #3102

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed

Conversation

github-actions[bot]
Copy link

This PR was automatically opened by a GitHub action. Review the changes included in this PR and determine if they should be included in the release branch. If yes, merge the PR. Otherwise revert changes that should not be included on this branch.

beccadax and others added 24 commits April 24, 2025 20:39
This unfortunately ends up causing CI checks to reset and always skipped
after marking a PR ready for review.
Update the allowed user for publishing releases to bnbarham
[CI] Remove skip for ready for review
Add trailing comma support in cases missing from Swift 6.1
Add support to parse the non-underscored version of the @specialized attribute.

rdar://150033316
`Macro.Type` is used in various `Error`s and since SE-0470, needs to
conform to `SendableMetatype`.
Add a `SendableMetatype` conformance to `Macro`
Change InlineArray sugar separator `x` -> `of`
…ental feature

This is an alternative spelling of `typealias DefaultIsolation = (MainActor | nonisolated)`
that was proposed as part of SE-0478.

`using` declaration accepts an attribute or a modifier and currently
could be used to set a default actor isolation per file, but could
be extended to support other use-cases in the future.

Implementation uses `DefaultIsolationPerFile` experimental feature
flag to hide the syntax.
[SwiftParser] SE-0478: Implement `using` declaration under an experim…
Update `ExpandEditorPlaceholdersToLiteralClosures` and
`CallToTrailingClosures` such that they can handle macro expansion
exprs and decls. This unfortunately requires changing them such that
they take a `Syntax` input and output to satisfy the conformance to
`SyntaxRefactoringProvider`, but that seems preferable to making the
refactoring types themselves generic.

If in the future we decide to expose `CallLikeSyntax` as a public
protocol, we could decide to expose additional generic `refactor`
overloads here. However it's not clear there's enough clients of
these APIs to motivate doing that in this PR.
Handle macro expansion args in placeholder expansion
The only place where we were dropping unexpected tokens or trivia around a string segment was when inferring the indentation of the closing quote. Instead of having a precondition, add the conditions that the last segment doesn’t have any of these here and fall back to the same logic that is used when the indentaiton could not be inferred.

Fixes #3097
Relax precondition in `postProcessMultilineStringLiteral`
@bnbarham
Copy link
Contributor

#3098 is new, will put up a cherry-pick separately

@bnbarham bnbarham closed this Jun 18, 2025
@bnbarham bnbarham deleted the automerge/merge-main-2025-06-16_09-05 branch June 18, 2025 00:53
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.

8 participants