implements PLN-0115
This commit is contained in:
+26
-12
@@ -5,13 +5,13 @@ import p.studio.compiler.FrontendRegistryService;
|
||||
import p.studio.compiler.PBSFrontendLanguageService;
|
||||
import p.studio.compiler.messages.*;
|
||||
import p.studio.compiler.models.*;
|
||||
import p.studio.compiler.pbs.semantics.*;
|
||||
import p.studio.compiler.services.FrontendCompletionCandidate;
|
||||
import p.studio.compiler.services.FrontendDocumentRequest;
|
||||
import p.studio.compiler.services.FrontendEditorialContext;
|
||||
import p.studio.compiler.services.FrontendHover;
|
||||
import p.studio.compiler.services.FrontendProvider;
|
||||
import p.studio.compiler.services.FrontendSignature;
|
||||
import p.studio.compiler.services.FrontendSignatureHelp;
|
||||
import p.studio.compiler.services.FrontendSymbolKind;
|
||||
import p.studio.compiler.services.PBSFrontendPhaseService;
|
||||
import p.studio.compiler.source.identifiers.FileId;
|
||||
@@ -146,26 +146,28 @@ public final class CompilerLanguageServiceBridge implements LanguageServiceBridg
|
||||
final int line,
|
||||
final int character) {
|
||||
Objects.requireNonNull(context, "context");
|
||||
final Optional<PBSFrontendLanguageService> languageService = pbsLanguageService(context);
|
||||
final var provider = frontendProvider(context);
|
||||
final var languageService = provider.languageService();
|
||||
if (languageService.isEmpty()) {
|
||||
return new BaselineSignatureHelp(List.of(), 0, 0);
|
||||
}
|
||||
return editorialDocument(context, documentUri, text)
|
||||
.flatMap(document -> {
|
||||
.map(document -> {
|
||||
final int offset = new DocumentPositionMapper(document.text()).byteOffsetOf(line, character);
|
||||
return languageService.orElseThrow().signatureHelp(
|
||||
document.text(),
|
||||
final FrontendDocumentRequest request = new FrontendDocumentRequest(
|
||||
context.projectRoot(),
|
||||
normalizeDocumentPath(documentUri),
|
||||
document.text());
|
||||
final FrontendEditorialContext editorialContext = new FrontendEditorialContext(
|
||||
document.ast(),
|
||||
document.supplementalTopDecls(),
|
||||
document.feSurfaceContext(),
|
||||
document.feSurfaceContext());
|
||||
return languageService.orElseThrow().signatureHelp(
|
||||
request,
|
||||
editorialContext,
|
||||
offset);
|
||||
})
|
||||
.map(signatureHelp -> new BaselineSignatureHelp(
|
||||
signatureHelp.signatures().stream()
|
||||
.map(signature -> new BaselineSignature(signature.label(), signature.parameterLabels(), ""))
|
||||
.toList(),
|
||||
signatureHelp.activeSignature(),
|
||||
signatureHelp.activeParameter()))
|
||||
.map(this::mapSignatureHelp)
|
||||
.orElseGet(() -> new BaselineSignatureHelp(List.of(), 0, 0));
|
||||
}
|
||||
|
||||
@@ -382,6 +384,18 @@ public final class CompilerLanguageServiceBridge implements LanguageServiceBridg
|
||||
tokenStyle.underline());
|
||||
}
|
||||
|
||||
private BaselineSignatureHelp mapSignatureHelp(final FrontendSignatureHelp signatureHelp) {
|
||||
return new BaselineSignatureHelp(
|
||||
signatureHelp.signatures().stream()
|
||||
.map(signature -> new BaselineSignature(
|
||||
signature.label(),
|
||||
signature.parameterLabels(),
|
||||
signature.documentation()))
|
||||
.toList(),
|
||||
signatureHelp.activeSignature(),
|
||||
signatureHelp.activeParameter());
|
||||
}
|
||||
|
||||
private p.studio.compiler.models.FrontendSpec frontendSpec(final LspProjectContext context) {
|
||||
return frontendProvider(context).specification();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user