Skip to content

Commit 7b56382

Browse files
committed
Remove MemberAccessExprSyntax Initializer
1 parent 2ca2dc2 commit 7b56382

File tree

5 files changed

+10
-46
lines changed

5 files changed

+10
-46
lines changed

Sources/SwiftSyntaxBuilder/ConvenienceInitializers.swift

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -221,20 +221,6 @@ extension IntegerLiteralExprSyntax: ExpressibleByIntegerLiteral {
221221
}
222222
}
223223

224-
// MARK: - MemberAccessExpr
225-
226-
extension MemberAccessExprSyntax {
227-
/// Creates a `MemberAccessExpr` using the provided parameters.
228-
public init(
229-
base: ExprSyntax? = nil,
230-
dot: TokenSyntax = .periodToken(),
231-
name: String,
232-
declNameArguments: DeclNameArgumentsSyntax? = nil
233-
) {
234-
self.init(base: base, dot: dot, name: .identifier(name), declNameArguments: declNameArguments)
235-
}
236-
}
237-
238224
// MARK: - StringLiteralExpr
239225

240226
extension String {

Sources/_SwiftSyntaxTestSupport/SyntaxProtocol+Initializer.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ private extension TriviaPiece {
7474
fatalError("Unknown associated value type")
7575
}
7676
return ExprSyntax(
77-
FunctionCallExprSyntax(callee: MemberAccessExprSyntax(name: label!)) {
77+
FunctionCallExprSyntax(callee: ExprSyntax(".\(raw: label!)")) {
7878
TupleExprElementSyntax(expression: arg)
7979
}
8080
)
@@ -137,7 +137,7 @@ extension SyntaxProtocol {
137137
tokenKindArgument = nil
138138
} else if case .keyword(let keyword) = tokenKind {
139139
tokenInitializerName = "keyword"
140-
tokenKindArgument = ExprSyntax(MemberAccessExprSyntax(name: String(describing: keyword)))
140+
tokenKindArgument = ExprSyntax(".\(raw: keyword)")
141141
} else if tokenKind.decomposeToRaw().rawKind.defaultText != nil {
142142
tokenInitializerName = "\(String(describing: tokenKind))Token"
143143
tokenKindArgument = nil
@@ -147,7 +147,7 @@ extension SyntaxProtocol {
147147
tokenKindArgument = ExprSyntax(StringLiteralExprSyntax(content: token.text))
148148
}
149149
return ExprSyntax(
150-
FunctionCallExprSyntax(callee: MemberAccessExprSyntax(name: tokenInitializerName)) {
150+
FunctionCallExprSyntax(callee: ExprSyntax(".\(raw: tokenInitializerName)")) {
151151
if let tokenKindArgument = tokenKindArgument {
152152
TupleExprElementSyntax(expression: tokenKindArgument)
153153
}

Tests/SwiftSyntaxBuilderTest/DoStmtTests.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ final class DoStmtTests: XCTestCase {
3535
CatchItemListSyntax {
3636
CatchItemSyntax(
3737
pattern: PatternSyntax("Error3"),
38-
whereClause: WhereClauseSyntax(guardResult: MemberAccessExprSyntax(base: "error", name: "isError4"))
38+
whereClause: WhereClauseSyntax(guardResult: ExprSyntax("error.isError4"))
3939
)
4040
}
4141
) {
42-
ThrowStmtSyntax(expression: MemberAccessExprSyntax(base: "Error4", name: "error3"))
42+
ThrowStmtSyntax(expression: ExprSyntax("Error4.error3"))
4343
},
4444
CatchClauseSyntax {
4545
FunctionCallExprSyntax(callee: ExprSyntax("print")) {
@@ -85,11 +85,11 @@ final class DoStmtTests: XCTestCase {
8585
CatchItemListSyntax {
8686
CatchItemSyntax(
8787
pattern: PatternSyntax("Error3"),
88-
whereClause: WhereClauseSyntax(guardResult: MemberAccessExprSyntax(base: "error", name: "isError4"))
88+
whereClause: WhereClauseSyntax(guardResult: ExprSyntax("error.isError4"))
8989
)
9090
}
9191
) {
92-
ThrowStmtSyntax(expression: MemberAccessExprSyntax(base: "Error4", name: "error3"))
92+
ThrowStmtSyntax(expression: ExprSyntax("Error4.error3"))
9393
},
9494
CatchClauseSyntax {
9595
FunctionCallExprSyntax(callee: ExprSyntax("print")) {
@@ -135,11 +135,11 @@ final class DoStmtTests: XCTestCase {
135135
CatchItemListSyntax {
136136
CatchItemSyntax(
137137
pattern: PatternSyntax("Error3"),
138-
whereClause: WhereClauseSyntax(guardResult: MemberAccessExprSyntax(base: "error", name: "isError4"))
138+
whereClause: WhereClauseSyntax(guardResult: ExprSyntax("error.isError4"))
139139
)
140140
}
141141
) {
142-
ThrowStmtSyntax(expression: MemberAccessExprSyntax(base: "Error4", name: "error3"))
142+
ThrowStmtSyntax(expression: ExprSyntax("Error4.error3"))
143143
},
144144
CatchClauseSyntax {
145145
FunctionCallExprSyntax(callee: ExprSyntax("print")) {

Tests/SwiftSyntaxBuilderTest/ExtensionDeclTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ final class ExtensionDeclTests: XCTestCase {
1919
let keywords = ["associatedtype", "class"].map { keyword -> VariableDeclSyntax in
2020
// We need to use `CodeBlock` here to ensure there is braces around.
2121
let body = CodeBlockSyntax {
22-
FunctionCallExprSyntax(callee: MemberAccessExprSyntax(base: "TokenSyntax", name: "\(keyword)Keyword"))
22+
FunctionCallExprSyntax(callee: ExprSyntax("TokenSyntax.\(raw: keyword)Keyword"))
2323
}
2424

2525
return VariableDeclSyntax(

Tests/SwiftSyntaxBuilderTest/MemberAccessTests.swift

Lines changed: 0 additions & 22 deletions
This file was deleted.

0 commit comments

Comments
 (0)