Skip to content

Commit bd50eec

Browse files
committed
Remove obsolete #if blocks
1 parent 9569841 commit bd50eec

File tree

1 file changed

+1
-20
lines changed

1 file changed

+1
-20
lines changed

Sources/SwiftFormatPrettyPrint/TokenStreamCreator.swift

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1840,8 +1840,6 @@ private final class TokenStreamCreator: SyntaxVisitor {
18401840
return .visitChildren
18411841
}
18421842

1843-
// FIXME: Remove once the changes around `GenericRequirementSyntax` and its children have settled.
1844-
#if !HAS_UNCONSOLIDATED_GENERIC_REQUIREMENTS
18451843
override func visit(_ node: GenericRequirementSyntax) -> SyntaxVisitorContinueKind {
18461844
before(node.firstToken, tokens: .open)
18471845
if let trailingComma = node.trailingComma {
@@ -1851,34 +1849,17 @@ private final class TokenStreamCreator: SyntaxVisitor {
18511849
}
18521850
return .visitChildren
18531851
}
1854-
#endif
1855-
1852+
18561853
override func visit(_ node: SameTypeRequirementSyntax) -> SyntaxVisitorContinueKind {
18571854
before(node.equalityToken, tokens: .break)
18581855
after(node.equalityToken, tokens: .space)
18591856

1860-
#if HAS_UNCONSOLIDATED_GENERIC_REQUIREMENTS
1861-
before(node.firstToken, tokens: .open)
1862-
if let trailingComma = node.trailingComma {
1863-
after(trailingComma, tokens: .close, .break(.same))
1864-
} else {
1865-
after(node.lastToken, tokens: .close)
1866-
}
1867-
#endif
18681857
return .visitChildren
18691858
}
18701859

18711860
override func visit(_ node: ConformanceRequirementSyntax) -> SyntaxVisitorContinueKind {
18721861
after(node.colon, tokens: .break)
18731862

1874-
#if HAS_UNCONSOLIDATED_GENERIC_REQUIREMENTS
1875-
before(node.firstToken, tokens: .open)
1876-
if let trailingComma = node.trailingComma {
1877-
after(trailingComma, tokens: .close, .break(.same))
1878-
} else {
1879-
after(node.lastToken, tokens: .close)
1880-
}
1881-
#endif
18821863
return .visitChildren
18831864
}
18841865

0 commit comments

Comments
 (0)