Skip to content

Commit b060667

Browse files
committed
Revert "[sourcekitd] Rename module SwiftSourceKit to SwiftLang. (#14497)"
This reverts commit 43435af.
1 parent dee02c4 commit b060667

File tree

6 files changed

+26
-43
lines changed

6 files changed

+26
-43
lines changed

test/SwiftSyntax/DeserializeFile.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import StdlibUnittest
77
import Foundation
88
import SwiftSyntax
9-
import SwiftLang
9+
import SwiftSourceKit
1010

1111
func getInput(_ file: String) -> URL {
1212
var result = URL(fileURLWithPath: #file)
@@ -20,7 +20,7 @@ var DecodeTests = TestSuite("DecodeSyntax")
2020

2121
DecodeTests.test("Basic") {
2222
expectDoesNotThrow({
23-
let content = try SwiftLang.parse(getInput("visitor.swift"))
23+
let content = try SourceFileSyntax.encodeSourceFileSyntax(getInput("visitor.swift"))
2424
let source = try String(contentsOf: getInput("visitor.swift"))
2525
let parsed = try SourceFileSyntax.decodeSourceFileSyntax(content)
2626
expectEqual("\(parsed)", source)

test/SwiftSyntax/ParseFile.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import Foundation
77
import StdlibUnittest
88
import SwiftSyntax
9-
import SwiftLang
9+
import SwiftSourceKit
1010

1111
var ParseFile = TestSuite("ParseFile")
1212

@@ -32,7 +32,7 @@ ParseFile.test("ParseSingleFile") {
3232
expectDoesNotThrow({
3333
let currentFileContents = try String(contentsOf: currentFile)
3434
let parsed = try SourceFileSyntax.decodeSourceFileSyntax(try
35-
SwiftLang.parse(currentFile))
35+
SourceKitdService.encodeSourceFileSyntax(currentFile))
3636
expectEqual("\(parsed)", currentFileContents)
3737
})
3838
}

test/SwiftSyntax/VisitorTest.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import StdlibUnittest
77
import Foundation
88
import SwiftSyntax
9-
import SwiftLang
9+
import SwiftSourceKit
1010

1111
func getInput(_ file: String) -> URL {
1212
var result = URL(fileURLWithPath: #file)
@@ -28,7 +28,7 @@ VisitorTests.test("Basic") {
2828
}
2929
expectDoesNotThrow({
3030
let parsed = try SourceFileSyntax.decodeSourceFileSyntax(try
31-
SwiftLang.parse(getInput("visitor.swift")))
31+
SourceKitdService.encodeSourceFileSyntax(getInput("visitor.swift")))
3232
let counter = FuncCounter()
3333
let hashBefore = parsed.hashValue
3434
counter.visit(parsed)

tools/SwiftSourceKitClient/CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ set(EXTRA_COMPILE_FLAGS "-F" "${SWIFT_LIBRARY_OUTPUT_INTDIR}")
22
set(EXTRA_LINKER_FLAGS "-Xlinker" "-rpath" "-Xlinker" "${SWIFT_LIBRARY_OUTPUT_INTDIR}"
33
"-Xlinker" "-F" "-Xlinker" "${SWIFT_LIBRARY_OUTPUT_INTDIR}")
44

5-
add_swift_library(swiftSwiftLang SHARED
6-
SwiftLang.swift
5+
add_swift_library(swiftSwiftSourceKit SHARED
76
SourceKitdClient.swift
87
SourceKitdRequest.swift
98
SourceKitdResponse.swift

tools/SwiftSourceKitClient/SourceKitdClient.swift

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,22 @@ public class SourceKitdService {
2727
return SourceKitdResponse(resp: sourcekitd_send_request_sync(request.rawRequest))
2828
}
2929
}
30+
31+
extension SourceKitdService {
32+
/// Parses the Swift file at the provided URL into a `Syntax` tree in Json
33+
/// serialization format by querying SourceKitd service.
34+
/// - Parameter url: The URL you wish to parse.
35+
/// - Returns: The syntax tree in Json format string.
36+
public static func encodeSourceFileSyntax(_ url: URL) throws -> String {
37+
let Service = SourceKitdService()
38+
let Request = SourceKitdRequest(uid: .source_request_editor_open)
39+
let Path = url.path
40+
Request.addParameter(.key_sourcefile, value: Path)
41+
Request.addParameter(.key_name, value: Path)
42+
Request.addParameter(.key_enable_syntax_tree, value: 1)
43+
44+
// FIXME: SourceKitd error handling.
45+
let Resp = Service.sendSyn(request: Request)
46+
return Resp.value.getString(.key_serialized_syntax_tree)
47+
}
48+
}

tools/SwiftSourceKitClient/SwiftLang.swift

Lines changed: 0 additions & 35 deletions
This file was deleted.

0 commit comments

Comments
 (0)