Skip to content

Update DeclGroupSyntax to refine DeclSyntaxProtocol #2366

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Nov 27, 2023
Merged

Update DeclGroupSyntax to refine DeclSyntaxProtocol #2366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
807934a
Update DeclGroupSyntax to refine DeclSyntaxProtocol
rauhul Nov 18, 2023
1166176
add pr feedback
rauhul Nov 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion CodeGeneration/Sources/SyntaxSupport/Traits.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,19 @@ import SwiftSyntax

public class Trait {
public let traitName: String
/// The kind of syntax the trait refines.
///
/// Base kind _must_ be a base syntax node, e.g. `.decl`, `.expr` , or
/// others. See ``SyntaxNodeKind/isBase`` for more details.
public let baseKind: SyntaxNodeKind?
public let protocolName: TokenSyntax
public let documentation: SwiftSyntax.Trivia
public let children: [Child]

init(traitName: String, documentation: String? = nil, children: [Child]) {
init(traitName: String, baseKind: SyntaxNodeKind? = nil, documentation: String? = nil, children: [Child]) {
precondition(baseKind?.isBase != false, "`baseKind` must be a base syntax node kind")
self.traitName = traitName
self.baseKind = baseKind
self.protocolName = .identifier("\(traitName)Syntax")
self.documentation = SwiftSyntax.Trivia.docCommentTrivia(from: documentation)
self.children = children
Expand All @@ -36,6 +43,7 @@ public let TRAITS: [Trait] = [
),
Trait(
traitName: "DeclGroup",
baseKind: .decl,
children: [
Child(name: "attributes", kind: .node(kind: .attributeList)),
Child(name: "modifiers", kind: .node(kind: .declModifierList)),
Expand Down
6 changes: 5 additions & 1 deletion CodeGeneration/Sources/generate-swift-syntax/templates/swiftsyntax/SyntaxTraitsFile.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,11 @@ let syntaxTraitsFile = SourceFileSyntax(leadingTrivia: copyrightHeader) {
// MARK: - \(trait.protocolName)

\(trait.documentation)
public protocol \(trait.protocolName): SyntaxProtocol
public protocol \(trait.protocolName): SyntaxProtocol\(raw:
trait.baseKind != nil
? ", \(trait.baseKind!.protocolType)"
: ""
)
"""
) {
for child in trait.children {
Expand Down
2 changes: 1 addition & 1 deletion Sources/SwiftSyntax/generated/SyntaxTraits.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public extension SyntaxProtocol {
// MARK: - DeclGroupSyntax


public protocol DeclGroupSyntax: SyntaxProtocol {
public protocol DeclGroupSyntax: SyntaxProtocol, DeclSyntaxProtocol {
var attributes: AttributeListSyntax {
get
set
Expand Down