@@ -1840,8 +1840,6 @@ private final class TokenStreamCreator: SyntaxVisitor {
1840
1840
return . visitChildren
1841
1841
}
1842
1842
1843
- // FIXME: Remove once the changes around `GenericRequirementSyntax` and its children have settled.
1844
- #if !HAS_UNCONSOLIDATED_GENERIC_REQUIREMENTS
1845
1843
override func visit( _ node: GenericRequirementSyntax ) -> SyntaxVisitorContinueKind {
1846
1844
before ( node. firstToken, tokens: . open)
1847
1845
if let trailingComma = node. trailingComma {
@@ -1851,34 +1849,17 @@ private final class TokenStreamCreator: SyntaxVisitor {
1851
1849
}
1852
1850
return . visitChildren
1853
1851
}
1854
- #endif
1855
-
1852
+
1856
1853
override func visit( _ node: SameTypeRequirementSyntax ) -> SyntaxVisitorContinueKind {
1857
1854
before ( node. equalityToken, tokens: . break)
1858
1855
after ( node. equalityToken, tokens: . space)
1859
1856
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
1868
1857
return . visitChildren
1869
1858
}
1870
1859
1871
1860
override func visit( _ node: ConformanceRequirementSyntax ) -> SyntaxVisitorContinueKind {
1872
1861
after ( node. colon, tokens: . break)
1873
1862
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
1882
1863
return . visitChildren
1883
1864
}
1884
1865
0 commit comments