Fix conditional import parsing with access modifiers#2494
Merged
calda merged 1 commit intonicklockwood:developfrom Apr 11, 2026
Merged
Fix conditional import parsing with access modifiers#2494calda merged 1 commit intonicklockwood:developfrom
calda merged 1 commit intonicklockwood:developfrom
Conversation
Prevent `sortImports` from treating access-controlled declarations after an import as Swift 6 access-controlled imports. This keeps `#if` / `#elseif` import blocks intact when a branch-local declaration follows the import. Add a regression test covering conditional imports followed by `private` declarations. Co-authored-by: Codex <noreply@openai.com>
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## develop #2494 +/- ##
===========================================
- Coverage 95.31% 95.31% -0.01%
===========================================
Files 168 168
Lines 25381 25383 +2
===========================================
+ Hits 24192 24193 +1
- Misses 1189 1190 +1 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
Contributor
Author
|
Thanks! This is blocking our adoption of the most recent release, should I also do a PR against main? |
Collaborator
|
I can cut a release of the |
calda
pushed a commit
that referenced
this pull request
Apr 11, 2026
Co-authored-by: Codex <noreply@openai.com>
Collaborator
Contributor
Author
|
Thanks so much! |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Prevent
sortImportsfrom treating access-controlled declarations after an import as Swift 6 access-controlled imports. This keeps#if/#elseifimport blocks intact when a branch-local declaration follows the import.Could result in a change like this: