Merge pull request #601 from CodaFi/friday-the-thirteenth

Restore the Ability to Build with Xcode 13

Author: CodaFi

Sources/SwiftSyntax/BumpPtrAllocator.swift

@@ -155,7 +155,8 @@ extension UnsafeMutableRawPointer {
   /// - Parameter alignment: The alignment of the returned pointer, in bytes.
   ///                        Alignment must be a whole power of 2.
   /// - Returns: A pointer aligned to `alignment`.
-  fileprivate func alignedUp(toMultipleOf alignment: Int) -> Self {
+  @_spi(Testing)
+  public func alignedUp(toMultipleOf alignment: Int) -> Self {
     let mask = UInt(alignment) &- 1
     assert(
       alignment > 0 && UInt(alignment) & mask == 0,

Sources/SwiftSyntax/TokenKind.swift.gyb

@@ -143,7 +143,7 @@ extension TokenKind: Equatable {
 }
 
 /// Plain token kind value, without an associated `String` value.
-public enum RawTokenKind {
+public enum RawTokenKind: Equatable, Hashable {
   case eof
 % for token in SYNTAX_TOKENS:
   case ${token.swift_kind()}

Sources/SwiftSyntax/gyb_generated/TokenKind.swift

@@ -1122,7 +1122,7 @@ extension TokenKind: Equatable {
 }
 
 /// Plain token kind value, without an associated `String` value.
-public enum RawTokenKind {
+public enum RawTokenKind: Equatable, Hashable {
   case eof
   case associatedtypeKeyword
   case classKeyword

Sources/_SwiftSyntaxTestSupport/Syntax+Assertions.swift

@@ -49,22 +49,24 @@ public func XCTAssertSameStructure(
 
 /// Verifies that two trees are equivalent, ie. they have the same structure
 /// and optionally the same trivia if `includeTrivia` is set.
-public func XCTAssertSameStructure(
-  _ actual: SyntaxProtocol,
-  _ expected: SyntaxProtocol,
+public func XCTAssertSameStructure<ActualTree, ExpectedTree>(
+  _ actual: ActualTree,
+  _ expected: ExpectedTree,
   includeTrivia: Bool = false,
   file: StaticString = #filePath, line: UInt = #line
-) {
+)
+  where ActualTree: SyntaxProtocol, ExpectedTree: SyntaxProtocol
+{
   let diff = actual.findFirstDifference(baseline: expected, includeTrivia: includeTrivia)
   XCTAssertNil(diff, diff!.debugDescription, file: file, line: line)
 }
 
 /// See `SubtreeMatcher.assertSameStructure`.
-public func XCTAssertHasSubstructure(
+public func XCTAssertHasSubstructure<ExpectedTree: SyntaxProtocol>(
   _ markedText: String,
   parse: (String) throws -> Syntax,
   afterMarker: String? = nil,
-  _ expected: SyntaxProtocol,
+  _ expected: ExpectedTree,
   includeTrivia: Bool = false,
   file: StaticString = #filePath, line: UInt = #line
 ) throws {
@@ -73,12 +75,14 @@ public func XCTAssertHasSubstructure(
 }
 
 /// See `SubtreeMatcher.assertSameStructure`.
-public func XCTAssertHasSubstructure(
-  _ actualTree: SyntaxProtocol,
-  _ expected: SyntaxProtocol,
+public func XCTAssertHasSubstructure<ActualTree, ExpectedTree>(
+  _ actualTree: ActualTree,
+  _ expected: ExpectedTree,
   includeTrivia: Bool = false,
   file: StaticString = #filePath, line: UInt = #line
-) throws {
+) throws
+  where ActualTree: SyntaxProtocol, ExpectedTree: SyntaxProtocol
+{
   let subtreeMatcher = SubtreeMatcher(Syntax(actualTree))
   try subtreeMatcher.assertSameStructure(Syntax(expected), file: file, line: line)
 }

Sources/_SwiftSyntaxTestSupport/SyntaxComparison.swift

@@ -25,16 +25,18 @@ public struct TreeDifference {
   /// The `node` that's different to `baseline`, unless `reason` is
   /// `.missingNode`. In that case it's actually the parent that's missing a
   /// child node.
-  public let node: SyntaxProtocol
+  public let node: Syntax
   /// The corresponding `baseline` that does not match `node`, unless `reason`
   /// is `.additionalNode`. In that case it's what would be the parent (if the
   /// baseline node existed).
-  public let baseline: SyntaxProtocol
+  public let baseline: Syntax
   public let reason: DifferenceReason
 
-  public init(node: SyntaxProtocol, baseline: SyntaxProtocol, reason: DifferenceReason) {
-    self.node = node
-    self.baseline = baseline
+  public init<Difference, Baseline>(node: Difference, baseline: Baseline, reason: DifferenceReason)
+    where Difference: SyntaxProtocol, Baseline: SyntaxProtocol
+  {
+    self.node = Syntax(node)
+    self.baseline = Syntax(baseline)
     self.reason = reason
   }
 }
@@ -89,7 +91,7 @@ extension TreeDifference: CustomDebugStringConvertible {
 public extension SyntaxProtocol {
   /// Compares the current tree against a `baseline`, returning the first
   /// difference it finds.
-  func findFirstDifference(baseline: SyntaxProtocol, includeTrivia: Bool = false) -> TreeDifference? {
+  func findFirstDifference<Tree: SyntaxProtocol>(baseline: Tree, includeTrivia: Bool = false) -> TreeDifference? {
     if let reason = isDifferent(baseline: baseline, includeTrivia: includeTrivia) {
       return TreeDifference(node: self, baseline: baseline, reason: reason)
     }
@@ -112,7 +114,7 @@ public extension SyntaxProtocol {
     return nil
   }
 
-  private func isDifferent(baseline: SyntaxProtocol, includeTrivia: Bool = false) -> DifferenceReason? {
+  private func isDifferent<Tree: SyntaxProtocol>(baseline: Tree, includeTrivia: Bool = false) -> DifferenceReason? {
     if syntaxNodeType != baseline.syntaxNodeType {
       return .nodeType
     }

Tests/SwiftSyntaxParserTest/SyntaxComparisonTests.swift

@@ -160,7 +160,7 @@ public class SyntaxComparisonTests: XCTestCase {
   private func makeFunc(identifier: TokenSyntax, keyword: TokenSyntax = .funcKeyword(),
                         body: CodeBlockSyntax? = nil, indent: Int = 0) -> FunctionDeclSyntax {
     let funcBody: CodeBlockSyntax
-    if let body {
+    if let body = body {
       funcBody = body
     } else {
       funcBody = makeBody()

Tests/SwiftSyntaxTest/VisitorTests.swift

@@ -16,7 +16,7 @@ public class VisitorTests: XCTestCase {
         return .visitChildren
       }
 
-      static func check(_ tree: SyntaxProtocol, viewMode: SyntaxTreeViewMode) -> Bool {
+      static func check<Tree: SyntaxProtocol>(_ tree: Tree, viewMode: SyntaxTreeViewMode) -> Bool {
         let visitor = MissingDeclChecker(viewMode: viewMode)
         visitor.walk(tree)
         return visitor.didSeeMissingDeclSyntax
@@ -56,7 +56,7 @@ public class VisitorTests: XCTestCase {
         return .visitChildren
       }
 
-      static func print(_ tree: SyntaxProtocol, viewMode: SyntaxTreeViewMode) -> String {
+      static func print<Tree: SyntaxProtocol>(_ tree: Tree, viewMode: SyntaxTreeViewMode) -> String {
         let printer = TreePrinter(viewMode: viewMode)
         printer.walk(tree)
         return printer.out
@@ -83,7 +83,7 @@ public class VisitorTests: XCTestCase {
       }
 
 
-      static func print(_ tree: SyntaxProtocol, viewMode: SyntaxTreeViewMode) -> String {
+      static func print<Tree: SyntaxProtocol>(_ tree: Tree, viewMode: SyntaxTreeViewMode) -> String {
         let printer = TreePrinter(viewMode: viewMode)
         printer.walk(tree)
         return printer.out
@@ -108,7 +108,7 @@ public class VisitorTests: XCTestCase {
       }
 
 
-      static func print(_ tree: SyntaxProtocol, viewMode: SyntaxTreeViewMode) -> String {
+      static func print<Tree: SyntaxProtocol>(_ tree: Tree, viewMode: SyntaxTreeViewMode) -> String {
         let printer = TreePrinter(viewMode: viewMode)
         printer.walk(tree)
         return printer.out