Finished dealing with non-defined contributions

usethesource · Oct 13, 2021 · 98a56e3 · 98a56e3
1 parent 6c87285
commit 98a56e3
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/...p/src/main/java/org/rascalmpl/vscode/lsp/parametric/InterpretedLanguageContributions.java b/...p/src/main/java/org/rascalmpl/vscode/lsp/parametric/InterpretedLanguageContributions.java
@@ -171,9 +171,15 @@ public InterruptibleFuture<Void> executeCommand(String command) {
             }), () -> {});
     }
 
-    private <T> InterruptibleFuture<T> execFunction(String name, CompletableFuture<IFunction> target, T defaultResult, IValue... args) {
+    private <T> InterruptibleFuture<T> execFunction(String name, CompletableFuture<@Nullable IFunction> target, T defaultResult, IValue... args) {
         return InterruptibleFuture.flatten(
-            target.thenApply(s -> EvaluatorUtil.runEvaluator(name, eval,e -> s.call(args), defaultResult, exec))
+            target.thenApply(s -> {
+                if (s == null) {
+                    logger.trace("Not running {} since it's not defined for: {}", name, this.name);
+                    return InterruptibleFuture.completedFuture(defaultResult);
+                }
+                return EvaluatorUtil.runEvaluator(name, eval,e -> s.call(args), defaultResult, exec);
+            })
         , exec);
     }
 }
diff --git a/rascal-lsp/src/main/java/org/rascalmpl/vscode/lsp/util/concurrent/InterruptibleFuture.java b/rascal-lsp/src/main/java/org/rascalmpl/vscode/lsp/util/concurrent/InterruptibleFuture.java
@@ -59,6 +59,10 @@ public InterruptibleFuture<Void> thenAccept(Consumer<T> func) {
         return new InterruptibleFuture<>(future.thenAccept(func), interrupt);
     }
 
+    public static <T> InterruptibleFuture<T> completedFuture(T result) {
+        return new InterruptibleFuture<>(CompletableFuture.completedFuture(result), () -> {});
+    }
+
     /**
      * Turn an completable future with a interruptible future inside into a
      * normal interruptible future by inlining them