implements PLN-0137 (5/7) semantic-token-overlay
Keep the lexical token provider as the baseline. When hover resolution names a symbol and an existing semantic key matches it, replace the weaker identifier token. A failed resolution, a broken file, or a symbol without an existing key keeps the provider token. No new semantic key is added.
This commit is contained in:
+22
-1
@@ -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.exceptions.BuildException;
|
||||
import p.studio.compiler.messages.*;
|
||||
import p.studio.compiler.models.*;
|
||||
import p.studio.compiler.services.FrontendCodeAction;
|
||||
@@ -628,7 +629,7 @@ public final class CompilerLanguageServiceBridge implements LanguageServiceBridg
|
||||
documentPath,
|
||||
effectiveText);
|
||||
final List<FrontendSemanticToken> tokens = provider.languageService()
|
||||
.map(languageService -> languageService.semanticTokens(request))
|
||||
.map(languageService -> semanticTokens(languageService, context, documentUri, documentPath, request))
|
||||
.orElseGet(List::of);
|
||||
final var positionMapper = new DocumentPositionMapper(effectiveText);
|
||||
final var semanticTokens = new ArrayList<BaselineSemanticToken>();
|
||||
@@ -647,6 +648,26 @@ public final class CompilerLanguageServiceBridge implements LanguageServiceBridg
|
||||
return new BaselineSemanticTokens(presentation.semanticKeys(), semanticTokens);
|
||||
}
|
||||
|
||||
private List<FrontendSemanticToken> semanticTokens(
|
||||
final FrontendLanguageService languageService,
|
||||
final LspProjectContext context,
|
||||
final String documentUri,
|
||||
final Path documentPath,
|
||||
final FrontendDocumentRequest request) {
|
||||
try {
|
||||
return editorialDocument(context, documentUri, request.documentText())
|
||||
.map(document -> languageService.semanticTokens(
|
||||
new FrontendDocumentRequest(
|
||||
context.projectRoot(),
|
||||
documentPath,
|
||||
document.text()),
|
||||
document.editorialContext()))
|
||||
.orElseGet(() -> languageService.semanticTokens(request));
|
||||
} catch (final BuildException ignored) {
|
||||
return languageService.semanticTokens(request);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public String onSave(
|
||||
final LspProjectContext context,
|
||||
|
||||
+50
@@ -172,6 +172,56 @@ class CompilerLanguageServiceBridgeTest {
|
||||
assertTrue(semanticTokens.tokens().stream().anyMatch(token -> token.semanticKey().equals("pbs-builtin-type")));
|
||||
}
|
||||
|
||||
@Test
|
||||
void semanticTokenOverlayReplacesAResolvedUseAndKeepsBrokenText(@TempDir final Path tempDir) throws IOException {
|
||||
final Path projectRoot = tempDir.resolve("app");
|
||||
final Path source = projectRoot.resolve("src").resolve("main.pbs");
|
||||
Files.createDirectories(source.getParent());
|
||||
Files.writeString(projectRoot.resolve("prometeu.json"), """
|
||||
{
|
||||
"name": "app",
|
||||
"version": "1.0.0",
|
||||
"language": "pbs",
|
||||
"stdlib": "1",
|
||||
"target": "Game",
|
||||
"dependencies": []
|
||||
}
|
||||
""");
|
||||
final String text = """
|
||||
fn helper() -> int {
|
||||
return 1;
|
||||
}
|
||||
|
||||
fn main() -> int {
|
||||
return helper;
|
||||
}
|
||||
""";
|
||||
Files.writeString(source, text);
|
||||
Files.writeString(source.getParent().resolve("mod.barrel"), """
|
||||
pub fn helper() -> int;
|
||||
pub fn main() -> int;
|
||||
""");
|
||||
final CompilerLanguageServiceBridge bridge = new CompilerLanguageServiceBridge();
|
||||
final Path realSource = source.toRealPath();
|
||||
final var tokens = bridge.semanticTokens(
|
||||
new LspProjectContext("app", "pbs", projectRoot.toRealPath()),
|
||||
realSource.toUri().toString(),
|
||||
text);
|
||||
final int helperUse = text.indexOf("return helper") + "return ".length();
|
||||
assertTrue(tokens.tokens().stream().anyMatch(token ->
|
||||
token.semanticKey().equals("pbs-function")
|
||||
&& token.line() == new DocumentPositionMapper(text).positionOf(helperUse).line()
|
||||
&& token.startCharacter() == new DocumentPositionMapper(text).positionOf(helperUse).character()));
|
||||
|
||||
final String broken = "fn main( {";
|
||||
final var brokenTokens = bridge.semanticTokens(
|
||||
new LspProjectContext("app", "pbs", projectRoot.toRealPath()),
|
||||
realSource.toUri().toString(),
|
||||
broken);
|
||||
assertTrue(brokenTokens.tokens().stream().anyMatch(token -> token.semanticKey().equals("pbs-keyword")));
|
||||
assertTrue(brokenTokens.tokens().stream().anyMatch(token -> token.semanticKey().equals("pbs-punctuation")));
|
||||
}
|
||||
|
||||
@Test
|
||||
void completionHoverAndSignatureHelpUseCompilerBackedEditorialResolution() {
|
||||
final Path projectRoot = findRepoRoot(Path.of("").toAbsolutePath().normalize())
|
||||
|
||||
Reference in New Issue
Block a user