Skip to content

[6.0] Remove public from the extension declaration and add it to each declaration in the extension #2611

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

Conversation

Matejkob
Copy link
Contributor

@Matejkob Matejkob commented Apr 20, 2024

Cherry-pick #2602 into release/6.0

  • Explanation: In Remove public from the extension declaration and add it to each declaration in the extension #2602, we refactored code by using the swift-format rule NoAccessLevelOnExtensionDeclaration and manually chose only changes with the public access level modifier. To reduce the risk of merge conflicts in cherry-picks into release/6.0, we are merging this refactored code into this branch as well.

  • Scope: Entire codebase.

  • Risk: Medium. During the cherry-pick, we encountered conflicts in the following files:

    • Sources/SwiftIDEUtils/Syntax+Classifications.swift
    • Sources/SwiftSyntax/SyntaxProtocol.swift
    • Sources/SwiftSyntax/Utils.swift

    The risk is that there are some extension members that don't have the public modifier transferred from their extension declaration.

  • Testing: Passes current test suite.

  • Issue: N/A

  • Reviewer: Alex Hoppen (@ahoppen)

…ration in the extension

(cherry picked from commit ce8b9cd)

# Conflicts:
#	Sources/SwiftIDEUtils/Syntax+Classifications.swift
#	Sources/SwiftSyntax/SyntaxProtocol.swift
#	Sources/SwiftSyntax/Utils.swift
@Matejkob
Copy link
Contributor Author

To minimize the risk of this cherry-pick I have created one more PR with only changes made by swift-format Matejkob#4 and compared diff of that PR with a diff of this PR: https://www.diffchecker.com/W6apMACn/ and it looks like there is no public access level modifier on any member missing.

@bnbarham
Copy link
Contributor

@swift-ci please test

@ahoppen ahoppen enabled auto-merge April 22, 2024 17:44
@ahoppen ahoppen merged commit d7bed36 into swiftlang:release/6.0 Apr 22, 2024
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.

3 participants