Re-apply "SourceKit: make SwiftLang build in linux. (#18455)"

test/SwiftSyntax/AbsolutePosition.swift

@@ -17,7 +17,7 @@ func getInput(_ file: String) -> URL {
 }
 
 func getSyntaxTree(_ url: URL) throws -> SourceFileSyntax {
-  let content = try SwiftLang.parse(url).data(using: .utf8)!
+  let content = try SwiftLang.parse(path: url.path).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(getInput("visitor.swift"))
+    let content = try SwiftLang.parse(path: getInput("visitor.swift").path)
     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(fileContents).data(using: .utf8)!
+    let syntaxTreeData = try SwiftLang.parse(source: 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(content).data(using: .utf8)!
+    let syntaxTreeData = try SwiftLang.parse(source: 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(url).data(using: .utf8)!
+  let content = try SwiftLang.parse(path: url.path).data(using: .utf8)!
   return try SyntaxTreeDeserializer().deserialize(content)
 }
 

tools/SourceKit/CMakeLists.txt

@@ -91,6 +91,7 @@ include_directories(BEFORE
 )
 
 if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
+  set(SOURCEKIT_DEFAULT_TARGET_SDK "LINUX")
   if(SWIFT_BUILD_SOURCEKIT)
     include(ExternalProject)
     ExternalProject_Add(libdispatch

tools/SourceKit/tools/CMakeLists.txt

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

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

@@ -0,0 +1,4 @@
+module sourcekitd {
+  umbrella header "sourcekitd.h"
+  export *
+}

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

@@ -1,6 +1,12 @@
-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}")
+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()
 
 add_swift_library(swiftSwiftLang SHARED
   SwiftLang.swift
@@ -11,10 +17,8 @@ add_swift_library(swiftSwiftLang SHARED
   UIDs.swift.gyb
 
   DEPENDS sourcekitd-test
-  PRIVATE_LINK_LIBRARIES sourcekitd
+  PRIVATE_LINK_LIBRARIES ${SOURCEKITD_LINK_LIBS}
   SWIFT_COMPILE_FLAGS ${EXTRA_COMPILE_FLAGS}
-  LINK_FLAGS ${EXTRA_LINKER_FLAGS}
-  SWIFT_MODULE_DEPENDS Foundation
-  INSTALL_IN_COMPONENT sourcekit-xpc-service
-  TARGET_SDKS OSX
+  INSTALL_IN_COMPONENT ${INSTALLED_COMP}
+  TARGET_SDKS ${SOURCEKIT_DEFAULT_TARGET_SDK}
   IS_STDLIB)

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

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

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

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

tools/SourceKit/tools/swift-lang/SwiftLang.swift

@@ -12,8 +12,6 @@
 // This file provides Swift language support by invoking SourceKit internally.
 //===----------------------------------------------------------------------===//
 
-import Foundation
-
 enum SourceKitdError: Error, CustomStringConvertible {
   case EditorOpenError(message: String)
   case EditorCloseError(message: String)
@@ -65,16 +63,15 @@ 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(_ url: URL) throws -> String {
-    let Path = url.path
-    return try parse(content: Path, name: Path, isURL: true)
+  public static func parse(path: String) throws -> String {
+    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)
   }
 }