implements PLN-0109

This commit is contained in:
2026-07-15 09:43:30 +01:00
parent bc95b33bd9
commit fee89d7522
3 changed files with 33 additions and 12 deletions
@@ -2,6 +2,7 @@ package p.studio.lsp.services.compiler;
import org.apache.commons.lang3.StringUtils;
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.*;
@@ -21,7 +22,6 @@ import java.util.*;
public final class CompilerLanguageServiceBridge implements LanguageServiceBridge {
private final AssetSurfaceContextLoader assetSurfaceContextLoader = new AssetSurfaceContextLoader();
private final PbsEditorialSupportService editorialSupportService = new PbsEditorialSupportService();
@Override
public BaselineServerDescription describeServer(final LspProjectContext context) {
@@ -61,10 +61,14 @@ public final class CompilerLanguageServiceBridge implements LanguageServiceBridg
final int line,
final int character) {
Objects.requireNonNull(context, "context");
final Optional<PBSFrontendLanguageService> languageService = pbsLanguageService(context);
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 = editorialSupportService.completion(
final List<PbsEditorialCompletionCandidate> candidates = languageService.orElseThrow().completion(
document.text(),
document.ast(),
document.supplementalTopDecls(),
@@ -85,10 +89,14 @@ public final class CompilerLanguageServiceBridge implements LanguageServiceBridg
final int line,
final int character) {
Objects.requireNonNull(context, "context");
final Optional<PBSFrontendLanguageService> languageService = pbsLanguageService(context);
if (languageService.isEmpty()) {
return new BaselineHover("No symbol information.");
}
return editorialDocument(context, documentUri, text)
.flatMap(document -> {
final int offset = new DocumentPositionMapper(document.text()).byteOffsetOf(line, character);
return editorialSupportService.hover(
return languageService.orElseThrow().hover(
document.text(),
document.ast(),
document.supplementalTopDecls(),
@@ -107,10 +115,14 @@ public final class CompilerLanguageServiceBridge implements LanguageServiceBridg
final int line,
final int character) {
Objects.requireNonNull(context, "context");
final Optional<PBSFrontendLanguageService> languageService = pbsLanguageService(context);
if (languageService.isEmpty()) {
return new BaselineSignatureHelp(List.of(), 0, 0);
}
return editorialDocument(context, documentUri, text)
.flatMap(document -> {
final int offset = new DocumentPositionMapper(document.text()).byteOffsetOf(line, character);
return editorialSupportService.signatureHelp(
return languageService.orElseThrow().signatureHelp(
document.text(),
document.ast(),
document.supplementalTopDecls(),
@@ -133,9 +145,11 @@ public final class CompilerLanguageServiceBridge implements LanguageServiceBridg
final String text) {
Objects.requireNonNull(context, "context");
final String effectiveText = text == null ? "" : text;
final var frontend = frontendSpec(context);
final var frontend = frontendProvider(context).specification();
final FrontendSemanticPresentationSpec presentation = frontend.getSemanticPresentation();
final List<FrontendSemanticToken> tokens = frontend.getSemanticTokenProvider().tokenize(effectiveText);
final List<FrontendSemanticToken> tokens = pbsLanguageService(context)
.map(languageService -> languageService.semanticTokens(effectiveText))
.orElseGet(List::of);
final var positionMapper = new DocumentPositionMapper(effectiveText);
final var semanticTokens = new ArrayList<BaselineSemanticToken>();
@@ -177,9 +191,6 @@ public final class CompilerLanguageServiceBridge implements LanguageServiceBridg
final LspProjectContext context,
final String documentUri,
final String text) {
if (!"pbs".equals(context.languageId())) {
return Optional.empty();
}
final Path documentPath = normalizeDocumentPath(documentUri);
final BuilderPipelineContext pipelineContext = BuilderPipelineContext.fromConfig(
new BuilderPipelineConfig(
@@ -335,10 +346,20 @@ public final class CompilerLanguageServiceBridge implements LanguageServiceBridg
}
private p.studio.compiler.models.FrontendSpec frontendSpec(final LspProjectContext context) {
return FrontendRegistryService.getFrontendSpec(context.languageId())
return frontendProvider(context).specification();
}
private p.studio.compiler.services.FrontendProvider frontendProvider(final LspProjectContext context) {
return FrontendRegistryService.getProvider(context.languageId())
.orElseThrow(() -> new IllegalArgumentException("no frontend registered for languageId: " + context.languageId()));
}
private Optional<PBSFrontendLanguageService> pbsLanguageService(final LspProjectContext context) {
return frontendProvider(context).languageService()
.filter(PBSFrontendLanguageService.class::isInstance)
.map(PBSFrontendLanguageService.class::cast);
}
private BaselineCompletionItemKind mapCompletionKind(final PbsEditorialSymbolKind kind) {
return switch (kind) {
case KEYWORD -> BaselineCompletionItemKind.KEYWORD;