Migrate from strings to typed buildable nodes in SyntaxBuildableWrappers
#542
Conversation
| /// If optional `?`, otherwise the empty string. | ||
| var optionalQuestionMark: String { | ||
| isOptional ? "?" : "" | ||
| } |
There was a problem hiding this comment.
This property is replaced with optionalWrapped(type:) and optionalChained(expr:), depending on whether a type or an expression is needed.
| var expressibleAs: String { | ||
| /// The `ExpressibleAs*` Swift type for this syntax kind without any | ||
| /// question marks attached. | ||
| var expressibleAsBaseName: String { |
There was a problem hiding this comment.
This PR factors out a few ...BaseName properties (expressibleAs, syntax, buildable). These represent a non-optional type and will still be strings (as opposed to, e.g. ExpressibleAsTypeBuildables) to make them easy to embed in string interpolations and across type and expression contexts.
Thus .xyzBaseName replaces the earlier .nonOptional.xyz idiom.
| let buildableConformances: [String] = [type.expressibleAsBaseName, type.listBuildableBaseName] + (isSyntax ? [] : [syntaxType.buildableBaseName]) | ||
| let listConformances: [String] = isSyntax ? [] : [syntaxType.listBuildableBaseName] |
There was a problem hiding this comment.
Previously we relied on these types being non-optional. Since optional types wouldn't make sense e.g. in conformance lists and dealing with strings is easier, we use the base names now in a few more places (this shouldn't change anything in the generated code).
| inheritanceClause: createTypeInheritanceClause(conformances: listConformances) | ||
| ) { | ||
| FunctionDecl( | ||
| leadingTrivia: [ | ||
| "/// Builds list of `\(type.syntax)`s.", | ||
| "/// Builds list of `\(type.syntaxBaseName)`s.", |
There was a problem hiding this comment.
Same goes here (and for the other places where base names are now used).
|
@swift-ci please test |
Sources/SwiftSyntaxBuilderGeneration/SyntaxBuildableChild.swift
Outdated
Show resolved
Hide resolved
Previously 'nil' was (incorrectly) generated as an identifier.
fwcd
force-pushed
the
syntax-buildable-wrappers-buildable-nodes
branch
from
ec34a35 to
966a50c
Compare
|
@swift-ci please test |
As proposed in #485 (review), this PR migrates the generated snippets of Swift code in
SyntaxBuildableTypeandSyntaxBuildableChildtoExprBuildables andTypeBuildables.This will pave the way for a future PR porting
BuildableNodes.swift.gybtoSwiftSyntaxBuilderGeneration.