unified: Add Swift node type schema generator - #22459
Open
tausbn wants to merge 2 commits into
Open
Conversation
Adds the SwiftSyntax-based schemagen tool and a manual wrapper for regenerating swift_node_types.yml after dependency updates. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Contributor
There was a problem hiding this comment.
Copilot review overview
Review tier: Balanced
Findings: 1
New issues introduced by this change (4)
| Severity | Finding |
|---|---|
 |
unified/swift-syntax-rs/schemagen/Sources/schemagen/main.swift — This hard-coded snapshot means regeneration will silently miss any new variable-text token kind… |
 |
unified/swift-syntax-rs/schemagen/Sources/schemagen/main.swift — This list is incomplete: swift-syntax also generates an unexpectedAfterX slot after the final… |
|
unified/swift-syntax-rs/schemagen/README.md — The documented filter omits unexpectedAfterX, which swift-syntax generates after the final child.… |
|
unified/swift-syntax-rs/schemagen/Sources/schemagen/main.swift — Add the missing “that” so this sentence is grammatical. |
What changed in this PR
Adds tooling to regenerate Swift extractor node types from pinned swift-syntax definitions.
Changes:
- Adds the Swift schema generator package and regeneration script.
- Marks the schema as generated and documents the workflow.
- Updates extractor and contributor documentation.
| File | Description |
|---|---|
unified/swift-syntax-rs/schemagen/Sources/schemagen/main.swift |
Generates the node schema. |
unified/swift-syntax-rs/schemagen/README.md |
Documents generator design and usage. |
unified/swift-syntax-rs/schemagen/Package.swift |
Defines the generator package. |
unified/swift-syntax-rs/schemagen/.gitignore |
Ignores generated dependencies and builds. |
unified/swift-syntax-rs/README.md |
Documents regeneration workflow. |
unified/scripts/regenerate-node-types.sh |
Resolves sources and runs generation. |
unified/extractor/swift_node_types.yml |
Adds generated-file headers. |
unified/extractor/src/languages/swift/adapter.rs |
Documents the schema’s generator. |
unified/AGENTS.md |
Updates contributor guidance. |
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
Comment on lines
+4
to
+12
| // Named-leaf ("varying") token kinds, mirroring the extractor adapter's | ||
| // VARYING_TOKEN_KINDS. Fixed tokens are anonymous (keyed by text) and are not | ||
| // matched by any rule, so they are not emitted here. | ||
| let varyingTokens = [ | ||
| "identifier", "integerLiteral", "floatLiteral", "stringSegment", | ||
| "binaryOperator", "prefixOperator", "postfixOperator", "dollarIdentifier", | ||
| "regexLiteralPattern", "rawStringPoundDelimiter", "regexPoundDelimiter", | ||
| "shebang", "unknown", | ||
| ] |
Comment on lines
+71
to
+72
| // swift-syntax error-recovery slots (`unexpectedBeforeX` and | ||
| // `unexpectedBetweenXAndY`) are never matched by rules. |
Comment on lines
+57
to
+58
| - `unexpectedBeforeX` and `unexpectedBetweenXAndY` error-recovery children are | ||
| dropped; no rule matches them. This filters on the child name: |
| "shebang", "unknown", | ||
| ] | ||
|
|
||
| // The yeast type references a child maps to. A collection wrapper is elided by |
jketema
reviewed
Aug 31, 2026
| fi | ||
| mv "$tmp" "$output" | ||
| chmod 644 "$output" | ||
| echo "Regenerated $output" >&2 |
Contributor
There was a problem hiding this comment.
Instead of having yet another script, could we maybe do this through Bazel? For Swift we e.g. have bazel run //swift/codegen, so I don't see why something similar shouldn't be possible here (and yes, I saw the Bazel remark in unified/swift-syntax-rs/schemagen/README.md).
jketema
reviewed
Aug 31, 2026
Comment on lines
+19
to
+25
| dependencies: [ | ||
| // Deliberately a path dependency on the checkout the neighbouring FFI | ||
| // package resolved, rather than a second URL/exact pin: the schema has | ||
| // to describe the very swift-syntax that the parser links, and a | ||
| // single pin cannot drift from itself. | ||
| .package(name: "swift-syntax", path: "../swift/.build/checkouts/swift-syntax"), | ||
| ], |
Contributor
There was a problem hiding this comment.
This seems to guarantee something that it doesn't really guarantee: This clearly will get violated when the FFI package was built with Bazel.
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.
Adds tooling for automatically updating
swift_node_types.ymlwhen new versions ofswift-syntaxare released.NB: I have not tested this process on macOS, but I have confirmed that it works well on Codespaces.