Adopt the Swift Parser

CodaFi · CodaFi · commit fe193a99369c · 2022-09-10T13:43:28.000-07:00
diff --git a/Package.swift b/Package.swift
@@ -46,7 +46,7 @@ let package = Package(
         "SwiftFormatRules",
         "SwiftFormatWhitespaceLinter",
         .product(name: "SwiftSyntax", package: "swift-syntax"),
-        .product(name: "SwiftSyntaxParser", package: "swift-syntax"),
+        .product(name: "SwiftParser", package: "swift-syntax"),
       ]
     ),
     .target(
@@ -89,7 +89,7 @@ let package = Package(
         "SwiftFormatCore",
         "SwiftFormatRules",
         .product(name: "SwiftSyntax", package: "swift-syntax"),
-        .product(name: "SwiftSyntaxParser", package: "swift-syntax"),
+        .product(name: "SwiftParser", package: "swift-syntax"),
       ]
     ),
     .executableTarget(
@@ -100,6 +100,7 @@ let package = Package(
         "SwiftFormatCore",
         .product(name: "ArgumentParser", package: "swift-argument-parser"),
         .product(name: "SwiftSyntax", package: "swift-syntax"),
+        .product(name: "SwiftParser", package: "swift-syntax"),
         .product(name: "TSCBasic", package: "swift-tools-support-core"),
       ]
     ),
@@ -109,7 +110,7 @@ let package = Package(
       dependencies: [
         "SwiftFormat",
         .product(name: "SwiftSyntax", package: "swift-syntax"),
-        .product(name: "SwiftSyntaxParser", package: "swift-syntax"),
+        .product(name: "SwiftParser", package: "swift-syntax"),
       ]
     ),
     .testTarget(
@@ -122,7 +123,7 @@ let package = Package(
         "SwiftFormatConfiguration",
         "SwiftFormatCore",
         .product(name: "SwiftSyntax", package: "swift-syntax"),
-        .product(name: "SwiftSyntaxParser", package: "swift-syntax"),
+        .product(name: "SwiftParser", package: "swift-syntax"),
       ]
     ),
     .testTarget(
@@ -131,7 +132,7 @@ let package = Package(
         "SwiftFormatTestSupport",
         "SwiftFormatWhitespaceLinter",
         .product(name: "SwiftSyntax", package: "swift-syntax"),
-        .product(name: "SwiftSyntaxParser", package: "swift-syntax"),
+        .product(name: "SwiftParser", package: "swift-syntax"),
       ]
     ),
     .testTarget(
@@ -143,7 +144,7 @@ let package = Package(
         "SwiftFormatRules",
         "SwiftFormatTestSupport",
         .product(name: "SwiftSyntax", package: "swift-syntax"),
-        .product(name: "SwiftSyntaxParser", package: "swift-syntax"),
+        .product(name: "SwiftParser", package: "swift-syntax"),
       ]
     ),
     .testTarget(
@@ -155,7 +156,7 @@ let package = Package(
         "SwiftFormatRules",
         "SwiftFormatTestSupport",
         .product(name: "SwiftSyntax", package: "swift-syntax"),
-        .product(name: "SwiftSyntaxParser", package: "swift-syntax"),
+        .product(name: "SwiftParser", package: "swift-syntax"),
       ]
     ),
     .testTarget(
@@ -166,7 +167,7 @@ let package = Package(
         "SwiftFormatTestSupport",
         "SwiftFormatWhitespaceLinter",
         .product(name: "SwiftSyntax", package: "swift-syntax"),
-        .product(name: "SwiftSyntaxParser", package: "swift-syntax"),
+        .product(name: "SwiftParser", package: "swift-syntax"),
       ]
     ),
   ]
@@ -182,7 +183,7 @@ if ProcessInfo.processInfo.environment["SWIFTCI_USE_LOCAL_DEPS"] == nil {
       branch: "main"
     ),
     .package(
-      url: "https://github.com/apple/swift-syntax",
+      url: "https://github.com/apple/swift-syntax.git",
       branch: "main"
     ),
     .package(
diff --git a/Sources/SwiftFormat/SwiftFormatter.swift b/Sources/SwiftFormat/SwiftFormatter.swift
@@ -16,7 +16,7 @@ import SwiftFormatCore
 import SwiftFormatPrettyPrint
 import SwiftFormatRules
 import SwiftSyntax
-import SwiftSyntaxParser
+import SwiftParser
 
 /// Formats Swift source code or syntax trees according to the Swift style guidelines.
 public final class SwiftFormatter {
@@ -64,8 +64,8 @@ public final class SwiftFormatter {
     if FileManager.default.fileExists(atPath: url.path, isDirectory: &isDir), isDir.boolValue {
       throw SwiftFormatError.isDirectory
     }
-    let sourceFile = try SyntaxParser.parse(url, diagnosticHandler: parsingDiagnosticHandler)
     let source = try String(contentsOf: url, encoding: .utf8)
+    let sourceFile = try Parser.parse(source: source)
     try format(syntax: sourceFile, assumingFileURL: url, source: source, to: &outputStream)
   }
 
@@ -87,8 +87,7 @@ public final class SwiftFormatter {
     to outputStream: inout Output,
     parsingDiagnosticHandler: ((Diagnostic) -> Void)? = nil
   ) throws {
-    let sourceFile =
-      try SyntaxParser.parse(source: source, diagnosticHandler: parsingDiagnosticHandler)
+    let sourceFile = try Parser.parse(source: source)
     try format(syntax: sourceFile, assumingFileURL: url, source: source, to: &outputStream)
   }
 
diff --git a/Sources/SwiftFormat/SwiftLinter.swift b/Sources/SwiftFormat/SwiftLinter.swift
@@ -17,7 +17,7 @@ import SwiftFormatPrettyPrint
 import SwiftFormatRules
 import SwiftFormatWhitespaceLinter
 import SwiftSyntax
-import SwiftSyntaxParser
+import SwiftParser
 
 /// Diagnoses and reports problems in Swift source code or syntax trees according to the Swift style
 /// guidelines.
@@ -62,8 +62,8 @@ public final class SwiftLinter {
     if FileManager.default.fileExists(atPath: url.path, isDirectory: &isDir), isDir.boolValue {
       throw SwiftFormatError.isDirectory
     }
-    let sourceFile = try SyntaxParser.parse(url, diagnosticHandler: parsingDiagnosticHandler)
     let source = try String(contentsOf: url, encoding: .utf8)
+    let sourceFile = try Parser.parse(source: source)
     try lint(syntax: sourceFile, assumingFileURL: url, source: source)
   }
 
@@ -80,8 +80,7 @@ public final class SwiftLinter {
     assumingFileURL url: URL,
     parsingDiagnosticHandler: ((Diagnostic) -> Void)? = nil
   ) throws {
-    let sourceFile =
-      try SyntaxParser.parse(source: source, diagnosticHandler: parsingDiagnosticHandler)
+    let sourceFile = try Parser.parse(source: source)
     try lint(syntax: sourceFile, assumingFileURL: url, source: source)
   }
 
diff --git a/Sources/generate-pipeline/RuleCollector.swift b/Sources/generate-pipeline/RuleCollector.swift
@@ -13,7 +13,7 @@
 import Foundation
 import SwiftFormatCore
 import SwiftSyntax
-import SwiftSyntaxParser
+import SwiftParser
 
 /// Collects information about rules in the formatter code base.
 final class RuleCollector {
@@ -57,7 +57,8 @@ final class RuleCollector {
       guard let baseName = baseName as? String, baseName.hasSuffix(".swift") else { continue }
 
       let fileURL = url.appendingPathComponent(baseName)
-      let sourceFile = try SyntaxParser.parse(fileURL)
+      let fileInput = try String(contentsOf: fileURL)
+      let sourceFile = try Parser.parse(source: fileInput)
 
       for statement in sourceFile.statements {
         guard let detectedRule = self.detectedRule(at: statement) else { continue }
diff --git a/Sources/swift-format/Frontend/Frontend.swift b/Sources/swift-format/Frontend/Frontend.swift
@@ -14,7 +14,7 @@ import Foundation
 import SwiftFormat
 import SwiftFormatConfiguration
 import SwiftSyntax
-import SwiftSyntaxParser
+import SwiftParser
 
 class Frontend {
   /// Represents a file to be processed by the frontend and any file-specific options associated
diff --git a/Sources/swift-format/Utilities/UnifiedDiagnosticsEngine.swift b/Sources/swift-format/Utilities/UnifiedDiagnosticsEngine.swift
@@ -12,7 +12,6 @@
 
 import SwiftFormatCore
 import SwiftSyntax
-import SwiftSyntaxParser
 import TSCBasic
 
 /// Diagnostic data that retains the separation of a finding category (if present) from the rest of
@@ -46,7 +45,7 @@ final class UnifiedDiagnosticsEngine {
   /// Represents a location from either the linter or the syntax parser and supports converting it
   /// to a string representation for printing.
   private enum UnifiedLocation: DiagnosticLocation {
-    /// A location received from the syntax parser.
+    /// A location received from the swift parser.
     case parserLocation(SourceLocation)
 
     /// A location received from the linter.
diff --git a/Tests/SwiftFormatCoreTests/RuleMaskTests.swift b/Tests/SwiftFormatCoreTests/RuleMaskTests.swift
@@ -1,6 +1,6 @@
 import SwiftFormatCore
 import SwiftSyntax
-import SwiftSyntaxParser
+import SwiftParser
 import XCTest
 
 final class RuleMaskTests: XCTestCase {
@@ -12,7 +12,7 @@ final class RuleMaskTests: XCTestCase {
   private func createMask(sourceText: String) -> RuleMask {
     let fileURL = URL(fileURLWithPath: "/tmp/test.swift")
     converter = SourceLocationConverter(file: fileURL.path, source: sourceText)
-    let syntax = try! SyntaxParser.parse(source: sourceText)
+    let syntax = try! Parser.parse(source: sourceText)
     return RuleMask(syntaxNode: Syntax(syntax), sourceLocationConverter: converter)
   }
 
diff --git a/Tests/SwiftFormatPerformanceTests/WhitespaceLinterPerformanceTests.swift b/Tests/SwiftFormatPerformanceTests/WhitespaceLinterPerformanceTests.swift
@@ -1,7 +1,7 @@
 import SwiftFormatTestSupport
 import SwiftFormatWhitespaceLinter
 import SwiftSyntax
-import SwiftSyntaxParser
+import SwiftParser
 import XCTest
 
 final class WhitespaceLinterPerformanceTests: DiagnosingTestCase {
@@ -58,7 +58,7 @@ final class WhitespaceLinterPerformanceTests: DiagnosingTestCase {
   private func performWhitespaceLint(input: String, expected: String) {
     let sourceFileSyntax: SourceFileSyntax
     do {
-      sourceFileSyntax = try SyntaxParser.parse(source: input)
+      sourceFileSyntax = try Parser.parse(source: input)
     } catch {
       XCTFail("Parsing failed with error: \(error)")
       return
diff --git a/Tests/SwiftFormatPrettyPrintTests/PrettyPrintTestCase.swift b/Tests/SwiftFormatPrettyPrintTests/PrettyPrintTestCase.swift
@@ -3,7 +3,7 @@ import SwiftFormatCore
 import SwiftFormatPrettyPrint
 import SwiftFormatTestSupport
 import SwiftSyntax
-import SwiftSyntaxParser
+import SwiftParser
 import XCTest
 
 class PrettyPrintTestCase: DiagnosingTestCase {
@@ -66,7 +66,7 @@ class PrettyPrintTestCase: DiagnosingTestCase {
   ) -> String? {
     let sourceFileSyntax: SourceFileSyntax
     do {
-      sourceFileSyntax = try SyntaxParser.parse(source: source)
+      sourceFileSyntax = try Parser.parse(source: source)
     } catch {
       XCTFail("Parsing failed with error: \(error)")
       return nil
diff --git a/Tests/SwiftFormatPrettyPrintTests/SequenceExprFoldingTests.swift b/Tests/SwiftFormatPrettyPrintTests/SequenceExprFoldingTests.swift
@@ -1,6 +1,6 @@
 import SwiftFormatPrettyPrint
 import SwiftSyntax
-import SwiftSyntaxParser
+import SwiftParser
 import XCTest
 
 final class SequenceExprFoldingTests: XCTestCase {
@@ -248,7 +248,7 @@ final class SequenceExprFoldingTests: XCTestCase {
   /// - Precondition: The first code block of `source` is a statement containing
   ///   a `SequenceExprSyntax`. All subsequent code blocks are ignored.
   private func sequenceExpr(_ source: String) -> SequenceExprSyntax {
-    let sourceFileSyntax = try! SyntaxParser.parse(source: source)
+    let sourceFileSyntax = try! Parser.parse(source: source)
     return sourceFileSyntax.statements.first!.item.as(SequenceExprSyntax.self)!
   }
 }
diff --git a/Tests/SwiftFormatRulesTests/LintOrFormatRuleTestCase.swift b/Tests/SwiftFormatRulesTests/LintOrFormatRuleTestCase.swift
@@ -2,7 +2,7 @@ import SwiftFormatConfiguration
 import SwiftFormatCore
 import SwiftFormatTestSupport
 import SwiftSyntax
-import SwiftSyntaxParser
+import SwiftParser
 import XCTest
 
 class LintOrFormatRuleTestCase: DiagnosingTestCase {
@@ -21,7 +21,7 @@ class LintOrFormatRuleTestCase: DiagnosingTestCase {
   ) {
     let sourceFileSyntax: SourceFileSyntax
     do {
-      sourceFileSyntax = try SyntaxParser.parse(source: input)
+      sourceFileSyntax = try Parser.parse(source: input)
     } catch {
       XCTFail("\(error)", file: file, line: line)
       return
@@ -64,7 +64,7 @@ class LintOrFormatRuleTestCase: DiagnosingTestCase {
   ) {
     let sourceFileSyntax: SourceFileSyntax
     do {
-      sourceFileSyntax = try SyntaxParser.parse(source: input)
+      sourceFileSyntax = try Parser.parse(source: input)
     } catch {
       XCTFail("\(error)", file: file, line: line)
       return
diff --git a/Tests/SwiftFormatTests/SyntaxValidatingVisitorTests.swift b/Tests/SwiftFormatTests/SyntaxValidatingVisitorTests.swift
@@ -1,6 +1,6 @@
 import SwiftFormat
 import SwiftSyntax
-import SwiftSyntaxParser
+import SwiftParser
 import XCTest
 
 final class SyntaxValidatingVisitorTests: XCTestCase {
@@ -41,7 +41,6 @@ final class SyntaxValidatingVisitorTests: XCTestCase {
 
   /// Parses the given source into a syntax tree.
   private func createSyntax(from source: String) -> Syntax {
-    return Syntax(try! SyntaxParser.parse(source: source))
   }
 
   /// Asserts that `SyntaxValidatingVisitor` finds invalid syntax in the given source code at the
@@ -56,5 +55,6 @@ final class SyntaxValidatingVisitorTests: XCTestCase {
     let location = SourceLocationConverter(file: "", source: source).location(for: position)
     XCTAssertEqual(location.line, atLine, file: file, line: line)
     XCTAssertEqual(location.column, column, file: file, line: line)
+    return Syntax(try! Parser.parse(source: source))
   }
 }
diff --git a/Tests/SwiftFormatWhitespaceLinterTests/WhitespaceTestCase.swift b/Tests/SwiftFormatWhitespaceLinterTests/WhitespaceTestCase.swift
@@ -3,7 +3,7 @@ import SwiftFormatCore
 import SwiftFormatTestSupport
 import SwiftFormatWhitespaceLinter
 import SwiftSyntax
-import SwiftSyntaxParser
+import SwiftParser
 import XCTest
 
 class WhitespaceTestCase: DiagnosingTestCase {
@@ -22,7 +22,7 @@ class WhitespaceTestCase: DiagnosingTestCase {
   final func performWhitespaceLint(input: String, expected: String, linelength: Int? = nil) {
     let sourceFileSyntax: SourceFileSyntax
     do {
-      sourceFileSyntax = try SyntaxParser.parse(source: input)
+      sourceFileSyntax = try Parser.parse(source: input)
     } catch {
       XCTFail("Parsing failed with error: \(error)")
       return
