Start type checker when file fact is created.

Author: toinehartman

rascal-lsp/src/main/java/org/rascalmpl/vscode/lsp/rascal/model/FileFacts.java

@@ -28,12 +28,13 @@
 
 import java.io.IOException;
 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;
 import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
@@ -51,6 +52,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 {
@@ -107,7 +109,7 @@ private class FileFact {
 
         public FileFact(ISourceLocation file, Executor exec) {
             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()), () -> {
                 }),
@@ -150,14 +152,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)
+                )));
         }
 
     }