From 3ca58dcc24b9dfe16df169039304bde5dc312ffa Mon Sep 17 00:00:00 2001 From: bQUARKz Date: Wed, 15 Jul 2026 11:31:02 +0100 Subject: [PATCH] implements PLN-0115 --- discussion/index.ndjson | 2 +- ...gnature-help-to-generic-frontend-models.md | 37 +--------------- .../compiler/PBSFrontendLanguageService.java | 42 ++++++++++++++++++- .../services/FrontendLanguageService.java | 7 ++++ .../CompilerLanguageServiceBridge.java | 38 +++++++++++------ 5 files changed, 77 insertions(+), 49 deletions(-) diff --git a/discussion/index.ndjson b/discussion/index.ndjson index 5196c9cc..ea64ce91 100644 --- a/discussion/index.ndjson +++ b/discussion/index.ndjson @@ -8,7 +8,7 @@ {"type":"discussion","id":"DSC-0059","status":"open","ticket":"multi-frontend-common-lifecycle","title":"Extrair lifecycle comum das responsabilidades do frontend PBS","created_at":"2026-07-15","updated_at":"2026-07-15","tags":["compiler","compiler-general","compiler-pbs","lifecycle","backend","multi-frontend"],"agendas":[{"id":"AGD-0062","file":"AGD-0062-multi-frontend-common-lifecycle.md","status":"open","created_at":"2026-07-15","updated_at":"2026-07-15"}],"decisions":[],"plans":[],"lessons":[]} {"type":"discussion","id":"DSC-0058","status":"open","ticket":"multi-frontend-serializable-ir","title":"Manter a IR comum serializavel por design","created_at":"2026-07-15","updated_at":"2026-07-15","tags":["compiler","compiler-general","ir","backend","serialization","multi-frontend"],"agendas":[{"id":"AGD-0061","file":"AGD-0061-multi-frontend-serializable-ir.md","status":"open","created_at":"2026-07-15","updated_at":"2026-07-15"}],"decisions":[],"plans":[],"lessons":[]} {"type":"discussion","id":"DSC-0057","status":"open","ticket":"multi-frontend-frontend-backend-contract","title":"Estabilizar contrato entre frontend e backend comum","created_at":"2026-07-15","updated_at":"2026-07-15","tags":["compiler","compiler-general","compiler-pbs","ir","backend","multi-frontend"],"agendas":[{"id":"AGD-0060","file":"AGD-0060-multi-frontend-frontend-backend-contract.md","status":"open","created_at":"2026-07-15","updated_at":"2026-07-15"}],"decisions":[],"plans":[],"lessons":[]} -{"type":"discussion","id":"DSC-0056","status":"in_progress","ticket":"multi-frontend-remove-pbs-branches","title":"Generalizar o contrato LSP/editorial para frontends","created_at":"2026-07-15","updated_at":"2026-07-15","tags":["compiler","compiler-general","compiler-pbs","studio","frontend","coupling","multi-frontend"],"agendas":[{"id":"AGD-0059","file":"AGD-0059-multi-frontend-remove-pbs-branches.md","status":"accepted","created_at":"2026-07-15","updated_at":"2026-07-15"}],"decisions":[{"id":"DEC-0042","file":"DEC-0042-frontend-editorial-language-service-contract-for-lsp.md","status":"accepted","created_at":"2026-07-15","updated_at":"2026-07-15","ref_agenda":"AGD-0059"}],"plans":[{"id":"PLN-0111","file":"PLN-0111-define-generic-frontend-editorial-dtos-and-capability-surface.md","status":"done","created_at":"2026-07-15","updated_at":"2026-07-15","ref_decisions":["DEC-0042"]},{"id":"PLN-0112","file":"PLN-0112-migrate-semantic-tokens-to-generic-frontend-language-service.md","status":"done","created_at":"2026-07-15","updated_at":"2026-07-15","ref_decisions":["DEC-0042"]},{"id":"PLN-0113","file":"PLN-0113-migrate-completion-to-generic-frontend-models.md","status":"done","created_at":"2026-07-15","updated_at":"2026-07-15","ref_decisions":["DEC-0042"]},{"id":"PLN-0114","file":"PLN-0114-migrate-hover-and-documentation-to-generic-frontend-models.md","status":"done","created_at":"2026-07-15","updated_at":"2026-07-15","ref_decisions":["DEC-0042"]},{"id":"PLN-0115","file":"PLN-0115-migrate-signature-help-to-generic-frontend-models.md","status":"open","created_at":"2026-07-15","updated_at":"2026-07-15","ref_decisions":["DEC-0042"]},{"id":"PLN-0116","file":"PLN-0116-remove-pbs-imports-from-common-lsp-and-add-boundary-coverage.md","status":"open","created_at":"2026-07-15","updated_at":"2026-07-15","ref_decisions":["DEC-0042"]}],"lessons":[]} +{"type":"discussion","id":"DSC-0056","status":"in_progress","ticket":"multi-frontend-remove-pbs-branches","title":"Generalizar o contrato LSP/editorial para frontends","created_at":"2026-07-15","updated_at":"2026-07-15","tags":["compiler","compiler-general","compiler-pbs","studio","frontend","coupling","multi-frontend"],"agendas":[{"id":"AGD-0059","file":"AGD-0059-multi-frontend-remove-pbs-branches.md","status":"accepted","created_at":"2026-07-15","updated_at":"2026-07-15"}],"decisions":[{"id":"DEC-0042","file":"DEC-0042-frontend-editorial-language-service-contract-for-lsp.md","status":"accepted","created_at":"2026-07-15","updated_at":"2026-07-15","ref_agenda":"AGD-0059"}],"plans":[{"id":"PLN-0111","file":"PLN-0111-define-generic-frontend-editorial-dtos-and-capability-surface.md","status":"done","created_at":"2026-07-15","updated_at":"2026-07-15","ref_decisions":["DEC-0042"]},{"id":"PLN-0112","file":"PLN-0112-migrate-semantic-tokens-to-generic-frontend-language-service.md","status":"done","created_at":"2026-07-15","updated_at":"2026-07-15","ref_decisions":["DEC-0042"]},{"id":"PLN-0113","file":"PLN-0113-migrate-completion-to-generic-frontend-models.md","status":"done","created_at":"2026-07-15","updated_at":"2026-07-15","ref_decisions":["DEC-0042"]},{"id":"PLN-0114","file":"PLN-0114-migrate-hover-and-documentation-to-generic-frontend-models.md","status":"done","created_at":"2026-07-15","updated_at":"2026-07-15","ref_decisions":["DEC-0042"]},{"id":"PLN-0115","file":"PLN-0115-migrate-signature-help-to-generic-frontend-models.md","status":"done","created_at":"2026-07-15","updated_at":"2026-07-15","ref_decisions":["DEC-0042"]},{"id":"PLN-0116","file":"PLN-0116-remove-pbs-imports-from-common-lsp-and-add-boundary-coverage.md","status":"open","created_at":"2026-07-15","updated_at":"2026-07-15","ref_decisions":["DEC-0042"]}],"lessons":[]} {"type":"discussion","id":"DSC-0055","status":"done","ticket":"multi-frontend-compiler-vs-language-services","title":"Separar compilacao de servicos editoriais de frontend","created_at":"2026-07-15","updated_at":"2026-07-15","tags":["compiler","compiler-general","studio","lsp","editor","frontend","multi-frontend"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0056","file":"discussion/lessons/DSC-0055-multi-frontend-compiler-vs-language-services/LSN-0056-compile-first-frontends-with-optional-editorial-capabilities.md","status":"done","created_at":"2026-07-15","updated_at":"2026-07-15"}]} {"type":"discussion","id":"DSC-0054","status":"done","ticket":"multi-frontend-provider-contract","title":"Introduzir provider completo de frontend","created_at":"2026-07-15","updated_at":"2026-07-15","tags":["compiler","compiler-general","studio","frontend","registry","multi-frontend"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0055","file":"discussion/lessons/DSC-0054-multi-frontend-provider-contract/LSN-0055-static-frontend-providers-before-plugin-architecture.md","status":"done","created_at":"2026-07-15","updated_at":"2026-07-15"}]} {"type":"discussion","id":"DSC-0053","status":"open","ticket":"pbs-lsp-call-and-type-hierarchy","title":"PBS LSP Call and Type Hierarchy","created_at":"2026-07-15","updated_at":"2026-07-15","tags":["studio","lsp","vscode","compiler-pbs","editor","call-hierarchy","type-hierarchy"],"agendas":[{"id":"AGD-0056","file":"AGD-0056-pbs-lsp-call-and-type-hierarchy.md","status":"open","created_at":"2026-07-15","updated_at":"2026-07-15"}],"decisions":[],"plans":[],"lessons":[]} diff --git a/discussion/workflow/plans/PLN-0115-migrate-signature-help-to-generic-frontend-models.md b/discussion/workflow/plans/PLN-0115-migrate-signature-help-to-generic-frontend-models.md index d076fb27..8fde5a07 100644 --- a/discussion/workflow/plans/PLN-0115-migrate-signature-help-to-generic-frontend-models.md +++ b/discussion/workflow/plans/PLN-0115-migrate-signature-help-to-generic-frontend-models.md @@ -2,8 +2,9 @@ id: PLN-0115 ticket: multi-frontend-remove-pbs-branches title: Migrate signature help to generic frontend models -status: open +status: done created: 2026-07-15 +completed: 2026-07-15 ref_decisions: [DEC-0042] tags: [compiler, compiler-general, compiler-pbs, studio, frontend, coupling, multi-frontend] --- @@ -63,37 +64,3 @@ Migrate LSP signature help handling to generic frontend signature-help models wh - `prometeu-compiler/frontends/prometeu-frontend-pbs/src/main/java/p/studio/compiler/PBSFrontendLanguageService.java` - `prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/services/compiler/CompilerLanguageServiceBridge.java` - Signature-help tests. - -TBD. - -## Objective - -TBD. - -## Dependencies - -TBD. - -## Scope - -TBD. - -## Non-Goals - -TBD. - -## Execution Method - -TBD. - -## Acceptance Criteria - -TBD. - -## Tests - -TBD. - -## Affected Artifacts - -TBD. diff --git a/prometeu-compiler/frontends/prometeu-frontend-pbs/src/main/java/p/studio/compiler/PBSFrontendLanguageService.java b/prometeu-compiler/frontends/prometeu-frontend-pbs/src/main/java/p/studio/compiler/PBSFrontendLanguageService.java index 548a5c1a..6f6b39dd 100644 --- a/prometeu-compiler/frontends/prometeu-frontend-pbs/src/main/java/p/studio/compiler/PBSFrontendLanguageService.java +++ b/prometeu-compiler/frontends/prometeu-frontend-pbs/src/main/java/p/studio/compiler/PBSFrontendLanguageService.java @@ -15,6 +15,7 @@ import p.studio.compiler.services.FrontendEditorialContext; import p.studio.compiler.services.FrontendHover; import p.studio.compiler.services.FrontendLanguageService; import p.studio.compiler.services.FrontendSignature; +import p.studio.compiler.services.FrontendSignatureHelp; import p.studio.compiler.services.FrontendSymbolKind; import p.studio.utilities.structures.ReadOnlyList; @@ -114,6 +115,32 @@ public final class PBSFrontendLanguageService implements FrontendLanguageService return editorialSupportService.signatureHelp(sourceText, ast, supplementalTopDecls, feSurfaceContext, offset); } + @Override + public FrontendSignatureHelp signatureHelp( + final FrontendDocumentRequest request, + final FrontendEditorialContext editorialContext, + final int offset) { + if (request == null + || editorialContext == null + || !(editorialContext.syntaxTree() instanceof PbsAst.File ast) + || !(editorialContext.supplementalDeclarations() instanceof ReadOnlyList supplementalTopDecls) + || !(editorialContext.semanticContext() instanceof FESurfaceContext feSurfaceContext)) { + return FrontendSignatureHelp.empty(); + } + + @SuppressWarnings("unchecked") + final ReadOnlyList typedSupplementalTopDecls = + (ReadOnlyList) supplementalTopDecls; + return signatureHelp( + request.documentText(), + ast, + typedSupplementalTopDecls, + feSurfaceContext, + offset) + .map(this::toFrontendSignatureHelp) + .orElseGet(FrontendSignatureHelp::empty); + } + @Override public List semanticTokens(final FrontendDocumentRequest request) { return semanticTokens(request == null ? "" : request.documentText()); @@ -139,11 +166,24 @@ public final class PBSFrontendLanguageService implements FrontendLanguageService symbol.detail(), symbol.origin(), symbol.signatures().stream() - .map(signature -> new FrontendSignature(signature.label(), signature.parameterLabels(), "")) + .map(this::toFrontendSignature) .toList(), FrontendDocumentation.markdown(symbol.documentation())); } + private FrontendSignatureHelp toFrontendSignatureHelp(final PbsEditorialSignatureHelp signatureHelp) { + return new FrontendSignatureHelp( + signatureHelp.signatures().stream() + .map(this::toFrontendSignature) + .toList(), + signatureHelp.activeSignature(), + signatureHelp.activeParameter()); + } + + private FrontendSignature toFrontendSignature(final p.studio.compiler.pbs.semantics.PbsEditorialSignature signature) { + return new FrontendSignature(signature.label(), signature.parameterLabels(), ""); + } + private FrontendSymbolKind toFrontendSymbolKind(final PbsEditorialSymbolKind kind) { return FrontendSymbolKind.valueOf(kind.name()); } diff --git a/prometeu-compiler/prometeu-frontend-api/src/main/java/p/studio/compiler/services/FrontendLanguageService.java b/prometeu-compiler/prometeu-frontend-api/src/main/java/p/studio/compiler/services/FrontendLanguageService.java index 27e5cccf..e2fd21ce 100644 --- a/prometeu-compiler/prometeu-frontend-api/src/main/java/p/studio/compiler/services/FrontendLanguageService.java +++ b/prometeu-compiler/prometeu-frontend-api/src/main/java/p/studio/compiler/services/FrontendLanguageService.java @@ -44,4 +44,11 @@ public interface FrontendLanguageService { final int offset) { return FrontendSignatureHelp.empty(); } + + default FrontendSignatureHelp signatureHelp( + final FrontendDocumentRequest request, + final FrontendEditorialContext editorialContext, + final int offset) { + return signatureHelp(request, offset); + } } diff --git a/prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/services/compiler/CompilerLanguageServiceBridge.java b/prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/services/compiler/CompilerLanguageServiceBridge.java index 8e583456..8e94fb82 100644 --- a/prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/services/compiler/CompilerLanguageServiceBridge.java +++ b/prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/services/compiler/CompilerLanguageServiceBridge.java @@ -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 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(); }