Skip to content

Commit 7272f19

Browse files
authored
Merge pull request #476 from ahoppen/ahoppen/no-tokenlist
Remove errorTokens from `CodeBlockItem`
2 parents e5875f3 + dcbf05d commit 7272f19

File tree

3 files changed

+4
-7
lines changed

3 files changed

+4
-7
lines changed

Sources/SwiftFormatRules/NoAssignmentInExpressions.swift

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,17 +57,15 @@ public final class NoAssignmentInExpressions: SyntaxFormatRule {
5757
newItems.append(
5858
CodeBlockItemSyntax(
5959
item: .expr(ExprSyntax(assignmentExpr)),
60-
semicolon: nil,
61-
errorTokens: nil
60+
semicolon: nil
6261
)
6362
.withLeadingTrivia(
6463
(returnStmt.leadingTrivia ?? []) + (assignmentExpr.leadingTrivia ?? []))
6564
.withTrailingTrivia([]))
6665
newItems.append(
6766
CodeBlockItemSyntax(
6867
item: .stmt(StmtSyntax(returnStmt.withExpression(nil))),
69-
semicolon: nil,
70-
errorTokens: nil
68+
semicolon: nil
7169
)
7270
.withLeadingTrivia([.newlines(1)])
7371
.withTrailingTrivia(returnStmt.trailingTrivia?.withoutLeadingSpaces() ?? []))

Sources/SwiftFormatRules/OneVariableDeclarationPerLine.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,7 @@ public final class OneVariableDeclarationPerLine: SyntaxFormatRule {
5151
var splitter = VariableDeclSplitter {
5252
CodeBlockItemSyntax(
5353
item: .decl(DeclSyntax($0)),
54-
semicolon: nil,
55-
errorTokens: nil)
54+
semicolon: nil)
5655
}
5756
newItems.append(contentsOf: splitter.nodes(bySplitting: visitedDecl))
5857
}

Sources/SwiftFormatRules/UseEarlyExits.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public final class UseEarlyExits: SyntaxFormatRule {
7878

7979
var items = [
8080
CodeBlockItemSyntax(
81-
item: .stmt(StmtSyntax(guardStatement)), semicolon: nil, errorTokens: nil),
81+
item: .stmt(StmtSyntax(guardStatement)), semicolon: nil),
8282
]
8383
items.append(contentsOf: trueBlock.statements)
8484
return items

0 commit comments

Comments
 (0)