implements PLN-0116

This commit is contained in:
2026-07-15 11:33:43 +01:00
parent 3ca58dcc24
commit 79e4a64ff2
6 changed files with 79 additions and 70 deletions
@@ -2,7 +2,6 @@ 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.services.FrontendCompletionCandidate;
@@ -13,7 +12,6 @@ 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;
import p.studio.compiler.utilities.SourceProviderFactory;
import p.studio.compiler.workspaces.AssetSurfaceContextLoader;
@@ -21,7 +19,6 @@ import p.studio.compiler.workspaces.BuilderPipelineService;
import p.studio.lsp.messages.*;
import p.studio.lsp.services.LanguageServiceBridge;
import p.studio.utilities.logs.LogAggregator;
import p.studio.utilities.structures.ReadOnlyList;
import java.net.URI;
import java.nio.file.Path;
@@ -91,9 +88,9 @@ public final class CompilerLanguageServiceBridge implements LanguageServiceBridg
normalizeDocumentPath(documentUri),
document.text());
final FrontendEditorialContext editorialContext = new FrontendEditorialContext(
document.ast(),
document.supplementalTopDecls(),
document.feSurfaceContext());
document.editorialContext().syntaxTree(),
document.editorialContext().supplementalDeclarations(),
document.editorialContext().semanticContext());
final List<FrontendCompletionCandidate> candidates = languageService.orElseThrow().completion(
request,
editorialContext,
@@ -126,9 +123,9 @@ public final class CompilerLanguageServiceBridge implements LanguageServiceBridg
normalizeDocumentPath(documentUri),
document.text());
final FrontendEditorialContext editorialContext = new FrontendEditorialContext(
document.ast(),
document.supplementalTopDecls(),
document.feSurfaceContext());
document.editorialContext().syntaxTree(),
document.editorialContext().supplementalDeclarations(),
document.editorialContext().semanticContext());
return languageService.orElseThrow().hover(
request,
editorialContext,
@@ -159,9 +156,9 @@ public final class CompilerLanguageServiceBridge implements LanguageServiceBridg
normalizeDocumentPath(documentUri),
document.text());
final FrontendEditorialContext editorialContext = new FrontendEditorialContext(
document.ast(),
document.supplementalTopDecls(),
document.feSurfaceContext());
document.editorialContext().syntaxTree(),
document.editorialContext().supplementalDeclarations(),
document.editorialContext().semanticContext());
return languageService.orElseThrow().signatureHelp(
request,
editorialContext,
@@ -230,6 +227,10 @@ public final class CompilerLanguageServiceBridge implements LanguageServiceBridg
final LspProjectContext context,
final String documentUri,
final String text) {
final var languageService = frontendProvider(context).languageService();
if (languageService.isEmpty()) {
return Optional.empty();
}
final Path documentPath = normalizeDocumentPath(documentUri);
final BuilderPipelineContext pipelineContext = BuilderPipelineContext.fromConfig(
new BuilderPipelineConfig(
@@ -250,19 +251,11 @@ public final class CompilerLanguageServiceBridge implements LanguageServiceBridg
pipelineContext.resolvedWorkspace.target(),
HostAdmissionContext.permissiveDefault(),
assetSurfaceContextLoader.load(pipelineContext.resolvedWorkspace.mainProject().getRootPath()));
final var semanticReadSurface = PBSFrontendPhaseService.semanticReadSurface(
frontendPhaseContext,
p.studio.compiler.source.diagnostics.DiagnosticSink.empty(),
BuildingIssueSink.empty());
final var ast = semanticReadSurface.astByFile().get(fileId);
if (ast == null) {
return Optional.empty();
}
return Optional.of(new EditorialDocument(
text == null ? readCurrentText(pipelineContext, fileId) : text,
ast,
semanticReadSurface.supplementalTopDeclsByFile().getOrDefault(fileId, ReadOnlyList.empty()),
frontendPhaseContext.feSurfaceContext()));
return languageService.orElseThrow()
.prepareEditorialContext(frontendPhaseContext, fileId)
.map(editorialContext -> new EditorialDocument(
text == null ? readCurrentText(pipelineContext, fileId) : text,
editorialContext));
}
private FileId findFileId(
@@ -404,12 +397,6 @@ public final class CompilerLanguageServiceBridge implements LanguageServiceBridg
return frontendProviderResolver.apply(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 FrontendSymbolKind kind) {
return switch (kind) {
case KEYWORD -> BaselineCompletionItemKind.KEYWORD;
@@ -466,8 +453,6 @@ public final class CompilerLanguageServiceBridge implements LanguageServiceBridg
private record EditorialDocument(
String text,
p.studio.compiler.pbs.ast.PbsAst.File ast,
ReadOnlyList<p.studio.compiler.pbs.ast.PbsAst.TopDecl> supplementalTopDecls,
p.studio.compiler.messages.FESurfaceContext feSurfaceContext) {
FrontendEditorialContext editorialContext) {
}
}