Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion Sources/SourceKitLSP/SourceKitLSPServer.swift
Original file line number Diff line number Diff line change
Expand Up @@ -1442,7 +1442,9 @@ extension SourceKitLSPServer {
await languageService.closeDocument(notification)
}

workspace.removeLanguageServices(for: uri)
if !documentManager.openDocuments.contains(where: { $0.buildSettingsFile == uri.buildSettingsFile }) {
workspace.removeLanguageServices(for: uri)
}

workspaceQueue.async {
self.workspaceForUri[notification.textDocument.uri] = nil
Expand Down
35 changes: 35 additions & 0 deletions Tests/SourceKitLSPTests/SwiftInterfaceTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -395,6 +395,41 @@ final class SwiftInterfaceTests: SourceKitLSPTestCase {
XCTAssertEqual(transformLocation.uri.scheme, "sourcekit-lsp")
assertContains(transformLocation.uri.pseudoPath, "Foundation.NSAffineTransform.swiftinterface")
}

func testClosingGeneratedInterfacePreservesOriginatingLanguageService() async throws {
let testClient = try await TestSourceKitLSPClient(
capabilities: ClientCapabilities(experimental: [
GetReferenceDocumentRequest.method: .dictionary(["supported": .bool(true)])
])
)
let uri = DocumentURI(for: .swift)

let positions = testClient.openDocument(
"""
func test(x: 1️⃣String) {
let y: 2️⃣Int = 1
}
""",
uri: uri
)

let definition = try await testClient.send(
DefinitionRequest(textDocument: TextDocumentIdentifier(uri), position: positions["1️⃣"])
)
let interfaceUri = try XCTUnwrap(definition?.locations?.only?.uri)
let interfaceContents = try await testClient.send(GetReferenceDocumentRequest(uri: interfaceUri))
testClient.send(
DidOpenTextDocumentNotification(
textDocument: TextDocumentItem(uri: interfaceUri, language: .swift, version: 0, text: interfaceContents.content)
)
)
testClient.send(DidCloseTextDocumentNotification(textDocument: TextDocumentIdentifier(interfaceUri)))

let hover = try await testClient.send(
HoverRequest(textDocument: TextDocumentIdentifier(uri), position: positions["2️⃣"])
)
XCTAssertNotNil(hover)
}
}

private func assertSystemSwiftInterface(
Expand Down