Skip to content

Commit 81eb8f0

Browse files
committed
Port incremental parse ability to sourcekit-lsp
This feature will be used when we call `changeDocument` in SwiftLanguageServer
1 parent 869fd0a commit 81eb8f0

File tree

2 files changed

+90
-7
lines changed

2 files changed

+90
-7
lines changed

Sources/SourceKitLSP/Swift/SwiftLanguageServer.swift

Lines changed: 45 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,11 @@ public final class SwiftLanguageServer: ToolchainLanguageServer {
119119

120120
var commandsByFile: [DocumentURI: SwiftCompileCommand] = [:]
121121

122+
var documentLookaheadRanges: [DocumentURI: LookaheadRanges] = [:]
123+
124+
/// *For Testing*
125+
public var documentReusedNodeCollector: [DocumentURI: IncrementalParseReusedNodeCollector] = [:]
126+
122127
var keys: sourcekitd_keys { return sourcekitd.keys }
123128
var requests: sourcekitd_requests { return sourcekitd.requests }
124129
var values: sourcekitd_values { return sourcekitd.values }
@@ -197,14 +202,36 @@ public final class SwiftLanguageServer: ToolchainLanguageServer {
197202
}
198203

199204
/// Returns the updated lexical tokens for the given `snapshot`.
205+
///
206+
/// - Parameters:
207+
/// - edits: If we are in the context of editing the contents of a file, i.e. calling ``SwiftLanguageServer/changeDocument(_:)``, we should pass `edits` to enable incremental parse. Otherwise, `edits` should be `nil`.
200208
private func updateSyntaxTree(
201-
for snapshot: DocumentSnapshot
209+
for snapshot: DocumentSnapshot,
210+
with edits: ConcurrentEdits? = nil
202211
) -> DocumentTokens {
203212
logExecutionTime(level: .debug) {
204213
var docTokens = snapshot.tokens
214+
let documentURI = snapshot.document.uri
215+
216+
var reusedNodeCollector = documentReusedNodeCollector[documentURI]
217+
if reusedNodeCollector == nil {
218+
documentReusedNodeCollector[documentURI] = IncrementalParseReusedNodeCollector()
219+
reusedNodeCollector = documentReusedNodeCollector[documentURI]
220+
}
221+
222+
var parseTransition: IncrementalParseTransition? = nil
223+
if let previousTree = snapshot.tokens.syntaxTree,
224+
let lookaheadRanges = documentLookaheadRanges[documentURI],
225+
let edits {
226+
parseTransition = IncrementalParseTransition(previousTree: previousTree, edits: edits, lookaheadRanges: lookaheadRanges, reusedNodeDelegate: reusedNodeCollector)
227+
}
228+
let (tree, nextLookaheadRanges) = Parser.parseIncrementally(
229+
source: snapshot.text, parseTransition: parseTransition)
205230

206-
docTokens.syntaxTree = Parser.parse(source: snapshot.text)
231+
docTokens.syntaxTree = tree
207232

233+
documentLookaheadRanges[documentURI] = nextLookaheadRanges
234+
208235
return docTokens
209236
}
210237
}
@@ -520,34 +547,45 @@ extension SwiftLanguageServer {
520547
// Clear settings that should not be cached for closed documents.
521548
self.commandsByFile[uri] = nil
522549
self.currentDiagnostics[uri] = nil
550+
self.documentLookaheadRanges[uri] = nil
551+
self.documentReusedNodeCollector[uri] = nil
523552

524553
_ = try? self.sourcekitd.sendSync(req)
525554
}
526555
}
527556

528557
public func changeDocument(_ note: DidChangeTextDocumentNotification) {
529558
let keys = self.keys
559+
var edits: [IncrementalEdit] = []
530560

531561
self.queue.async {
532562
var lastResponse: SKDResponseDictionary? = nil
533563

534-
let snapshot = self.documentManager.edit(note) { (before: DocumentSnapshot, edit: TextDocumentContentChangeEvent) in
564+
let snapshot = self.documentManager.edit(note) {
565+
(before: DocumentSnapshot, edit: TextDocumentContentChangeEvent) in
535566
let req = SKDRequestDictionary(sourcekitd: self.sourcekitd)
536567
req[keys.request] = self.requests.editor_replacetext
537568
req[keys.name] = note.textDocument.uri.pseudoPath
538569

539570
if let range = edit.range {
540-
guard let offset = before.utf8Offset(of: range.lowerBound), let end = before.utf8Offset(of: range.upperBound) else {
571+
guard let offset = before.utf8Offset(of: range.lowerBound),
572+
let end = before.utf8Offset(of: range.upperBound)
573+
else {
541574
fatalError("invalid edit \(range)")
542575
}
543576

577+
let length = end - offset
544578
req[keys.offset] = offset
545-
req[keys.length] = end - offset
579+
req[keys.length] = length
546580

581+
edits.append(IncrementalEdit(offset: offset, length: length, replacementLength: edit.text.utf8.count))
547582
} else {
548583
// Full text
584+
let length = before.text.utf8.count
549585
req[keys.offset] = 0
550-
req[keys.length] = before.text.utf8.count
586+
req[keys.length] = length
587+
588+
edits.append(IncrementalEdit(offset: 0, length: length, replacementLength: edit.text.utf8.count))
551589
}
552590

553591
req[keys.sourcetext] = edit.text
@@ -556,7 +594,7 @@ extension SwiftLanguageServer {
556594
self.adjustDiagnosticRanges(of: note.textDocument.uri, for: edit)
557595
} updateDocumentTokens: { (after: DocumentSnapshot) in
558596
if lastResponse != nil {
559-
return self.updateSyntaxTree(for: after)
597+
return self.updateSyntaxTree(for: after, with: ConcurrentEdits(fromSequential: edits))
560598
} else {
561599
return DocumentTokens()
562600
}

Tests/SourceKitLSPTests/LocalSwiftTests.swift

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1476,4 +1476,49 @@ final class LocalSwiftTests: XCTestCase {
14761476
data = EditorPlaceholder(text)
14771477
XCTAssertNil(data)
14781478
}
1479+
1480+
func testIncrementalParse() throws {
1481+
let url = URL(fileURLWithPath: "/\(UUID())/a.swift")
1482+
let uri = DocumentURI(url)
1483+
1484+
sk.allowUnexpectedNotification = false
1485+
1486+
sk.send(DidOpenTextDocumentNotification(textDocument: TextDocumentItem(
1487+
uri: uri,
1488+
language: .swift,
1489+
version: 0,
1490+
text: """
1491+
func foo() {
1492+
}
1493+
class bar {
1494+
}
1495+
"""
1496+
)))
1497+
1498+
let didChangeTextDocumentExpectation = self.expectation(description: "didChangeTextDocument")
1499+
sk.sendNoteSync(DidChangeTextDocumentNotification(textDocument: .init(uri, version: 1), contentChanges: [
1500+
.init(range: Range(Position(line: 2, utf16index: 7)), text: "a"),
1501+
]), { (note: LanguageServerProtocol.Notification<PublishDiagnosticsNotification>) -> Void in
1502+
log("Received diagnostics for text edit - syntactic")
1503+
didChangeTextDocumentExpectation.fulfill()
1504+
}, { (note: LanguageServerProtocol.Notification<PublishDiagnosticsNotification>) -> Void in
1505+
log("Received diagnostics for text edit - semantic")
1506+
})
1507+
1508+
self.wait(for: [didChangeTextDocumentExpectation], timeout: defaultTimeout)
1509+
1510+
let swiftLanguageServer = connection.server!._languageService(for: uri, .swift, in: connection.server!.workspaceForDocumentOnQueue(uri: uri)!) as! SwiftLanguageServer
1511+
1512+
let nodes = try XCTUnwrap(swiftLanguageServer.documentReusedNodeCollector[uri]?.nodes)
1513+
XCTAssertEqual(nodes.count, 1)
1514+
1515+
let firstNode = try XCTUnwrap(nodes.first)
1516+
XCTAssertEqual(firstNode.description,
1517+
"""
1518+
func foo() {
1519+
}
1520+
"""
1521+
)
1522+
XCTAssertEqual(firstNode.kind, .codeBlockItem)
1523+
}
14791524
}

0 commit comments

Comments
 (0)