Skip to content

Improve the compatibility layer a little bit more #1997

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

Merged
merged 1 commit into from
Aug 4, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,7 @@ public enum SyntaxNodeKind: String, CaseIterable {
case .packElementType: return "packReferenceType"
case .patternExpr: return "unresolvedPatternExpr"
case .platformVersion: return "availabilityVersionRestriction"
case .platformVersionItem: return " availabilityVersionRestrictionListEntry"
case .platformVersionItem: return "availabilityVersionRestrictionListEntry"
case .platformVersionItemList: return "availabilityVersionRestrictionList"
case .postfixOperatorExpr: return "postfixUnaryExpr"
case .poundSourceLocationArguments: return "poundSourceLocationArgs"
Expand Down
21 changes: 18 additions & 3 deletions Sources/SwiftSyntax/SwiftSyntaxCompatibility.swift
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@ extension AttributeSyntax {
@available(*, deprecated, renamed: "WithAttributesSyntax")
public typealias AttributedSyntax = WithAttributesSyntax

extension AvailabilityArgumentSyntax {
@available(*, deprecated, renamed: "Argument")
public typealias Entry = Argument
}

extension ClosureSignatureSyntax {
@available(*, deprecated, renamed: "ParameterClause")
public typealias Input = ParameterClause
Expand Down Expand Up @@ -80,12 +85,22 @@ extension NamedDeclSyntax {
extension MemberAccessExprSyntax {
@available(*, deprecated, renamed: "declName.baseName")
public var name: TokenSyntax {
return declName.baseName
get {
return declName.baseName
}
set {
declName.baseName = newValue
}
}

@available(*, deprecated, renamed: "declName.argumentNames")
public var declNameArguments: DeclNameArgumentsSyntax? {
return declName.argumentNames
get {
return declName.argumentNames
}
set {
declName.argumentNames = newValue
}
}

@available(*, deprecated, message: "Use initializer taking `DeclReferenceExprSyntax` instead")
Expand Down Expand Up @@ -245,7 +260,7 @@ public extension TokenSyntax {
}

@available(*, deprecated, renamed: "poundElseifToken")
static func poundElseIfKeyword(
static func poundElseifKeyword(
leadingTrivia: Trivia = [],
trailingTrivia: Trivia = [],
presence: SourcePresence = .present
Expand Down
14 changes: 7 additions & 7 deletions Sources/SwiftSyntax/generated/RenamedNodesCompatibility.swift
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
//
//===----------------------------------------------------------------------===//

@available(*, deprecated, renamed: "PlatformVersionItemSyntax")
public typealias availabilityVersionRestrictionListEntrySyntax = PlatformVersionItemSyntax

@available(*, deprecated, renamed: "ImportPathComponentListSyntax")
public typealias AccessPathSyntax = ImportPathComponentListSyntax

Expand Down Expand Up @@ -42,6 +39,9 @@ public typealias AvailabilityVersionRestrictionSyntax = PlatformVersionSyntax
@available(*, deprecated, renamed: "PlatformVersionItemListSyntax")
public typealias AvailabilityVersionRestrictionListSyntax = PlatformVersionItemListSyntax

@available(*, deprecated, renamed: "PlatformVersionItemSyntax")
public typealias AvailabilityVersionRestrictionListEntrySyntax = PlatformVersionItemSyntax

@available(*, deprecated, renamed: "BackDeployedAttributeArgumentsSyntax")
public typealias BackDeployedAttributeSpecListSyntax = BackDeployedAttributeArgumentsSyntax

Expand Down Expand Up @@ -211,10 +211,6 @@ public typealias YieldExprListElementSyntax = YieldedExpressionSyntax
public typealias YieldListSyntax = YieldedExpressionsClauseSyntax

public extension SyntaxKind {
static var availabilityVersionRestrictionListEntry: Self {
return .platformVersionItem
}

static var accessPath: Self {
return .importPathComponentList
}
Expand Down Expand Up @@ -251,6 +247,10 @@ public extension SyntaxKind {
return .platformVersionItemList
}

static var availabilityVersionRestrictionListEntry: Self {
return .platformVersionItem
}

static var backDeployedAttributeSpecList: Self {
return .backDeployedAttributeArguments
}
Expand Down