Skip to content

Start type checker when file fact is created. #683

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Start type checker when file fact is created. #683

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
82bf894
Start type checker when file fact is created.
toinehartman Jul 21, 2025
de57ba9
Remove unused constructor param.
toinehartman Jul 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 14 additions & 12 deletions rascal-lsp/src/main/java/org/rascalmpl/vscode/lsp/rascal/model/FileFacts.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@
package org.rascalmpl.vscode.lsp.rascal.model;

import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.Executor;
import java.util.stream.Collectors;

import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
Expand All @@ -51,6 +51,7 @@
import org.rascalmpl.vscode.lsp.util.locations.ColumnMaps;
import org.rascalmpl.vscode.lsp.util.locations.Locations;

import io.usethesource.vallang.ISet;
import io.usethesource.vallang.ISourceLocation;

public class FileFacts {
Expand Down Expand Up @@ -91,7 +92,7 @@ private FileFact getFile(ISourceLocation l) {
if (resolved == null) {
resolved = l;
}
return files.computeIfAbsent(resolved, l1 -> new FileFact(l1, exec));
return files.computeIfAbsent(resolved, l1 -> new FileFact(l1));
}

public PathConfig getPathConfig(ISourceLocation file) {
Expand All @@ -105,9 +106,9 @@ private class FileFact {
private volatile List<Diagnostic> typeCheckerMessages = Collections.emptyList();
private final ReplaceableFuture<Map<ISourceLocation, List<Diagnostic>>> typeCheckResults;

public FileFact(ISourceLocation file, Executor exec) {
public FileFact(ISourceLocation file) {
this.file = file;
this.typeCheckResults = new ReplaceableFuture<>(CompletableFuture.completedFuture(Collections.emptyMap()));
this.typeCheckResults = new ReplaceableFuture<>(typeCheck());
this.summary = new LazyUpdateableReference<>(
new InterruptibleFuture<>(CompletableFuture.completedFuture(new SummaryBridge()), () -> {
}),
Expand Down Expand Up @@ -150,14 +151,15 @@ private void sendDiagnostics() {
public void invalidate() {
summary.invalidate();
typeCheckerMessages.clear();
this.typeCheckResults.replace(
rascal.compileFile(file, confs.lookupConfig(file), exec)
.thenApply(m -> {
Map<ISourceLocation, List<Diagnostic>> result = new HashMap<>(m.size());
m.forEach((l, msgs) -> result.put(l, Diagnostics.translateDiagnostics(l, msgs, cm)));
return result;
})
).thenAccept(m -> m.forEach((f, msgs) -> getFile(f).reportTypeCheckerErrors(msgs)));
this.typeCheckResults.replace(typeCheck()).thenAccept(m -> m.forEach((f, msgs) -> getFile(f).reportTypeCheckerErrors(msgs)));
}

private InterruptibleFuture<Map<ISourceLocation, List<Diagnostic>>> typeCheck() {
return rascal.compileFile(file, confs.lookupConfig(file), exec)
.thenApply(m -> m.entrySet().stream().collect(Collectors.toMap(
Map.Entry<ISourceLocation, ISet>::getKey,
e -> Diagnostics.translateDiagnostics(e.getKey(), e.getValue(), cm)
)));
}

}
Expand Down
Loading