implements PLN-0113

This commit is contained in:
2026-07-15 11:26:53 +01:00
parent 088101449a
commit 6205b82e0b
6 changed files with 76 additions and 42 deletions
@@ -6,8 +6,11 @@ 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.FrontendProvider;
import p.studio.compiler.services.FrontendSymbolKind;
import p.studio.compiler.services.PBSFrontendPhaseService;
import p.studio.compiler.source.identifiers.FileId;
import p.studio.compiler.utilities.SourceProviderFactory;
@@ -73,18 +76,25 @@ 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 BaselineCompletion(false, List.of());
}
return editorialDocument(context, documentUri, text)
.map(document -> {
final int offset = new DocumentPositionMapper(document.text()).byteOffsetOf(line, character);
final List<PbsEditorialCompletionCandidate> candidates = languageService.orElseThrow().completion(
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());
final List<FrontendCompletionCandidate> candidates = languageService.orElseThrow().completion(
request,
editorialContext,
offset);
return new BaselineCompletion(
false,
@@ -312,7 +322,7 @@ public final class CompilerLanguageServiceBridge implements LanguageServiceBridg
return Path.of(URI.create(Objects.requireNonNull(documentUri, "documentUri"))).toAbsolutePath().normalize();
}
private BaselineCompletionItem mapCompletionItem(final PbsEditorialCompletionCandidate candidate) {
private BaselineCompletionItem mapCompletionItem(final FrontendCompletionCandidate candidate) {
return new BaselineCompletionItem(
candidate.label(),
mapCompletionKind(candidate.kind()),
@@ -377,7 +387,7 @@ public final class CompilerLanguageServiceBridge implements LanguageServiceBridg
.map(PBSFrontendLanguageService.class::cast);
}
private BaselineCompletionItemKind mapCompletionKind(final PbsEditorialSymbolKind kind) {
private BaselineCompletionItemKind mapCompletionKind(final FrontendSymbolKind kind) {
return switch (kind) {
case KEYWORD -> BaselineCompletionItemKind.KEYWORD;
case LOCAL, PARAMETER -> BaselineCompletionItemKind.VARIABLE;