[WIP] Use SwiftSyntax's new SwiftParser

Pulls in swiftlang/swift-syntax#857

Author: jpsim

BUILD

@@ -21,9 +21,9 @@ swift_library(
     visibility = ["//visibility:public"],
     deps = [
         "@com_github_jpsim_sourcekitten//:SourceKittenFramework",
-        "@com_github_keith_swift_syntax//:SwiftSyntax",
-        "@com_github_keith_swift_syntax//:SwiftSyntaxBuilder",
-        "@com_github_keith_swift_syntax//:SwiftSyntaxParser",
+        "@com_github_apple_swift_syntax//:SwiftSyntax",
+        "@com_github_apple_swift_syntax//:SwiftSyntaxBuilder",
+        "@com_github_apple_swift_syntax//:SwiftParser",
         "@sourcekitten_com_github_jpsim_yams//:Yams",
     ] + select({
         "@platforms//os:linux": ["@com_github_krzyzanowskim_cryptoswift//:CryptoSwift"],

Package.resolved

@@ -3,21 +3,18 @@ import PackageDescription
 
 #if os(macOS)
 private let addCryptoSwift = false
-private let staticSwiftSyntax = true
 #else
 private let addCryptoSwift = true
-private let staticSwiftSyntax = false
 #endif
 
 let frameworkDependencies: [Target.Dependency] = [
     .product(name: "SourceKittenFramework", package: "SourceKitten"),
     .product(name: "SwiftSyntax", package: "SwiftSyntax"),
     .product(name: "SwiftSyntaxBuilder", package: "SwiftSyntax"),
-    .product(name: "SwiftSyntaxParser", package: "SwiftSyntax"),
+    .product(name: "SwiftParser", package: "SwiftSyntax"),
     "Yams",
 ]
 + (addCryptoSwift ? ["CryptoSwift"] : [])
-+ (staticSwiftSyntax ? ["lib_InternalSwiftSyntaxParser"] : [])
 
 let package = Package(
     name: "SwiftLint",
@@ -28,7 +25,7 @@ let package = Package(
     ],
     dependencies: [
         .package(name: "swift-argument-parser", url: "https://github.com/apple/swift-argument-parser.git", .upToNextMinor(from: "1.1.3")),
-        .package(name: "SwiftSyntax", url: "https://github.com/apple/swift-syntax.git", .exact("0.50700.0")),
+        .package(name: "SwiftSyntax", url: "https://github.com/jpsim/swift-syntax.git", .revision("e7083742f6dbc5588e56b70271f127fb392f40eb")),
         .package(url: "https://github.com/jpsim/SourceKitten.git", from: "0.33.0"),
         .package(url: "https://github.com/jpsim/Yams.git", from: "5.0.1"),
         .package(url: "https://github.com/scottrhoyt/SwiftyTextTable.git", from: "0.9.0"),
@@ -46,11 +43,7 @@ let package = Package(
         ),
         .target(
             name: "SwiftLintFramework",
-            dependencies: frameworkDependencies,
-            // Pass `-dead_strip_dylibs` to ignore the dynamic version of `lib_InternalSwiftSyntaxParser`
-            // that ships with SwiftSyntax because we want the static version from
-            // `StaticInternalSwiftSyntaxParser`.
-            linkerSettings: staticSwiftSyntax ? [.unsafeFlags(["-Xlinker", "-dead_strip_dylibs"])] : []
+            dependencies: frameworkDependencies
         ),
         .testTarget(
             name: "SwiftLintFrameworkTests",
@@ -61,9 +54,5 @@ let package = Package(
                 "Resources",
             ]
         ),
-    ] + (staticSwiftSyntax ? [.binaryTarget(
-            name: "lib_InternalSwiftSyntaxParser",
-            url: "https://github.com/keith/StaticInternalSwiftSyntaxParser/releases/download/5.7/lib_InternalSwiftSyntaxParser.xcframework.zip",
-            checksum: "99803975d10b2664fc37cc223a39b4e37fe3c79d3d6a2c44432007206d49db15"
-        )] : [])
+    ]
 )

Package.swift

@@ -2,7 +2,7 @@ import SwiftSyntax
 
 extension SourceFileSyntax {
     func windowsOfThreeTokens() -> [(TokenSyntax, TokenSyntax, TokenSyntax)] {
-        Array(tokens)
+        Array(tokens(viewMode: .sourceAccurate))
             .windows(ofCount: 3)
             .map { tokens in
                 let previous = tokens[tokens.startIndex]

Source/SwiftLintFramework/Extensions/SourceFileSyntax+SwiftLint.swift

@@ -1,9 +1,7 @@
 import Foundation
 import SourceKittenFramework
+import SwiftParser
 import SwiftSyntax
-#if canImport(SwiftSyntaxParser)
-import SwiftSyntaxParser
-#endif
 
 private let warnSyntaxParserFailureOnceImpl: Void = {
     queuedPrintError("Could not parse the syntax tree for at least one file. Results may be invalid.")
@@ -38,7 +36,7 @@ private var structureDictionaryCache = Cache({ file in
 
 private var syntaxTreeCache = Cache({ file -> SourceFileSyntax? in
     do {
-        return try SyntaxParser.parse(source: file.contents)
+        return try Parser.parse(source: file.contents)
     } catch {
         warnSyntaxParserFailureOnce()
         return nil

Source/SwiftLintFramework/Extensions/SwiftLintFile+Cache.swift

@@ -9,7 +9,7 @@ final class CommandVisitor: SyntaxVisitor {
 
     init(locationConverter: SourceLocationConverter) {
         self.locationConverter = locationConverter
-        super.init()
+        super.init(viewMode: .sourceAccurate)
     }
 
     override func visitPost(_ node: TokenSyntax) {

Source/SwiftLintFramework/Helpers/CommandVisitor.swift

@@ -36,7 +36,7 @@ public struct BlockBasedKVORule: SwiftSyntaxRule, ConfigurationProviderRule {
     )
 
     public func makeVisitor(file: SwiftLintFile) -> ViolationsSyntaxVisitor? {
-        Visitor()
+        Visitor(viewMode: .sourceAccurate)
     }
 }
 

Source/SwiftLintFramework/Rules/Idiomatic/BlockBasedKVORule.swift

@@ -44,6 +44,7 @@ private extension DiscouragedObjectLiteralRule {
 
         init(configuration: ObjectLiteralConfiguration) {
             self.configuration = configuration
+            super.init(viewMode: .sourceAccurate)
         }
 
         override func visitPost(_ node: ObjectLiteralExprSyntax) {

Source/SwiftLintFramework/Rules/Idiomatic/DiscouragedObjectLiteralRule.swift

@@ -15,7 +15,7 @@ public struct DiscouragedOptionalBooleanRule: OptInRule, ConfigurationProviderRu
     )
 
     public func makeVisitor(file: SwiftLintFile) -> ViolationsSyntaxVisitor? {
-        Visitor()
+        Visitor(viewMode: .sourceAccurate)
     }
 }
 

Source/SwiftLintFramework/Rules/Idiomatic/DiscouragedOptionalBooleanRule.swift

@@ -31,7 +31,7 @@ public struct FallthroughRule: SwiftSyntaxRule, ConfigurationProviderRule, OptIn
     )
 
     public func makeVisitor(file: SwiftLintFile) -> ViolationsSyntaxVisitor? {
-        Visitor()
+        Visitor(viewMode: .sourceAccurate)
     }
 }