-
Notifications
You must be signed in to change notification settings - Fork 304
SourceKitLSP: generate Swift textual interfaces for module references #668
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
39 changes: 39 additions & 0 deletions
39
Sources/LanguageServerProtocol/Requests/OpenInterfaceRequest.swift
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,39 @@ | ||
//===----------------------------------------------------------------------===// | ||
// | ||
// This source file is part of the Swift.org open source project | ||
// | ||
// Copyright (c) 2014 - 2022 Apple Inc. and the Swift project authors | ||
// Licensed under Apache License v2.0 with Runtime Library Exception | ||
// | ||
// See https://swift.org/LICENSE.txt for license information | ||
// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors | ||
// | ||
//===----------------------------------------------------------------------===// | ||
|
||
/// Request a textual interface of a module to display in the IDE. | ||
/// **(LSP Extension)** | ||
public struct OpenInterfaceRequest: TextDocumentRequest, Hashable { | ||
public static let method: String = "textDocument/openInterface" | ||
public typealias Response = InterfaceDetails? | ||
|
||
/// The document whose compiler arguments should be used to generate the interface. | ||
public var textDocument: TextDocumentIdentifier | ||
|
||
/// The module to generate an index for. | ||
public var name: String | ||
|
||
public init(textDocument: TextDocumentIdentifier, name: String) { | ||
self.textDocument = textDocument | ||
self.name = name | ||
} | ||
} | ||
|
||
/// The textual output of a module interface. | ||
public struct InterfaceDetails: ResponseType, Hashable { | ||
|
||
public var uri: DocumentURI | ||
|
||
public init(uri: DocumentURI) { | ||
self.uri = uri | ||
} | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
Sources/SKTestSupport/INPUTS/SwiftPMPackage/Sources/exec/main.swift
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
import lib | ||
import /*lib:import*/lib | ||
|
||
Lib() . /*Lib.foo:call*/foo() |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,84 @@ | ||
//===----------------------------------------------------------------------===// | ||
// | ||
// This source file is part of the Swift.org open source project | ||
// | ||
// Copyright (c) 2014 - 2022 Apple Inc. and the Swift project authors | ||
// Licensed under Apache License v2.0 with Runtime Library Exception | ||
// | ||
// See https://swift.org/LICENSE.txt for license information | ||
// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors | ||
// | ||
//===----------------------------------------------------------------------===// | ||
|
||
import Foundation | ||
import SourceKitD | ||
import LanguageServerProtocol | ||
import LSPLogging | ||
|
||
struct InterfaceInfo { | ||
var contents: String | ||
} | ||
|
||
extension SwiftLanguageServer { | ||
public func openInterface(_ request: LanguageServerProtocol.Request<LanguageServerProtocol.OpenInterfaceRequest>) { | ||
let uri = request.params.textDocument.uri | ||
let moduleName = request.params.name | ||
self.queue.async { | ||
let interfaceFilePath = self.generatedInterfacesPath.appendingPathComponent("\(moduleName).swiftinterface") | ||
let interfaceDocURI = DocumentURI(interfaceFilePath) | ||
self._openInterface(request: request, uri: uri, name: moduleName, interfaceURI: interfaceDocURI) { result in | ||
switch result { | ||
case .success(let interfaceInfo): | ||
do { | ||
try interfaceInfo.contents.write(to: interfaceFilePath, atomically: true, encoding: String.Encoding.utf8) | ||
request.reply(.success(InterfaceDetails(uri: interfaceDocURI))) | ||
} catch { | ||
request.reply(.failure(ResponseError.unknown(error.localizedDescription))) | ||
} | ||
case .failure(let error): | ||
log("open interface failed: \(error)", level: .warning) | ||
request.reply(.failure(ResponseError(error))) | ||
} | ||
} | ||
} | ||
} | ||
|
||
/// Open the Swift interface for a module. | ||
/// | ||
/// - Parameters: | ||
/// - request: The OpenInterfaceRequest. | ||
/// - uri: The document whose compiler arguments should be used to generate the interface. | ||
/// - name: The name of the module whose interface should be generated. | ||
/// - interfaceURI: The file where the generated interface should be written. | ||
/// - completion: Completion block to asynchronously receive the InterfaceInfo, or error. | ||
private func _openInterface(request: LanguageServerProtocol.Request<LanguageServerProtocol.OpenInterfaceRequest>, | ||
uri: DocumentURI, | ||
name: String, | ||
interfaceURI: DocumentURI, | ||
completion: @escaping (Swift.Result<InterfaceInfo, SKDError>) -> Void) { | ||
let keys = self.keys | ||
let skreq = SKDRequestDictionary(sourcekitd: sourcekitd) | ||
skreq[keys.request] = requests.editor_open_interface | ||
skreq[keys.modulename] = name | ||
skreq[keys.name] = interfaceURI.pseudoPath | ||
skreq[keys.synthesizedextensions] = 1 | ||
if let compileCommand = self.commandsByFile[uri] { | ||
skreq[keys.compilerargs] = compileCommand.compilerArgs | ||
} | ||
|
||
let handle = self.sourcekitd.send(skreq, self.queue) { result in | ||
switch result { | ||
case .success(let dict): | ||
return completion(.success(InterfaceInfo(contents: dict[keys.sourcetext] ?? ""))) | ||
case .failure(let error): | ||
return completion(.failure(error)) | ||
} | ||
} | ||
|
||
if let handle = handle { | ||
request.cancellationToken.addCancellationHandler { [weak self] in | ||
self?.sourcekitd.cancel(handle) | ||
} | ||
} | ||
} | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.