implements PLN-0134
Intrepid/Prometeu/Studio/pipeline/pr-master Build started...
JaCoCo Coverage #### Project Overview
No changes detected, that affect the code coverage.
* Line Coverage: 63.37% (18783/29640)
* Branch Coverage: 53.99% (7369/13648)
* Lines of Code: 29640
* Cyclomatic Complexity: 11938
#### Quality Gates Summary
Output truncated.
Test / Build skipped: 15, passed: 674
Intrepid/Prometeu/Studio/pipeline/head This commit looks good
Intrepid/Prometeu/Studio/pipeline/pr-master Build started...
JaCoCo Coverage #### Project Overview
No changes detected, that affect the code coverage.
* Line Coverage: 63.37% (18783/29640)
* Branch Coverage: 53.99% (7369/13648)
* Lines of Code: 29640
* Cyclomatic Complexity: 11938
#### Quality Gates Summary
Output truncated.
Test / Build skipped: 15, passed: 674
Intrepid/Prometeu/Studio/pipeline/head This commit looks good
Add PBS workspace symbols as a physical flatten of the outline named-declaration set on FrontendLanguageService. Regular files only; virtual stdlib, barrels, imports, locals, and compile-only frontends stay empty. Advertise workspaceSymbolProvider with flat SymbolInformation. workspace/symbol does not require an open document. Housekeep DSC-0042 with LSN-0071.
This commit is contained in:
+81
@@ -13,6 +13,7 @@ import p.studio.compiler.pbs.semantics.PbsEditorialSignatureHelp;
|
||||
import p.studio.compiler.pbs.semantics.PbsEditorialSymbolKind;
|
||||
import p.studio.compiler.pbs.semantics.PbsEditorialSupportService;
|
||||
import p.studio.compiler.pbs.semantics.PbsEditorialSupportService.EditorialDocument;
|
||||
import p.studio.compiler.pbs.semantics.PbsEditorialWorkspaceSymbol;
|
||||
import p.studio.compiler.services.PBSFrontendPhaseService.PbsSemanticReadSurface;
|
||||
import p.studio.compiler.services.FrontendCompletionCandidate;
|
||||
import p.studio.compiler.services.FrontendDefinitionLocation;
|
||||
@@ -25,6 +26,8 @@ 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.compiler.services.FrontendWorkspaceRequest;
|
||||
import p.studio.compiler.services.FrontendWorkspaceSymbol;
|
||||
import p.studio.compiler.services.PBSFrontendPhaseService;
|
||||
import p.studio.compiler.source.Span;
|
||||
import p.studio.compiler.source.diagnostics.DiagnosticSink;
|
||||
@@ -35,6 +38,7 @@ import p.studio.utilities.structures.ReadOnlyList;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Comparator;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
@@ -55,6 +59,23 @@ public final class PBSFrontendLanguageService implements FrontendLanguageService
|
||||
this.semanticTokenProvider = Objects.requireNonNull(semanticTokenProvider, "semanticTokenProvider");
|
||||
}
|
||||
|
||||
@Override
|
||||
public Optional<FrontendEditorialContext> prepareEditorialContext(final FrontendPhaseContext phaseContext) {
|
||||
if (phaseContext == null) {
|
||||
return Optional.empty();
|
||||
}
|
||||
final var semanticReadSurface = PBSFrontendPhaseService.semanticReadSurface(
|
||||
phaseContext,
|
||||
DiagnosticSink.empty(),
|
||||
BuildingIssueSink.empty());
|
||||
return Optional.of(new FrontendEditorialContext(
|
||||
null,
|
||||
ReadOnlyList.empty(),
|
||||
phaseContext.feSurfaceContext(),
|
||||
phaseContext.fileTable,
|
||||
semanticReadSurface));
|
||||
}
|
||||
|
||||
@Override
|
||||
public Optional<FrontendEditorialContext> prepareEditorialContext(
|
||||
final FrontendPhaseContext phaseContext,
|
||||
@@ -281,6 +302,41 @@ public final class PBSFrontendLanguageService implements FrontendLanguageService
|
||||
.toList();
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<FrontendWorkspaceSymbol> workspaceSymbols(
|
||||
final FrontendWorkspaceRequest request,
|
||||
final FrontendEditorialContext editorialContext) {
|
||||
if (request == null
|
||||
|| editorialContext == null
|
||||
|| !(editorialContext.sourceFiles() instanceof FileTableReader fileTable)
|
||||
|| !(editorialContext.projectSurface() instanceof PbsSemanticReadSurface surface)
|
||||
|| surface.astByFile() == null
|
||||
|| surface.astByFile().isEmpty()) {
|
||||
return List.of();
|
||||
}
|
||||
final ArrayList<FrontendWorkspaceSymbol> symbols = new ArrayList<>();
|
||||
for (final var entry : surface.astByFile().entrySet()) {
|
||||
final Path path = pathForRegularSource(entry.getKey(), fileTable);
|
||||
if (path == null) {
|
||||
continue;
|
||||
}
|
||||
final PbsAst.File fileAst = entry.getValue();
|
||||
if (fileAst == null) {
|
||||
continue;
|
||||
}
|
||||
for (final PbsEditorialWorkspaceSymbol symbol : editorialSupportService.workspaceSymbols(
|
||||
fileAst,
|
||||
request.query())) {
|
||||
toFrontendWorkspaceSymbol(symbol, path).ifPresent(symbols::add);
|
||||
}
|
||||
}
|
||||
symbols.sort(Comparator
|
||||
.comparing(FrontendWorkspaceSymbol::name, String.CASE_INSENSITIVE_ORDER)
|
||||
.thenComparing(symbol -> symbol.path().toString())
|
||||
.thenComparingInt(FrontendWorkspaceSymbol::startOffset));
|
||||
return List.copyOf(symbols);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<FrontendSemanticToken> semanticTokens(final FrontendDocumentRequest request) {
|
||||
return semanticTokens(request == null ? "" : request.documentText());
|
||||
@@ -328,6 +384,22 @@ public final class PBSFrontendLanguageService implements FrontendLanguageService
|
||||
return FrontendSymbolKind.valueOf(kind.name());
|
||||
}
|
||||
|
||||
private Optional<FrontendWorkspaceSymbol> toFrontendWorkspaceSymbol(
|
||||
final PbsEditorialWorkspaceSymbol symbol,
|
||||
final Path path) {
|
||||
if (symbol == null || path == null || symbol.span() == null || symbol.span().isNone()) {
|
||||
return Optional.empty();
|
||||
}
|
||||
return Optional.of(new FrontendWorkspaceSymbol(
|
||||
symbol.name(),
|
||||
toFrontendSymbolKind(symbol.kind()),
|
||||
symbol.detail(),
|
||||
symbol.containerName(),
|
||||
path,
|
||||
toOffset(symbol.span().getStart()),
|
||||
toOffset(symbol.span().getEnd())));
|
||||
}
|
||||
|
||||
private FrontendDocumentSymbol toFrontendDocumentSymbol(final PbsEditorialDocumentSymbol symbol) {
|
||||
final int start = toOffset(symbol.span().getStart());
|
||||
final int end = toOffset(symbol.span().getEnd());
|
||||
@@ -376,6 +448,15 @@ public final class PBSFrontendLanguageService implements FrontendLanguageService
|
||||
return List.copyOf(documents);
|
||||
}
|
||||
|
||||
private Path pathForRegularSource(
|
||||
final FileId fileId,
|
||||
final FileTableReader fileTable) {
|
||||
if (!isRegularSource(fileId, fileTable)) {
|
||||
return null;
|
||||
}
|
||||
return fileTable.get(fileId).getCanonPath().toAbsolutePath().normalize();
|
||||
}
|
||||
|
||||
private boolean isRegularSource(
|
||||
final FileId fileId,
|
||||
final FileTableReader fileTable) {
|
||||
|
||||
+55
@@ -0,0 +1,55 @@
|
||||
package p.studio.compiler.pbs.semantics;
|
||||
|
||||
import p.studio.compiler.pbs.ast.PbsAst;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
|
||||
final class PbsAstWorkspaceSymbols {
|
||||
private PbsAstWorkspaceSymbols() {
|
||||
}
|
||||
|
||||
static List<PbsEditorialWorkspaceSymbol> list(
|
||||
final PbsAst.File ast,
|
||||
final String query) {
|
||||
if (ast == null) {
|
||||
return List.of();
|
||||
}
|
||||
final ArrayList<PbsEditorialWorkspaceSymbol> symbols = new ArrayList<>();
|
||||
for (final PbsEditorialDocumentSymbol topDecl : PbsAstDocumentSymbols.list(ast)) {
|
||||
flatten(topDecl, "", query, symbols);
|
||||
}
|
||||
return List.copyOf(symbols);
|
||||
}
|
||||
|
||||
private static void flatten(
|
||||
final PbsEditorialDocumentSymbol symbol,
|
||||
final String containerName,
|
||||
final String query,
|
||||
final ArrayList<PbsEditorialWorkspaceSymbol> symbols) {
|
||||
if (matches(symbol.name(), query)) {
|
||||
symbols.add(new PbsEditorialWorkspaceSymbol(
|
||||
symbol.name(),
|
||||
symbol.kind(),
|
||||
symbol.detail(),
|
||||
containerName,
|
||||
symbol.span()));
|
||||
}
|
||||
for (final PbsEditorialDocumentSymbol child : symbol.children()) {
|
||||
flatten(child, symbol.name(), query, symbols);
|
||||
}
|
||||
}
|
||||
|
||||
static boolean matches(
|
||||
final String name,
|
||||
final String query) {
|
||||
if (name == null || name.isBlank()) {
|
||||
return false;
|
||||
}
|
||||
if (query == null || query.isBlank()) {
|
||||
return true;
|
||||
}
|
||||
return name.toLowerCase(Locale.ROOT).contains(query.trim().toLowerCase(Locale.ROOT));
|
||||
}
|
||||
}
|
||||
+6
@@ -78,6 +78,12 @@ public final class PbsEditorialSupportService {
|
||||
return PbsAstDocumentSymbols.list(ast);
|
||||
}
|
||||
|
||||
public List<PbsEditorialWorkspaceSymbol> workspaceSymbols(
|
||||
final PbsAst.File ast,
|
||||
final String query) {
|
||||
return PbsAstWorkspaceSymbols.list(ast, query);
|
||||
}
|
||||
|
||||
public List<PbsEditorialLocation> definition(
|
||||
final String sourceText,
|
||||
final PbsAst.File ast,
|
||||
|
||||
+21
@@ -0,0 +1,21 @@
|
||||
package p.studio.compiler.pbs.semantics;
|
||||
|
||||
import p.studio.compiler.source.Span;
|
||||
|
||||
import java.util.Objects;
|
||||
|
||||
public record PbsEditorialWorkspaceSymbol(
|
||||
String name,
|
||||
PbsEditorialSymbolKind kind,
|
||||
String detail,
|
||||
String containerName,
|
||||
Span span) {
|
||||
|
||||
public PbsEditorialWorkspaceSymbol {
|
||||
name = Objects.requireNonNull(name, "name").trim();
|
||||
kind = Objects.requireNonNull(kind, "kind");
|
||||
detail = detail == null ? "" : detail;
|
||||
containerName = containerName == null ? "" : containerName.trim();
|
||||
span = Objects.requireNonNull(span, "span");
|
||||
}
|
||||
}
|
||||
+47
@@ -526,6 +526,51 @@ final class PbsEditorialSupportServiceTest {
|
||||
assertEquals(List.of("tick"), names(implementsSymbol.children()));
|
||||
}
|
||||
|
||||
@Test
|
||||
void shouldFlattenOutlineMembersForWorkspaceSearchAndFilterByName() {
|
||||
final var source = """
|
||||
import { Log } from @sdk:log;
|
||||
|
||||
declare struct Vec(x: int) {
|
||||
ctor make(x: int) { return; }
|
||||
fn blend(dx: int, dy: int) -> int { return dx; }
|
||||
}
|
||||
|
||||
fn helper() -> int { return 42; }
|
||||
fn helper(value: int) -> int { return value; }
|
||||
|
||||
fn frame() -> void {
|
||||
let local = 1;
|
||||
helper(local);
|
||||
}
|
||||
""";
|
||||
final var ast = parseOrdinary(source);
|
||||
final var all = service.workspaceSymbols(ast, "");
|
||||
assertEquals(List.of(
|
||||
"Vec",
|
||||
"x",
|
||||
"make",
|
||||
"blend",
|
||||
"helper",
|
||||
"helper",
|
||||
"frame"), all.stream().map(PbsEditorialWorkspaceSymbol::name).toList());
|
||||
assertEquals("", all.getFirst().containerName());
|
||||
assertEquals("Vec", all.stream().filter(symbol -> symbol.name().equals("blend")).findFirst().orElseThrow().containerName());
|
||||
assertEquals("Vec", all.stream().filter(symbol -> symbol.name().equals("x")).findFirst().orElseThrow().containerName());
|
||||
assertTrue(all.stream().noneMatch(symbol -> symbol.name().equals("Log") || symbol.name().equals("local")));
|
||||
|
||||
final var blendHits = service.workspaceSymbols(ast, "BLEND");
|
||||
assertEquals(List.of("blend"), blendHits.stream().map(PbsEditorialWorkspaceSymbol::name).toList());
|
||||
assertEquals("Vec", blendHits.getFirst().containerName());
|
||||
|
||||
final var helperHits = service.workspaceSymbols(ast, "helper");
|
||||
assertEquals(2, helperHits.size());
|
||||
assertNotEquals(helperHits.getFirst().detail(), helperHits.get(1).detail());
|
||||
|
||||
final var qualifiedMiss = service.workspaceSymbols(ast, "Vec.blend");
|
||||
assertTrue(qualifiedMiss.isEmpty());
|
||||
}
|
||||
|
||||
@Test
|
||||
void shouldOmitInvalidDeclarationsAndKeepNamedDeclsFromRecoveredAst() {
|
||||
final var source = """
|
||||
@@ -536,6 +581,8 @@ final class PbsEditorialSupportServiceTest {
|
||||
final var symbols = service.documentSymbols(ast);
|
||||
assertEquals(List.of("ok"), names(symbols));
|
||||
assertEquals(PbsEditorialSymbolKind.FUNCTION, symbols.getFirst().kind());
|
||||
final var workspaceSymbols = service.workspaceSymbols(ast, "");
|
||||
assertEquals(List.of("ok"), workspaceSymbols.stream().map(PbsEditorialWorkspaceSymbol::name).toList());
|
||||
}
|
||||
|
||||
@Test
|
||||
|
||||
Reference in New Issue
Block a user