When adding a macro target to a package, create a dependency on swift-syntax #7476
Conversation
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
…-syntax When editing a package manifest to add a new macro target, also create a package dependency on swift-syntax and import CompilerPluginSupport. We need both so that the macro will build.
DougGregor
requested review from
bnbarham,
MaxDesiatov and
tomerd
as code owners
|
@swift-ci please test |
bnbarham
reviewed
Apr 22, 2024
| } | ||
|
|
||
| /// Package dependency on the swift-syntax package. | ||
| static var swiftSyntax: PackageDependency { |
There was a problem hiding this comment.
Is there any way to get the UserToolchain where you need this? Ideally this would use the installedSwiftPMConfiguration property there, InstalledSwiftPMConfiguration.default.swiftSyntaxVersionForMacroTemplate should disappear. The URL could also be added to that JSON file as well (Utilities/config.json).
There was a problem hiding this comment.
Yes, I can grab it from the command state and thread it through. I've done so in c66eb4f, thanks for the pointer!
…ation This allows us to pick up the appropriate swift-syntax version from the host toolchain, rather than using the hard-coded one.
DougGregor
force-pushed
the
manifest-edit-macro-add-swift-syntax-dependency
branch
from
23ba109 to
c66eb4f
Compare
|
@swift-ci please test |
|
@swift-ci please test Windows |
bnbarham
approved these changes
Apr 23, 2024
DougGregor
added a commit
to DougGregor/swift-package-manager
that referenced
this pull request
Apr 24, 2024
…-syntax (swiftlang#7476) (cherry picked from commit d30647a)
DougGregor
added a commit
that referenced
this pull request
Apr 25, 2024
#7494) * **Explanation**: Implement package manifest editing commands (`swift package add-dependency`, `swift package add-target`, `swift package add-product`) described in [SE-0301](https://github.com/apple/swift-evolution/blob/main/proposals/0301-package-editing-commands.md), using swift-syntax under the hood to perform the edits. * **Original PR**: #7467, #7476, #7477 * **Risk**: Very low. All new code for new commands. * **Reviewed by**: @ahoppen , @bnbarham , @owenv , @MaxDesiatov * **Testing**: New tests. --------- Co-authored-by: Rintaro Ishizaki <[email protected]> Co-authored-by: Saleem Abdulrasool <[email protected]>
furby-tm
pushed a commit
to wabiverse/swift-package-manager
that referenced
this pull request
May 15, 2024
furby-tm
pushed a commit
to wabiverse/swift-package-manager
that referenced
this pull request
May 15, 2024
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.
When editing a package manifest to add a new macro target, also create a package dependency on swift-syntax and import CompilerPluginSupport. We need both so that the macro will build.