Skip to content

Commit 044d4b1

Browse files
ahoppenahoppen
authored
Merge pull request #2060 from Matejkob/remove-unnecessary-raw
Remove all unnecessary `raw:` interpolations
2 parents 1d7cd4d + 903c7a1 commit 044d4b1

13 files changed

+46
-46
lines changed

‎CodeGeneration/Sources/generate-swiftsyntax/LayoutNode+Extensions.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ extension LayoutNode {
2626
if !child.kind.isNodeChoicesEmpty {
2727
paramType = "\(child.syntaxChoicesType)"
2828
} else if child.hasBaseType {
29-
paramType = "some \(raw: child.syntaxNodeKind.protocolType)"
29+
paramType = "some \(child.syntaxNodeKind.protocolType)"
3030
} else {
3131
paramType = child.syntaxNodeKind.syntaxType
3232
}
@@ -126,16 +126,16 @@ extension LayoutNode {
126126
if child.buildableType.builderInitializableType != child.buildableType {
127127
let param = Node.from(type: child.buildableType).layoutNode!.singleNonDefaultedChild
128128
if child.isOptional {
129-
produceExpr = ExprSyntax("\(childName)Builder().map { \(raw: child.buildableType.syntaxBaseName)(\(param.varOrCaseName): $0) }")
129+
produceExpr = ExprSyntax("\(childName)Builder().map { \(child.buildableType.syntaxBaseName)(\(param.varOrCaseName): $0) }")
130130
} else {
131-
produceExpr = ExprSyntax("\(raw: child.buildableType.syntaxBaseName)(\(param.varOrCaseName): \(childName)Builder())")
131+
produceExpr = ExprSyntax("\(child.buildableType.syntaxBaseName)(\(param.varOrCaseName): \(childName)Builder())")
132132
}
133133
} else {
134134
produceExpr = ExprSyntax("\(childName)Builder()")
135135
}
136136
builderParameters.append(
137137
FunctionParameterSyntax(
138-
"@\(builderInitializableType.resultBuilderType) \(raw: childName)Builder: () throws-> \(raw: builderInitializableType.syntax)"
138+
"@\(builderInitializableType.resultBuilderType) \(childName)Builder: () throws-> \(builderInitializableType.syntax)"
139139
)
140140
)
141141
} else {
@@ -196,7 +196,7 @@ fileprivate func convertFromSyntaxProtocolToSyntaxType(child: Child, useDeprecat
196196
}
197197

198198
if child.buildableType.isBaseType && !child.kind.isNodeChoices {
199-
return ExprSyntax("\(raw: child.buildableType.syntaxBaseName)(fromProtocol: \(childName.backtickedIfNeeded))")
199+
return ExprSyntax("\(child.buildableType.syntaxBaseName)(fromProtocol: \(childName.backtickedIfNeeded))")
200200
}
201-
return ExprSyntax("\(raw: childName.backtickedIfNeeded)")
201+
return ExprSyntax("\(childName.backtickedIfNeeded)")
202202
}

‎CodeGeneration/Sources/generate-swiftsyntax/templates/swiftparser/ParserTokenSpecSetFile.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ let parserTokenSpecSetFile = SourceFileSyntax(leadingTrivia: copyrightHeader) {
2121
for layoutNode in SYNTAX_NODES.compactMap(\.layoutNode) {
2222
for child in layoutNode.children {
2323
if case let .token(choices, _, _) = child.kind, choices.count > 1 {
24-
try! ExtensionDeclSyntax("extension \(raw: layoutNode.kind.syntaxType)") {
24+
try! ExtensionDeclSyntax("extension \(layoutNode.kind.syntaxType)") {
2525
try EnumDeclSyntax(
2626
"""
2727
@_spi(Diagnostics)

‎CodeGeneration/Sources/generate-swiftsyntax/templates/swiftparserdiagnostics/ChildNameForDiagnosticsFile.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ let childNameForDiagnosticFile = SourceFileSyntax(leadingTrivia: copyrightHeader
2525
for node in NON_BASE_SYNTAX_NODES.compactMap(\.layoutNode) {
2626
for child in node.children {
2727
if let nameForDiagnostics = child.nameForDiagnostics {
28-
SwitchCaseSyntax("case \\\(raw: node.type.syntaxBaseName).\(child.varOrCaseName):") {
28+
SwitchCaseSyntax("case \\\(node.type.syntaxBaseName).\(child.varOrCaseName):") {
2929
StmtSyntax(#"return "\#(raw: nameForDiagnostics)""#)
3030
}
3131
}

‎CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/ChildNameForKeyPathFile.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ let childNameForKeyPathFile = SourceFileSyntax(leadingTrivia: copyrightHeader) {
2929
for child in node.children {
3030
SwitchCaseSyntax(
3131
"""
32-
case \\\(raw: node.type.syntaxBaseName).\(child.varOrCaseName):
32+
case \\\(node.type.syntaxBaseName).\(child.varOrCaseName):
3333
return \(literal: child.varOrCaseName.description)
3434
"""
3535
)

‎CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/RawSyntaxNodesFile.swift

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ let rawSyntaxNodesFile = SourceFileSyntax(leadingTrivia: copyrightHeader) {
4343
DeclSyntax(
4444
"""
4545
\(node.apiAttributes(forRaw: true))\
46-
public protocol \(node.kind.rawType)NodeProtocol: \(raw: node.base.rawProtocolType) {}
46+
public protocol \(node.kind.rawType)NodeProtocol: \(node.base.rawProtocolType) {}
4747
"""
4848
)
4949
}
@@ -76,7 +76,7 @@ let rawSyntaxNodesFile = SourceFileSyntax(leadingTrivia: copyrightHeader) {
7676
try VariableDeclSyntax("public var raw: RawSyntax") {
7777
try SwitchExprSyntax("switch self") {
7878
for (swiftName, _) in choices {
79-
SwitchCaseSyntax("case .\(raw: swiftName)(let node): return node.raw")
79+
SwitchCaseSyntax("case .\(swiftName)(let node): return node.raw")
8080
}
8181
}
8282
}
@@ -86,7 +86,7 @@ let rawSyntaxNodesFile = SourceFileSyntax(leadingTrivia: copyrightHeader) {
8686
StmtSyntax(
8787
"""
8888
if let node = \(kind.rawType)(other) {
89-
self = .\(raw: swiftName)(node)
89+
self = .\(swiftName)(node)
9090
return
9191
}
9292
"""
@@ -114,7 +114,7 @@ let rawSyntaxNodesFile = SourceFileSyntax(leadingTrivia: copyrightHeader) {
114114
for n in SYNTAX_NODES where n.base == node.kind {
115115
SwitchCaseItemSyntax(
116116
pattern: ExpressionPatternSyntax(
117-
expression: ExprSyntax(".\(raw: n.varOrCaseName)")
117+
expression: ExprSyntax(".\(n.varOrCaseName)")
118118
)
119119
)
120120
}
@@ -191,8 +191,8 @@ let rawSyntaxNodesFile = SourceFileSyntax(leadingTrivia: copyrightHeader) {
191191

192192
DeclSyntax(
193193
"""
194-
public var elements: [Raw\(raw: node.collectionElementType.syntaxBaseName)] {
195-
layoutView.children.map { Raw\(raw: node.collectionElementType.syntaxBaseName)(raw: $0!) }
194+
public var elements: [Raw\(node.collectionElementType.syntaxBaseName)] {
195+
layoutView.children.map { Raw\(node.collectionElementType.syntaxBaseName)(raw: $0!) }
196196
}
197197
"""
198198
)
@@ -238,7 +238,7 @@ let rawSyntaxNodesFile = SourceFileSyntax(leadingTrivia: copyrightHeader) {
238238
}
239239

240240
for (index, child) in node.children.enumerated() {
241-
try VariableDeclSyntax("public var \(child.varOrCaseName.backtickedIfNeeded): Raw\(raw: child.buildableType.buildable)") {
241+
try VariableDeclSyntax("public var \(child.varOrCaseName.backtickedIfNeeded): Raw\(child.buildableType.buildable)") {
242242
let iuoMark = child.isOptional ? "" : "!"
243243

244244
if child.syntaxNodeKind == .syntax {

‎CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/RawSyntaxValidationFile.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ let rawSyntaxValidationFile = try! SourceFileSyntax(leadingTrivia: copyrightHead
204204
let verifiedChoices = ArrayExprSyntax {
205205
ArrayElementSyntax(
206206
leadingTrivia: .newline,
207-
expression: ExprSyntax("verify(layout[\(raw: index)], as: Raw\(raw: child.buildableType.buildable).self)")
207+
expression: ExprSyntax("verify(layout[\(raw: index)], as: Raw\(child.buildableType.buildable).self)")
208208
)
209209
}
210210

@@ -221,11 +221,11 @@ let rawSyntaxValidationFile = try! SourceFileSyntax(leadingTrivia: copyrightHead
221221
}
222222
}
223223
let verifyCall = ExprSyntax(
224-
"verify(layout[\(raw: index)], as: Raw\(raw: child.buildableType.buildable).self, tokenChoices: \(choices))"
224+
"verify(layout[\(raw: index)], as: Raw\(child.buildableType.buildable).self, tokenChoices: \(choices))"
225225
)
226226
ExprSyntax("assertNoError(kind, \(raw: index), \(verifyCall))")
227227
default:
228-
ExprSyntax("assertNoError(kind, \(raw: index), verify(layout[\(raw: index)], as: Raw\(raw: child.buildableType.buildable).self))")
228+
ExprSyntax("assertNoError(kind, \(raw: index), verify(layout[\(raw: index)], as: Raw\(child.buildableType.buildable).self))")
229229
}
230230
}
231231
} else if let node = node.collectionNode {
@@ -238,7 +238,7 @@ let rawSyntaxValidationFile = try! SourceFileSyntax(leadingTrivia: copyrightHead
238238
let choice = SYNTAX_NODE_MAP[choiceName]!
239239
ArrayElementSyntax(
240240
leadingTrivia: .newline,
241-
expression: ExprSyntax("verify(element, as: \(raw: choice.kind.rawType).self)")
241+
expression: ExprSyntax("verify(element, as: \(choice.kind.rawType).self)")
242242
)
243243
}
244244
}

‎CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/RenamedChildrenCompatibilityFile.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import Utils
1717

1818
let renamedChildrenCompatibilityFile = try! SourceFileSyntax(leadingTrivia: copyrightHeader) {
1919
for layoutNode in SYNTAX_NODES.compactMap(\.layoutNode).filter({ $0.children.hasDeprecatedChild }) {
20-
try ExtensionDeclSyntax("extension \(raw: layoutNode.type.syntaxBaseName)") {
20+
try ExtensionDeclSyntax("extension \(layoutNode.type.syntaxBaseName)") {
2121
for child in layoutNode.children {
2222
if let deprecatedVarName = child.deprecatedVarName {
2323
let childType: TypeSyntax = child.kind.isNodeChoicesEmpty ? child.syntaxNodeKind.syntaxType : child.syntaxChoicesType
@@ -26,7 +26,7 @@ let renamedChildrenCompatibilityFile = try! SourceFileSyntax(leadingTrivia: copy
2626
DeclSyntax(
2727
"""
2828
@available(*, deprecated, renamed: "\(child.varOrCaseName)")
29-
public var \(raw: deprecatedVarName): \(raw: type) {
29+
public var \(deprecatedVarName): \(type) {
3030
get {
3131
return \(child.varOrCaseName.backtickedIfNeeded)
3232
}
@@ -47,7 +47,7 @@ let renamedChildrenCompatibilityFile = try! SourceFileSyntax(leadingTrivia: copy
4747
DeclSyntax(
4848
"""
4949
@available(*, deprecated, renamed: "add\(raw: collectionElementName)")
50-
public func add\(raw: deprecatedCollectionElementName)(_ element: \(raw: childEltType)) -> \(raw: layoutNode.kind.syntaxType) {
50+
public func add\(raw: deprecatedCollectionElementName)(_ element: \(childEltType)) -> \(layoutNode.kind.syntaxType) {
5151
return add\(raw: collectionElementName)(element)
5252
}
5353
"""
@@ -83,7 +83,7 @@ let renamedChildrenCompatibilityFile = try! SourceFileSyntax(leadingTrivia: copy
8383
LabeledExprSyntax(label: "leadingTrivia", expression: ExprSyntax("leadingTrivia"))
8484
for child in layoutNode.children {
8585
if child.isUnexpectedNodes {
86-
LabeledExprSyntax(expression: ExprSyntax("\(raw: child.deprecatedVarName ?? child.varOrCaseName)"))
86+
LabeledExprSyntax(expression: ExprSyntax("\(child.deprecatedVarName ?? child.varOrCaseName)"))
8787
} else {
8888
LabeledExprSyntax(
8989
label: child.varOrCaseName,

‎CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/SyntaxBaseNodesFile.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ let syntaxBaseNodesFile = SourceFileSyntax(leadingTrivia: copyrightHeader) {
2727
///
2828
/// - Warning: Do not conform to this protocol yourself.
2929
\(node.apiAttributes())\
30-
public protocol \(node.kind.protocolType): \(raw: node.base.protocolType) {}
30+
public protocol \(node.kind.protocolType): \(node.base.protocolType) {}
3131
"""
3232
)
3333

@@ -202,7 +202,7 @@ let syntaxBaseNodesFile = SourceFileSyntax(leadingTrivia: copyrightHeader) {
202202
///
203203
/// - Note: This will incur an existential conversion.
204204
@available(*, deprecated, message: "Expression always evaluates to true")
205-
public func isProtocol(_: \(raw: node.kind.protocolType).Protocol) -> Bool {
205+
public func isProtocol(_: \(node.kind.protocolType).Protocol) -> Bool {
206206
return true
207207
}
208208
"""

‎CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/SyntaxNodesFile.swift

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@ func syntaxNode(emitKind: SyntaxNodeKind) -> SourceFileSyntax {
3737
// We are actually handling this node now
3838
try! StructDeclSyntax(
3939
"""
40-
// MARK: - \(raw: node.kind.syntaxType)
40+
// MARK: - \(node.kind.syntaxType)
4141
4242
\(documentation)
4343
\(node.node.apiAttributes())\
44-
public struct \(raw: node.kind.syntaxType): \(raw: node.baseType.syntaxBaseName)Protocol, SyntaxHashable
44+
public struct \(node.kind.syntaxType): \(node.baseType.syntaxBaseName)Protocol, SyntaxHashable
4545
"""
4646
) {
4747
for child in node.children {
@@ -59,7 +59,7 @@ func syntaxNode(emitKind: SyntaxNodeKind) -> SourceFileSyntax {
5959
DeclSyntax(
6060
"""
6161
public init?(_ node: some SyntaxProtocol) {
62-
guard node.raw.kind == .\(raw: node.varOrCaseName) else { return nil }
62+
guard node.raw.kind == .\(node.varOrCaseName) else { return nil }
6363
self._syntaxNode = node._syntaxNode
6464
}
6565
"""
@@ -72,7 +72,7 @@ func syntaxNode(emitKind: SyntaxNodeKind) -> SourceFileSyntax {
7272
/// - Warning: This assumes that the `SyntaxData` is of the correct kind.
7373
/// If it is not, the behaviour is undefined.
7474
internal init(_ data: SyntaxData) {
75-
precondition(data.raw.kind == .\(raw: node.varOrCaseName))
75+
precondition(data.raw.kind == .\(node.varOrCaseName))
7676
self._syntaxNode = Syntax(data)
7777
}
7878
"""
@@ -121,13 +121,13 @@ func syntaxNode(emitKind: SyntaxNodeKind) -> SourceFileSyntax {
121121
rightParen: .rightParenToken(),
122122
trailingClosure: ClosureExprSyntax(signature: closureSignature) {
123123
if node.children.isEmpty {
124-
DeclSyntax("let raw = RawSyntax.makeEmptyLayout(kind: SyntaxKind.\(raw: node.varOrCaseName), arena: arena)")
124+
DeclSyntax("let raw = RawSyntax.makeEmptyLayout(kind: SyntaxKind.\(node.varOrCaseName), arena: arena)")
125125
} else {
126126
DeclSyntax("let layout: [RawSyntax?] = \(layoutList)")
127127
DeclSyntax(
128128
"""
129129
let raw = RawSyntax.makeLayout(
130-
kind: SyntaxKind.\(raw: node.varOrCaseName),
130+
kind: SyntaxKind.\(node.varOrCaseName),
131131
from: layout,
132132
arena: arena,
133133
leadingTrivia: leadingTrivia,
@@ -161,7 +161,7 @@ func syntaxNode(emitKind: SyntaxNodeKind) -> SourceFileSyntax {
161161
// ===================
162162

163163
let childType: TypeSyntax = child.kind.isNodeChoicesEmpty ? child.syntaxNodeKind.syntaxType : child.syntaxChoicesType
164-
let type = child.isOptional ? TypeSyntax("\(raw: childType)?") : TypeSyntax("\(raw: childType)")
164+
let type = child.isOptional ? TypeSyntax("\(childType)?") : TypeSyntax("\(childType)")
165165

166166
try! VariableDeclSyntax(
167167
"""
@@ -171,9 +171,9 @@ func syntaxNode(emitKind: SyntaxNodeKind) -> SourceFileSyntax {
171171
) {
172172
AccessorDeclSyntax(accessorSpecifier: .keyword(.get)) {
173173
if child.isOptional {
174-
StmtSyntax("return data.child(at: \(raw: index), parent: Syntax(self)).map(\(raw: childType).init)")
174+
StmtSyntax("return data.child(at: \(raw: index), parent: Syntax(self)).map(\(childType).init)")
175175
} else {
176-
StmtSyntax("return \(raw: childType)(data.child(at: \(raw: index), parent: Syntax(self))!)")
176+
StmtSyntax("return \(childType)(data.child(at: \(raw: index), parent: Syntax(self))!)")
177177
}
178178
}
179179

@@ -213,7 +213,7 @@ func syntaxNode(emitKind: SyntaxNodeKind) -> SourceFileSyntax {
213213
if let col = raw.layoutView!.children[\(raw: index)] {
214214
collection = col.layoutView!.appending(element.raw, arena: arena)
215215
} else {
216-
collection = RawSyntax.makeLayout(kind: SyntaxKind.\(raw: childNode.varOrCaseName),
216+
collection = RawSyntax.makeLayout(kind: SyntaxKind.\(childNode.varOrCaseName),
217217
from: [element.raw], arena: arena)
218218
}
219219
let newData = data.replacingChild(at: \(raw: index), with: collection, rawNodeArena: arena, allocationArena: arena)
@@ -247,7 +247,7 @@ private func generateSyntaxChildChoices(for child: Child) throws -> EnumDeclSynt
247247

248248
return try! EnumDeclSyntax("public enum \(child.syntaxChoicesType): SyntaxChildChoices, SyntaxHashable") {
249249
for choice in choices {
250-
DeclSyntax("case `\(choice.varOrCaseName)`(\(raw: choice.syntaxNodeKind.syntaxType))")
250+
DeclSyntax("case `\(choice.varOrCaseName)`(\(choice.syntaxNodeKind.syntaxType))")
251251
}
252252

253253
try! VariableDeclSyntax("public var _syntaxNode: Syntax") {

‎CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/SyntaxRewriterFile.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,8 @@ let syntaxRewriterFile = SourceFileSyntax(leadingTrivia: copyrightHeader) {
138138
/// - Parameter node: the node that is being visited
139139
/// - Returns: the rewritten node
140140
\(node.apiAttributes())\
141-
open func visit(_ node: \(node.kind.syntaxType)) -> \(raw: node.baseType.syntaxBaseName) {
142-
return \(raw: node.baseType.syntaxBaseName)(visitChildren(node))
141+
open func visit(_ node: \(node.kind.syntaxType)) -> \(node.baseType.syntaxBaseName) {
142+
return \(node.baseType.syntaxBaseName)(visitChildren(node))
143143
}
144144
"""
145145
)
@@ -150,12 +150,12 @@ let syntaxRewriterFile = SourceFileSyntax(leadingTrivia: copyrightHeader) {
150150
let baseKind = baseNode.kind
151151
DeclSyntax(
152152
"""
153-
/// Visit any \(raw: baseKind.syntaxType) node.
153+
/// Visit any \(baseKind.syntaxType) node.
154154
/// - Parameter node: the node that is being visited
155155
/// - Returns: the rewritten node
156156
\(baseNode.apiAttributes())\
157-
public func visit(_ node: \(raw: baseKind.syntaxType)) -> \(raw: baseKind.syntaxType) {
158-
return visit(node.data).cast(\(raw: baseKind.syntaxType).self)
157+
public func visit(_ node: \(baseKind.syntaxType)) -> \(baseKind.syntaxType) {
158+
return visit(node.data).cast(\(baseKind.syntaxType).self)
159159
}
160160
"""
161161
)

0 commit comments

Comments
 (0)