Merge pull request #18495 from nkcsgexi/revert-sourcekit-linx

Revert "SourceKit: make SwiftLang build in linux. (#18455)"

Author: eeckstein

test/SwiftSyntax/AbsolutePosition.swift

@@ -17,7 +17,7 @@ func getInput(_ file: String) -> URL {
 }
 
 func getSyntaxTree(_ url: URL) throws -> SourceFileSyntax {
-  let content = try SwiftLang.parse(path: url.path).data(using: .utf8)!
+  let content = try SwiftLang.parse(url).data(using: .utf8)!
   return try SyntaxTreeDeserializer().deserialize(content)
 }
 

test/SwiftSyntax/DeserializeFile.swift

@@ -20,7 +20,7 @@ var DecodeTests = TestSuite("DecodeSyntax")
 
 DecodeTests.test("Basic") {
   expectDoesNotThrow({
-    let content = try SwiftLang.parse(path: getInput("visitor.swift").path)
+    let content = try SwiftLang.parse(getInput("visitor.swift"))
     let contentData = content.data(using: .utf8)!
     let source = try String(contentsOf: getInput("visitor.swift"))
     let parsed = try SyntaxTreeDeserializer().deserialize(contentData)

test/SwiftSyntax/ParseFile.swift

@@ -31,7 +31,7 @@ ParseFile.test("ParseSingleFile") {
   let currentFile = URL(fileURLWithPath: #file)
   expectDoesNotThrow({
     let fileContents = try String(contentsOf: currentFile)
-    let syntaxTreeData = try SwiftLang.parse(source: fileContents).data(using: .utf8)!
+    let syntaxTreeData = try SwiftLang.parse(fileContents).data(using: .utf8)!
     let parsed = try SyntaxTreeDeserializer().deserialize(syntaxTreeData)
     expectEqual("\(parsed)", fileContents)
   })
@@ -40,7 +40,7 @@ ParseFile.test("ParseSingleFile") {
 ParseFile.test("ParseBuffer") {
   expectDoesNotThrow({
     let content = "func foo() {}"
-    let syntaxTreeData = try SwiftLang.parse(source: content).data(using: .utf8)!
+    let syntaxTreeData = try SwiftLang.parse(content).data(using: .utf8)!
     let parsed = try SyntaxTreeDeserializer().deserialize(syntaxTreeData)
     expectEqual("\(parsed)", content)
   })

test/SwiftSyntax/VisitorTest.swift

@@ -17,7 +17,7 @@ func getInput(_ file: String) -> URL {
 }
 
 func getSyntaxTree(_ url: URL) throws -> SourceFileSyntax {
-  let content = try SwiftLang.parse(path: url.path).data(using: .utf8)!
+  let content = try SwiftLang.parse(url).data(using: .utf8)!
   return try SyntaxTreeDeserializer().deserialize(content)
 }
 

tools/SourceKit/tools/CMakeLists.txt

@@ -10,4 +10,6 @@ if(HAVE_UNICODE_LIBEDIT)
   add_swift_tool_subdirectory(sourcekitd-repl)
 endif()
 add_swift_tool_subdirectory(complete-test)
-add_subdirectory(swift-lang)
+if(BUILD_FOUNDATION)
+  add_subdirectory(swift-lang)
+endif()

tools/SourceKit/tools/sourcekitd/include/sourcekitd/module.modulemap

@@ -1,12 +1,6 @@
-if(SWIFT_SOURCEKIT_USE_INPROC_LIBRARY)
-  set(EXTRA_COMPILE_FLAGS "-I" "${SOURCEKITD_SOURCE_DIR}/include/sourcekitd")
-  set(SOURCEKITD_LINK_LIBS sourcekitdInProc)
-  set(INSTALLED_COMP sourcekit-inproc)
-else()
-  set(EXTRA_COMPILE_FLAGS "-F" "${SWIFT_LIBRARY_OUTPUT_INTDIR}")
-  set(SOURCEKITD_LINK_LIBS sourcekitd)
-  set(INSTALLED_COMP sourcekit-xpc-service)
-endif()
+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(swiftSwiftLang SHARED
   SwiftLang.swift
@@ -17,7 +11,10 @@ add_swift_library(swiftSwiftLang SHARED
   UIDs.swift.gyb
 
   DEPENDS sourcekitd-test
-  PRIVATE_LINK_LIBRARIES ${SOURCEKITD_LINK_LIBS}
+  PRIVATE_LINK_LIBRARIES sourcekitd
   SWIFT_COMPILE_FLAGS ${EXTRA_COMPILE_FLAGS}
-  INSTALL_IN_COMPONENT ${INSTALLED_COMP}
+  LINK_FLAGS ${EXTRA_LINKER_FLAGS}
+  SWIFT_MODULE_DEPENDS Foundation
+  INSTALL_IN_COMPONENT sourcekit-xpc-service
+  TARGET_SDKS OSX
   IS_STDLIB)

tools/SourceKit/tools/swift-lang/CMakeLists.txt

@@ -13,6 +13,7 @@
 //===----------------------------------------------------------------------===//
 
 import sourcekitd
+import Foundation
 
 public class SourceKitdService {
 

tools/SourceKit/tools/swift-lang/SourceKitdClient.swift

@@ -12,6 +12,7 @@
 // This file provides convenient APIs to interpret a SourceKitd response.
 //===----------------------------------------------------------------------===//
 
+import Foundation
 import sourcekitd
 
 public class SourceKitdResponse: CustomStringConvertible {
@@ -252,6 +253,6 @@ extension sourcekitd_variant_t: CustomStringConvertible {
 }
 
 private func fromCStringLen(_ ptr: UnsafePointer<Int8>, length: Int) -> String? {
-  return String(decoding: Array(UnsafeBufferPointer(start: ptr, count: length)).map {
-    UInt8(bitPattern: $0) }, as: UTF8.self)
+  return NSString(bytes: ptr, length: length,
+                  encoding: String.Encoding.utf8.rawValue) as String?
 }

tools/SourceKit/tools/swift-lang/SourceKitdResponse.swift

@@ -12,6 +12,8 @@
 // This file provides Swift language support by invoking SourceKit internally.
 //===----------------------------------------------------------------------===//
 
+import Foundation
+
 enum SourceKitdError: Error, CustomStringConvertible {
   case EditorOpenError(message: String)
   case EditorCloseError(message: String)
@@ -63,15 +65,16 @@ public class SwiftLang {
   /// thread safe.
   /// - Parameter url: The URL you wish to parse.
   /// - Returns: The syntax tree in Json format string.
-  public static func parse(path: String) throws -> String {
-    return try parse(content: path, name: path, isURL: true)
+  public static func parse(_ url: URL) throws -> String {
+    let Path = url.path
+    return try parse(content: Path, name: Path, isURL: true)
   }
 
   /// Parses a given source buffer into a `Syntax` tree in Json serialization
   /// format by querying SourceKitd service. This function isn't thread safe.
   /// - Parameter source: The source buffer you wish to parse.
   /// - Returns: The syntax tree in Json format string.
-  public static func parse(source: String) throws -> String {
+  public static func parse(_ source: String) throws -> String {
     return try parse(content: source, name: "foo", isURL: false)
   }
 }