implements PLN-0131
Intrepid/Prometeu/Studio/pipeline/pr-master Build started...
JaCoCo Coverage #### Project Overview
No changes detected, that affect the code coverage.
* Line Coverage: 62.22% (17996/28921)
* Branch Coverage: 52.87% (6986/13213)
* Lines of Code: 28921
* Cyclomatic Complexity: 11624
#### Quality Gates Summary
Output truncated.
Test / Build skipped: 15, passed: 659
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: 62.22% (17996/28921)
* Branch Coverage: 52.87% (6986/13213)
* Lines of Code: 28921
* Cyclomatic Complexity: 11624
#### Quality Gates Summary
Output truncated.
Test / Build skipped: 15, passed: 659
Intrepid/Prometeu/Studio/pipeline/head This commit looks good
Add PBS go-to-definition as hover editorial lookup plus physical declaration locations on FrontendLanguageService. Empty results stay honest when the target is not a regular file, including virtual stdlib paths. Housekeep DSC-0039 with LSN-0068.
This commit is contained in:
+78
-1
@@ -6,11 +6,13 @@ import p.studio.compiler.messages.FrontendPhaseContext;
|
||||
import p.studio.compiler.models.FrontendSemanticToken;
|
||||
import p.studio.compiler.pbs.ast.PbsAst;
|
||||
import p.studio.compiler.pbs.semantics.PbsEditorialCompletionCandidate;
|
||||
import p.studio.compiler.pbs.semantics.PbsEditorialLocation;
|
||||
import p.studio.compiler.pbs.semantics.PbsEditorialResolvedSymbol;
|
||||
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.services.FrontendCompletionCandidate;
|
||||
import p.studio.compiler.services.FrontendDefinitionLocation;
|
||||
import p.studio.compiler.services.FrontendDocumentRequest;
|
||||
import p.studio.compiler.services.FrontendDocumentation;
|
||||
import p.studio.compiler.services.FrontendEditorialContext;
|
||||
@@ -20,10 +22,15 @@ 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.Span;
|
||||
import p.studio.compiler.source.diagnostics.DiagnosticSink;
|
||||
import p.studio.compiler.source.identifiers.FileId;
|
||||
import p.studio.compiler.source.tables.FileTableReader;
|
||||
import p.studio.utilities.structures.ReadOnlyList;
|
||||
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
import java.util.Optional;
|
||||
@@ -61,7 +68,8 @@ public final class PBSFrontendLanguageService implements FrontendLanguageService
|
||||
return Optional.of(new FrontendEditorialContext(
|
||||
ast,
|
||||
semanticReadSurface.supplementalTopDeclsByFile().getOrDefault(fileId, ReadOnlyList.empty()),
|
||||
phaseContext.feSurfaceContext()));
|
||||
phaseContext.feSurfaceContext(),
|
||||
phaseContext.fileTable));
|
||||
}
|
||||
|
||||
public List<PbsEditorialCompletionCandidate> completion(
|
||||
@@ -167,6 +175,44 @@ public final class PBSFrontendLanguageService implements FrontendLanguageService
|
||||
.orElseGet(FrontendSignatureHelp::empty);
|
||||
}
|
||||
|
||||
public List<PbsEditorialLocation> definition(
|
||||
final String sourceText,
|
||||
final PbsAst.File ast,
|
||||
final ReadOnlyList<PbsAst.TopDecl> supplementalTopDecls,
|
||||
final FESurfaceContext feSurfaceContext,
|
||||
final int offset) {
|
||||
return editorialSupportService.definition(sourceText, ast, supplementalTopDecls, feSurfaceContext, offset);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<FrontendDefinitionLocation> definition(
|
||||
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)
|
||||
|| !(editorialContext.sourceFiles() instanceof FileTableReader fileTable)) {
|
||||
return List.of();
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
final ReadOnlyList<PbsAst.TopDecl> typedSupplementalTopDecls =
|
||||
(ReadOnlyList<PbsAst.TopDecl>) supplementalTopDecls;
|
||||
final ArrayList<FrontendDefinitionLocation> locations = new ArrayList<>();
|
||||
for (final PbsEditorialLocation location : definition(
|
||||
request.documentText(),
|
||||
ast,
|
||||
typedSupplementalTopDecls,
|
||||
feSurfaceContext,
|
||||
offset)) {
|
||||
toFrontendLocation(location, fileTable).ifPresent(locations::add);
|
||||
}
|
||||
return List.copyOf(locations);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<FrontendSemanticToken> semanticTokens(final FrontendDocumentRequest request) {
|
||||
return semanticTokens(request == null ? "" : request.documentText());
|
||||
@@ -213,4 +259,35 @@ public final class PBSFrontendLanguageService implements FrontendLanguageService
|
||||
private FrontendSymbolKind toFrontendSymbolKind(final PbsEditorialSymbolKind kind) {
|
||||
return FrontendSymbolKind.valueOf(kind.name());
|
||||
}
|
||||
|
||||
private Optional<FrontendDefinitionLocation> toFrontendLocation(
|
||||
final PbsEditorialLocation location,
|
||||
final FileTableReader fileTable) {
|
||||
if (location == null || fileTable == null) {
|
||||
return Optional.empty();
|
||||
}
|
||||
final Span span = location.span();
|
||||
if (span == null || span.isNone() || span.getFileId() == null || span.getFileId().isNone()) {
|
||||
return Optional.empty();
|
||||
}
|
||||
final var sourceHandle = fileTable.get(span.getFileId());
|
||||
if (sourceHandle == null || sourceHandle.getCanonPath() == null) {
|
||||
return Optional.empty();
|
||||
}
|
||||
final Path path = sourceHandle.getCanonPath().toAbsolutePath().normalize();
|
||||
if (!Files.isRegularFile(path)) {
|
||||
return Optional.empty();
|
||||
}
|
||||
return Optional.of(new FrontendDefinitionLocation(
|
||||
path,
|
||||
toOffset(span.getStart()),
|
||||
toOffset(span.getEnd())));
|
||||
}
|
||||
|
||||
private static int toOffset(final long value) {
|
||||
if (value <= 0L) {
|
||||
return 0;
|
||||
}
|
||||
return (int) Math.min(Integer.MAX_VALUE, value);
|
||||
}
|
||||
}
|
||||
|
||||
+11
@@ -0,0 +1,11 @@
|
||||
package p.studio.compiler.pbs.semantics;
|
||||
|
||||
import p.studio.compiler.source.Span;
|
||||
|
||||
import java.util.Objects;
|
||||
|
||||
public record PbsEditorialLocation(Span span) {
|
||||
public PbsEditorialLocation {
|
||||
Objects.requireNonNull(span, "span");
|
||||
}
|
||||
}
|
||||
+239
@@ -74,6 +74,23 @@ public final class PbsEditorialSupportService {
|
||||
return context.resolveSymbolHover(token.lexeme(), tokenIndex, scopeState);
|
||||
}
|
||||
|
||||
public List<PbsEditorialLocation> definition(
|
||||
final String sourceText,
|
||||
final PbsAst.File ast,
|
||||
final ReadOnlyList<PbsAst.TopDecl> supplementalTopDecls,
|
||||
final int offset) {
|
||||
return definition(sourceText, ast, supplementalTopDecls, FESurfaceContext.empty(), offset);
|
||||
}
|
||||
|
||||
public List<PbsEditorialLocation> definition(
|
||||
final String sourceText,
|
||||
final PbsAst.File ast,
|
||||
final ReadOnlyList<PbsAst.TopDecl> supplementalTopDecls,
|
||||
final FESurfaceContext feSurfaceContext,
|
||||
final int offset) {
|
||||
return buildContext(sourceText, ast, supplementalTopDecls, feSurfaceContext).definitionAt(offset);
|
||||
}
|
||||
|
||||
public Optional<PbsEditorialSignatureHelp> signatureHelp(
|
||||
final String sourceText,
|
||||
final PbsAst.File ast,
|
||||
@@ -610,6 +627,228 @@ public final class PbsEditorialSupportService {
|
||||
return Optional.empty();
|
||||
}
|
||||
|
||||
private List<PbsEditorialLocation> definitionAt(final int offset) {
|
||||
final Integer tokenIndex = identifierTokenIndexAt(offset);
|
||||
if (tokenIndex == null) {
|
||||
return List.of();
|
||||
}
|
||||
final var scopeState = scopeStateAt(offset);
|
||||
final var token = token(tokenIndex);
|
||||
final Integer previousTokenIndex = previousSignificantTokenIndex(tokenIndex);
|
||||
if (previousTokenIndex != null && token(previousTokenIndex).kind() == PbsTokenKind.DOT) {
|
||||
final TypeView receiverType = resolveReceiverTypeBeforeDot(previousTokenIndex, scopeState);
|
||||
return resolveMemberDefinition(receiverType, token.lexeme());
|
||||
}
|
||||
return resolveSymbolDefinition(token.lexeme(), tokenIndex, scopeState, offset);
|
||||
}
|
||||
|
||||
private List<PbsEditorialLocation> resolveSymbolDefinition(
|
||||
final String symbolName,
|
||||
final int tokenIndex,
|
||||
final ScopeState scopeState,
|
||||
final int offset) {
|
||||
if (scopeState.parameterNames().contains(symbolName)) {
|
||||
return parameterLocations(symbolName, offset);
|
||||
}
|
||||
final Scope.LocalSymbol localSymbol = scopeState.scope().entries().get(symbolName);
|
||||
if (localSymbol != null) {
|
||||
return localLocations(symbolName, offset);
|
||||
}
|
||||
final Integer previousTokenIndex = previousSignificantTokenIndex(tokenIndex);
|
||||
if (previousTokenIndex != null && token(previousTokenIndex).kind() == PbsTokenKind.NEW) {
|
||||
return constructorLocations(resolveTopDeclSymbol(symbolName));
|
||||
}
|
||||
final TopDeclSymbol importedSymbol = importedSymbols.get(symbolName);
|
||||
if (importedSymbol != null) {
|
||||
return topDeclLocations(importedSymbol);
|
||||
}
|
||||
final TopDeclSymbol supplementalSymbol = supplementalSymbols.get(symbolName);
|
||||
if (supplementalSymbol != null) {
|
||||
return topDeclLocations(supplementalSymbol);
|
||||
}
|
||||
final TopDeclSymbol topLevelSymbol = topLevelSymbols.get(symbolName);
|
||||
if (topLevelSymbol != null) {
|
||||
return topDeclLocations(topLevelSymbol);
|
||||
}
|
||||
return List.of();
|
||||
}
|
||||
|
||||
private List<PbsEditorialLocation> resolveMemberDefinition(
|
||||
final TypeView receiverType,
|
||||
final String memberName) {
|
||||
if (receiverType == null) {
|
||||
return List.of();
|
||||
}
|
||||
if (receiverType.kind() == Kind.STRUCT) {
|
||||
final Span fieldSpan = structFieldSpan(receiverType.name(), memberName);
|
||||
if (fieldSpan != null) {
|
||||
return locations(fieldSpan);
|
||||
}
|
||||
final StructInfo structInfo = model.structs.get(receiverType.name());
|
||||
if (structInfo == null) {
|
||||
return List.of();
|
||||
}
|
||||
return callableLocations(structInfo.methods().get(memberName));
|
||||
}
|
||||
if (receiverType.kind() == Kind.SERVICE || receiverType.kind() == Kind.CONTRACT) {
|
||||
final Map<String, List<CallableSymbol>> methods = receiverType.kind() == Kind.SERVICE
|
||||
? Optional.ofNullable(model.services.get(receiverType.name())).map(ServiceInfo::methods).orElse(Map.of())
|
||||
: Optional.ofNullable(model.contracts.get(receiverType.name())).map(ContractInfo::methods).orElse(Map.of());
|
||||
return callableLocations(methods.get(memberName));
|
||||
}
|
||||
return List.of();
|
||||
}
|
||||
|
||||
private List<PbsEditorialLocation> parameterLocations(
|
||||
final String symbolName,
|
||||
final int offset) {
|
||||
final CallableFrame callableFrame = callableFrameAt(offset);
|
||||
if (callableFrame == null) {
|
||||
return List.of();
|
||||
}
|
||||
for (final var parameter : callableFrame.parameters()) {
|
||||
if (symbolName.equals(parameter.name())) {
|
||||
return locations(parameter.span());
|
||||
}
|
||||
}
|
||||
return List.of();
|
||||
}
|
||||
|
||||
private List<PbsEditorialLocation> localLocations(
|
||||
final String symbolName,
|
||||
final int offset) {
|
||||
final CallableFrame callableFrame = callableFrameAt(offset);
|
||||
if (callableFrame == null) {
|
||||
return List.of();
|
||||
}
|
||||
return locations(bindingSpan(callableFrame.body(), symbolName, offset, null));
|
||||
}
|
||||
|
||||
private Span bindingSpan(
|
||||
final PbsAst.Block block,
|
||||
final String symbolName,
|
||||
final int offset,
|
||||
final Span current) {
|
||||
Span found = current;
|
||||
for (final var statement : block.statements()) {
|
||||
if (statement.span().getStart() >= offset) {
|
||||
break;
|
||||
}
|
||||
if (statement instanceof PbsAst.LetStatement letStatement && symbolName.equals(letStatement.name())) {
|
||||
found = letStatement.nameSpan() == null ? letStatement.span() : letStatement.nameSpan();
|
||||
}
|
||||
if (statement.span().contains(offset)) {
|
||||
if (statement instanceof PbsAst.IfStatement ifStatement) {
|
||||
if (ifStatement.thenBlock().span().contains(offset)) {
|
||||
return bindingSpan(ifStatement.thenBlock(), symbolName, offset, found);
|
||||
}
|
||||
if (ifStatement.elseBlock() != null && ifStatement.elseBlock().span().contains(offset)) {
|
||||
return bindingSpan(ifStatement.elseBlock(), symbolName, offset, found);
|
||||
}
|
||||
if (ifStatement.elseIf() != null && ifStatement.elseIf().span().contains(offset)) {
|
||||
final var nestedBlock = new PbsAst.Block(
|
||||
ReadOnlyList.wrap(List.of(ifStatement.elseIf())),
|
||||
null,
|
||||
ifStatement.elseIf().span());
|
||||
return bindingSpan(nestedBlock, symbolName, offset, found);
|
||||
}
|
||||
} else if (statement instanceof PbsAst.ForStatement forStatement) {
|
||||
Span loopFound = found;
|
||||
if (symbolName.equals(forStatement.iteratorName())) {
|
||||
loopFound = forStatement.span();
|
||||
}
|
||||
if (forStatement.body().span().contains(offset)) {
|
||||
return bindingSpan(forStatement.body(), symbolName, offset, loopFound);
|
||||
}
|
||||
} else if (statement instanceof PbsAst.WhileStatement whileStatement
|
||||
&& whileStatement.body().span().contains(offset)) {
|
||||
return bindingSpan(whileStatement.body(), symbolName, offset, found);
|
||||
}
|
||||
return found;
|
||||
}
|
||||
}
|
||||
return found;
|
||||
}
|
||||
|
||||
private List<PbsEditorialLocation> constructorLocations(final TopDeclSymbol topDeclSymbol) {
|
||||
if (topDeclSymbol == null) {
|
||||
return List.of();
|
||||
}
|
||||
if (topDeclSymbol.decl() instanceof PbsAst.StructDecl structDecl) {
|
||||
if (structDecl.ctors().isEmpty()) {
|
||||
return locations(structDecl.span());
|
||||
}
|
||||
final ArrayList<Span> ctorSpans = new ArrayList<>();
|
||||
for (final var ctor : structDecl.ctors()) {
|
||||
ctorSpans.add(ctor.span());
|
||||
}
|
||||
return locations(ctorSpans.toArray(Span[]::new));
|
||||
}
|
||||
return topDeclLocations(topDeclSymbol);
|
||||
}
|
||||
|
||||
private List<PbsEditorialLocation> topDeclLocations(final TopDeclSymbol topDeclSymbol) {
|
||||
if (topDeclSymbol == null) {
|
||||
return List.of();
|
||||
}
|
||||
return locations(topDeclSymbol.decl().span());
|
||||
}
|
||||
|
||||
private List<PbsEditorialLocation> callableLocations(final List<CallableSymbol> callables) {
|
||||
if (callables == null || callables.isEmpty()) {
|
||||
return List.of();
|
||||
}
|
||||
final ArrayList<Span> spans = new ArrayList<>();
|
||||
for (final var callable : callables) {
|
||||
spans.add(callable.span());
|
||||
}
|
||||
return locations(spans.toArray(Span[]::new));
|
||||
}
|
||||
|
||||
private Span structFieldSpan(
|
||||
final String typeName,
|
||||
final String fieldName) {
|
||||
final TopDeclSymbol typeSymbol = resolveTopDeclSymbol(typeName);
|
||||
if (typeSymbol == null) {
|
||||
return null;
|
||||
}
|
||||
if (typeSymbol.decl() instanceof PbsAst.StructDecl structDecl) {
|
||||
for (final var field : structDecl.fields()) {
|
||||
if (fieldName.equals(field.name())) {
|
||||
return field.span();
|
||||
}
|
||||
}
|
||||
}
|
||||
if (typeSymbol.decl() instanceof PbsAst.BuiltinTypeDecl builtinTypeDecl) {
|
||||
for (final var field : builtinTypeDecl.fields()) {
|
||||
if (fieldName.equals(field.name())) {
|
||||
return field.span();
|
||||
}
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
private List<PbsEditorialLocation> locations(final Span... spans) {
|
||||
final ArrayList<PbsEditorialLocation> locations = new ArrayList<>();
|
||||
if (spans == null) {
|
||||
return List.of();
|
||||
}
|
||||
for (final Span span : spans) {
|
||||
if (hasPhysicalSpan(span)) {
|
||||
locations.add(new PbsEditorialLocation(span));
|
||||
}
|
||||
}
|
||||
return List.copyOf(locations);
|
||||
}
|
||||
|
||||
private boolean hasPhysicalSpan(final Span span) {
|
||||
return span != null
|
||||
&& !span.isNone()
|
||||
&& span.getFileId() != null
|
||||
&& !span.getFileId().isNone();
|
||||
}
|
||||
|
||||
private List<PbsEditorialSignature> resolveCallableSignatures(
|
||||
final String callableName,
|
||||
final ScopeState scopeState) {
|
||||
|
||||
+81
@@ -265,6 +265,87 @@ final class PbsEditorialSupportServiceTest {
|
||||
&& candidate.detail().equals("draw_pixel(x: int, y: int, color: int) -> void")));
|
||||
}
|
||||
|
||||
@Test
|
||||
void shouldResolveDefinitionForLocalsParametersMembersAndCanonicalImports() {
|
||||
final var source = """
|
||||
import { Log as Logger } from @sdk:log;
|
||||
|
||||
fn helper(value: int) -> int {
|
||||
let total = value;
|
||||
Logger.info("hello");
|
||||
missingName;
|
||||
return total;
|
||||
}
|
||||
""";
|
||||
final var ast = parseOrdinary(source);
|
||||
final var supplementalTopDecls = supplementalTopDecls("""
|
||||
declare service Log {
|
||||
fn info(message: str) -> void {
|
||||
return;
|
||||
}
|
||||
}
|
||||
""");
|
||||
|
||||
final var parameter = requireDefinition(source, ast, supplementalTopDecls, "value;");
|
||||
assertEquals(1, parameter.size());
|
||||
assertEquals(0, parameter.getFirst().span().getFileId().getId());
|
||||
assertTrue(parameter.getFirst().span().contains(source.indexOf("value: int")));
|
||||
|
||||
final var local = requireDefinition(source, ast, supplementalTopDecls, "total;");
|
||||
assertEquals(1, local.size());
|
||||
assertEquals(0, local.getFirst().span().getFileId().getId());
|
||||
assertTrue(local.getFirst().span().contains(source.indexOf("total = value")));
|
||||
|
||||
final var function = requireDefinition(source, ast, supplementalTopDecls, "helper(value");
|
||||
assertEquals(1, function.size());
|
||||
assertEquals(0, function.getFirst().span().getFileId().getId());
|
||||
assertTrue(function.getFirst().span().getStart() <= source.indexOf("fn helper"));
|
||||
|
||||
final var imported = requireDefinition(source, ast, supplementalTopDecls, "Logger.info");
|
||||
assertEquals(1, imported.size());
|
||||
assertEquals(100, imported.getFirst().span().getFileId().getId());
|
||||
assertNotEquals(ast.span().getFileId().getId(), imported.getFirst().span().getFileId().getId());
|
||||
|
||||
final var member = requireDefinition(source, ast, supplementalTopDecls, "info(");
|
||||
assertEquals(1, member.size());
|
||||
assertEquals(100, member.getFirst().span().getFileId().getId());
|
||||
|
||||
assertTrue(service.definition(source, ast, supplementalTopDecls, source.indexOf("fn helper")).isEmpty());
|
||||
assertTrue(service.definition(source, ast, supplementalTopDecls, source.indexOf("int")).isEmpty());
|
||||
assertTrue(service.definition(source, ast, supplementalTopDecls, source.indexOf("missingName")).isEmpty());
|
||||
}
|
||||
|
||||
@Test
|
||||
void shouldReturnEveryMatchingDeclarationLocationForOverloadedMembers() {
|
||||
final var source = """
|
||||
declare struct Vec() {
|
||||
fn blend(dx: int) -> int { return dx; }
|
||||
fn blend(dx: int, dy: int) -> int { return dx; }
|
||||
}
|
||||
|
||||
fn main(vec: Vec) -> void {
|
||||
vec.blend(1, 2);
|
||||
}
|
||||
""";
|
||||
final var ast = parseOrdinary(source);
|
||||
final var locations = requireDefinition(source, ast, ReadOnlyList.empty(), "blend(1");
|
||||
assertEquals(2, locations.size());
|
||||
assertTrue(locations.getFirst().span().contains(source.indexOf("fn blend(dx: int)")));
|
||||
assertTrue(locations.get(1).span().contains(source.indexOf("fn blend(dx: int, dy: int)")));
|
||||
}
|
||||
|
||||
private List<PbsEditorialLocation> requireDefinition(
|
||||
final String source,
|
||||
final PbsAst.File ast,
|
||||
final ReadOnlyList<PbsAst.TopDecl> supplementalTopDecls,
|
||||
final String needle) {
|
||||
final int offset = source.indexOf(needle);
|
||||
assertTrue(offset >= 0, "Expected to find needle: " + needle);
|
||||
final var locations = service.definition(source, ast, supplementalTopDecls, offset);
|
||||
assertFalse(locations.isEmpty(), "Expected definition for needle: " + needle);
|
||||
return locations;
|
||||
}
|
||||
|
||||
private PbsEditorialResolvedSymbol requireHover(
|
||||
final String source,
|
||||
final PbsAst.File ast,
|
||||
|
||||
+20
@@ -0,0 +1,20 @@
|
||||
package p.studio.compiler.services;
|
||||
|
||||
import java.nio.file.Path;
|
||||
import java.util.Objects;
|
||||
|
||||
public record FrontendDefinitionLocation(
|
||||
Path path,
|
||||
int startOffset,
|
||||
int endOffset) {
|
||||
|
||||
public FrontendDefinitionLocation {
|
||||
path = Objects.requireNonNull(path, "path").toAbsolutePath().normalize();
|
||||
if (startOffset < 0) {
|
||||
throw new IllegalArgumentException("startOffset must not be negative");
|
||||
}
|
||||
if (endOffset < startOffset) {
|
||||
throw new IllegalArgumentException("endOffset must not be before startOffset");
|
||||
}
|
||||
}
|
||||
}
|
||||
+9
-1
@@ -3,5 +3,13 @@ package p.studio.compiler.services;
|
||||
public record FrontendEditorialContext(
|
||||
Object syntaxTree,
|
||||
Object supplementalDeclarations,
|
||||
Object semanticContext) {
|
||||
Object semanticContext,
|
||||
Object sourceFiles) {
|
||||
|
||||
public FrontendEditorialContext(
|
||||
final Object syntaxTree,
|
||||
final Object supplementalDeclarations,
|
||||
final Object semanticContext) {
|
||||
this(syntaxTree, supplementalDeclarations, semanticContext, null);
|
||||
}
|
||||
}
|
||||
|
||||
+13
@@ -59,4 +59,17 @@ public interface FrontendLanguageService {
|
||||
final int offset) {
|
||||
return signatureHelp(request, offset);
|
||||
}
|
||||
|
||||
default List<FrontendDefinitionLocation> definition(
|
||||
final FrontendDocumentRequest request,
|
||||
final int offset) {
|
||||
return List.of();
|
||||
}
|
||||
|
||||
default List<FrontendDefinitionLocation> definition(
|
||||
final FrontendDocumentRequest request,
|
||||
final FrontendEditorialContext editorialContext,
|
||||
final int offset) {
|
||||
return definition(request, offset);
|
||||
}
|
||||
}
|
||||
|
||||
+14
@@ -22,6 +22,20 @@ class FrontendLanguageServiceTest {
|
||||
assertTrue(service.completion(request, 0).isEmpty());
|
||||
assertTrue(service.hover(request, 0).isEmpty());
|
||||
assertEquals(FrontendSignatureHelp.empty(), service.signatureHelp(request, 0));
|
||||
assertTrue(service.definition(request, 0).isEmpty());
|
||||
}
|
||||
|
||||
@Test
|
||||
void definitionLocationRejectsBlankPathAndInvertedOffsets() {
|
||||
final Path path = Path.of("src/main.pbs").toAbsolutePath();
|
||||
final var location = new FrontendDefinitionLocation(path, 4, 9);
|
||||
assertEquals(path.normalize(), location.path());
|
||||
assertEquals(4, location.startOffset());
|
||||
assertEquals(9, location.endOffset());
|
||||
|
||||
assertThrows(NullPointerException.class, () -> new FrontendDefinitionLocation(null, 0, 1));
|
||||
assertThrows(IllegalArgumentException.class, () -> new FrontendDefinitionLocation(path, -1, 0));
|
||||
assertThrows(IllegalArgumentException.class, () -> new FrontendDefinitionLocation(path, 5, 4));
|
||||
}
|
||||
|
||||
@Test
|
||||
|
||||
Reference in New Issue
Block a user