break SwiftSyntax's dependency on SwiftSourceKit

Author: nkcsgexi

test/SwiftSyntax/DeserializeFile.swift

@@ -6,6 +6,7 @@
 import StdlibUnittest
 import Foundation
 import SwiftSyntax
+import SwiftSourceKit
 
 func getInput(_ file: String) -> URL {
   var result = URL(fileURLWithPath: #file)

test/SwiftSyntax/ParseFile.swift

@@ -6,6 +6,7 @@
 import Foundation
 import StdlibUnittest
 import SwiftSyntax
+import SwiftSourceKit
 
 var ParseFile = TestSuite("ParseFile")
 
@@ -30,7 +31,8 @@ ParseFile.test("ParseSingleFile") {
   let currentFile = URL(fileURLWithPath: #file)
   expectDoesNotThrow({
     let currentFileContents = try String(contentsOf: currentFile)
-    let parsed = try SourceFileSyntax.parse(currentFile)
+    let parsed = SourceFileSyntax.decodeSourceFileSyntax(try SourceKitdService.
+      encodeSourceFileSyntax(currentFile))
     expectEqual("\(parsed)", currentFileContents)
   })
 }

test/SwiftSyntax/VisitorTest.swift

@@ -6,6 +6,7 @@
 import StdlibUnittest
 import Foundation
 import SwiftSyntax
+import SwiftSourceKit
 
 func getInput(_ file: String) -> URL {
   var result = URL(fileURLWithPath: #file)
@@ -26,7 +27,8 @@ VisitorTests.test("Basic") {
     }
   }
   expectDoesNotThrow({
-    let parsed = try SourceFileSyntax.parse(getInput("visitor.swift"))
+    let parsed = SourceFileSyntax.decodeSourceFileSyntax(try SourceKitdService.
+      encodeSourceFileSyntax(getInput("visitor.swift")))
     let counter = FuncCounter()
     let hashBefore = parsed.hashValue
     counter.visit(parsed)

tools/CMakeLists.txt

@@ -35,7 +35,7 @@ if(SWIFT_HOST_VARIANT STREQUAL "macosx")
   # SwiftSyntax depends on both the standard library (because it's a
   # Swift module), and the SDK overlays (because it depends on Foundation).
   # Ensure we only build SwiftSyntax when we're building both.
-  if(BUILD_SOURCEKIT_SWIFT_CLIENT)
+  if(SWIFT_BUILD_STDLIB AND SWIFT_BUILD_SDK_OVERLAY)
     add_subdirectory(SwiftSyntax)
   endif()
 endif()

tools/SwiftSourceKitClient/SourceKitdClient.swift

@@ -26,3 +26,22 @@ public class SourceKitdService {
     return SourceKitdResponse(resp: sourcekitd_send_request_sync(request.rawRequest))
   }
 }
+
+extension SourceKitdService {
+  /// Parses the Swift file at the provided URL into a `Syntax` tree in Json
+  /// serialization format by querying SourceKitd service.
+  /// - Parameter url: The URL you wish to parse.
+  /// - Returns: The syntax tree in Json format string.
+  public static func encodeSourceFileSyntax(_ url: URL) throws -> String {
+    let Service = SourceKitdService()
+    let Request = SourceKitdRequest(uid: .source_request_editor_open)
+    let Path = url.path
+    Request.addParameter(.key_sourcefile, value: Path)
+    Request.addParameter(.key_name, value: Path)
+    Request.addParameter(.key_enable_syntax_tree, value: 1)
+
+    // FIXME: SourceKitd error handling.
+    let Resp = Service.sendSyn(request: Request)
+    return Resp.value.getString(.key_serialized_syntax_tree)
+  }
+}

tools/SwiftSyntax/CMakeLists.txt

@@ -1,7 +1,3 @@
-set(EXTRA_COMPILE_FLAGS "-F" "${SWIFT_LIBRARY_OUTPUT_INTDIR}")
-set(EXTRA_LINKER_FLAGS "-Xlinker" "-rpath" "-Xlinker" "${SWIFT_LIBRARY_OUTPUT_INTDIR}"
-    "-Xlinker" "-F" "-Xlinker" "${SWIFT_LIBRARY_OUTPUT_INTDIR}")
-
 add_swift_library(swiftSwiftSyntax SHARED
   # This file should be listed the first.  Module name is inferred from the
   # filename.
@@ -27,9 +23,7 @@ add_swift_library(swiftSwiftSyntax SHARED
   TokenKind.swift.gyb
   Trivia.swift
 
-  SWIFT_COMPILE_FLAGS ${EXTRA_COMPILE_FLAGS}
-  LINK_FLAGS ${EXTRA_LINKER_FLAGS}
-  SWIFT_MODULE_DEPENDS SwiftSourceKit
+  SWIFT_MODULE_DEPENDS Foundation
   INSTALL_IN_COMPONENT swift-syntax
   TARGET_SDKS OSX
   IS_STDLIB)

tools/SwiftSyntax/SwiftSyntax.swift

@@ -16,7 +16,6 @@ import Foundation
 
 #if os(macOS)
 import Darwin
-import SwiftSourceKit
 #elseif os(Linux)
 import Glibc
 #endif
@@ -30,25 +29,12 @@ public enum ParserError: Error {
 
 extension Syntax {
   fileprivate static func encodeSourceFileSyntaxInternal(_ url: URL) throws -> Data {
-#if os(macOS)
-    let Service = SourceKitdService()
-    let Request = SourceKitdRequest(uid: .source_request_editor_open)
-    let Path = url.path
-    Request.addParameter(.key_sourcefile, value: Path)
-    Request.addParameter(.key_name, value: Path)
-    Request.addParameter(.key_enable_syntax_tree, value: 1)
-
-    // FIXME: SourceKitd error handling.
-    let Resp = Service.sendSyn(request: Request)
-    return Resp.value.getString(.key_serialized_syntax_tree).data(using: .utf8)!
-#else
     let swiftcRunner = try SwiftcRunner(sourceFile: url)
     let result = try swiftcRunner.invoke()
     guard result.wasSuccessful else {
       throw ParserError.swiftcFailed(result.exitCode, result.stderr)
     }
     return result.stdoutData
-#endif
   }
 
   /// Parses the Swift file at the provided URL into a `Syntax` tree in Json