Extract monitor from otherwise unused LSPIDEServices

Author: toinehartman

rascal-lsp/src/main/java/org/rascalmpl/vscode/lsp/parametric/InterpretedLanguageContributions.java

@@ -53,7 +53,6 @@
 import org.rascalmpl.vscode.lsp.parametric.model.RascalADTs.LanguageContributions;
 import org.rascalmpl.vscode.lsp.rascal.conversion.KeywordParameter;
 import org.rascalmpl.vscode.lsp.util.EvaluatorUtil;
-import org.rascalmpl.vscode.lsp.util.EvaluatorUtil.LSPContext;
 import org.rascalmpl.vscode.lsp.util.concurrent.InterruptibleFuture;
 
 import io.usethesource.vallang.IBool;
@@ -140,8 +139,7 @@ public InterpretedLanguageContributions(LanguageParameter lang, IBaseTextDocumen
 
             monitor = new RascalLSPMonitor(client, LogManager.getLogger(logger.getName() + "[" + lang.getName() + "]"), lang.getName() + ": ");
 
-            this.eval = EvaluatorUtil.makeFutureEvaluator(new LSPContext(exec, docService, workspaceService, client),
-                "evaluator for " + lang.getName(), monitor, pcfg, lang.getMainModule());
+            this.eval = EvaluatorUtil.makeFutureEvaluator("evaluator for " + lang.getName(), monitor, pcfg, exec, lang.getMainModule());
             var contributions = EvaluatorUtil.runEvaluator(name + ": loading contributions", eval,
                 e -> loadContributions(e, lang),
                 ValueFactoryFactory.getValueFactory().set(),

rascal-lsp/src/main/java/org/rascalmpl/vscode/lsp/rascal/RascalLanguageServices.java

@@ -67,7 +67,6 @@
 import org.rascalmpl.vscode.lsp.IBaseLanguageClient;
 import org.rascalmpl.vscode.lsp.RascalLSPMonitor;
 import org.rascalmpl.vscode.lsp.util.EvaluatorUtil;
-import org.rascalmpl.vscode.lsp.util.EvaluatorUtil.LSPContext;
 import org.rascalmpl.vscode.lsp.util.RascalServices;
 import org.rascalmpl.vscode.lsp.util.concurrent.InterruptibleFuture;
 import org.rascalmpl.vscode.lsp.util.locations.Locations;
@@ -120,11 +119,9 @@ public RascalLanguageServices(RascalTextDocumentService docService, BaseWorkspac
         var pcfg = EvaluatorUtil.addLSPSources(new PathConfig(URIUtil.rootLocation("cwd")), true);
         var compilerPcfg = EvaluatorUtil.addRascalCompilerSources(pcfg);
 
-        var context = new LSPContext(exec, docService, workspaceService, client);
-
-        shortRunningTaskEvaluator = makeFutureEvaluator(context, "Rascal tasks", monitor, pcfg,  "lang::rascal::lsp::DocumentSymbols", "lang::rascal::lsp::Templates");
-        semanticEvaluator = makeFutureEvaluator(context, "Rascal semantics", monitor, compilerPcfg, "lang::rascalcore::check::Summary", "lang::rascal::lsp::refactor::Rename", "lang::rascal::lsp::Actions");
-        compilerEvaluator = makeFutureEvaluator(context, "Rascal compiler", monitor, compilerPcfg, "lang::rascal::lsp::IDECheckerWrapper");
+        shortRunningTaskEvaluator = makeFutureEvaluator("Rascal tasks", monitor, pcfg, exec, "lang::rascal::lsp::DocumentSymbols", "lang::rascal::lsp::Templates");
+        semanticEvaluator = makeFutureEvaluator("Rascal semantics", monitor, compilerPcfg, exec, "lang::rascalcore::check::Summary", "lang::rascal::lsp::refactor::Rename", "lang::rascal::lsp::Actions");
+        compilerEvaluator = makeFutureEvaluator("Rascal compiler", monitor, compilerPcfg, exec, "lang::rascal::lsp::IDECheckerWrapper");
         actionStore = semanticEvaluator.thenApply(e -> ((ModuleEnvironment) e.getModule("lang::rascal::lsp::Actions")).getStore());
         rascalTextDocumentService = docService;
         this.workspaceService = workspaceService;

rascal-lsp/src/main/java/org/rascalmpl/vscode/lsp/util/EvaluatorUtil.java

@@ -356,52 +356,36 @@ public static PathConfig addRascalCompilerSources(PathConfig pcfg) {
         }
     }
 
-    public static class LSPContext {
-        private final ExecutorService exec;
-        private final IBaseTextDocumentService docService;
-        private final BaseWorkspaceService workspaceService;
-        private final IBaseLanguageClient client;
-
-        public LSPContext(ExecutorService exec, IBaseTextDocumentService docService,
-            BaseWorkspaceService workspaceService, IBaseLanguageClient client) {
-            this.exec = exec;
-            this.docService = docService;
-            this.workspaceService = workspaceService;
-            this.client = client;
-        }
-    }
-
     /**
      * This function is used to construct evaluators used by LSP servers, not the terminal REPL
      */
-    public static CompletableFuture<Evaluator> makeFutureEvaluator(LSPContext context, String label, IRascalMonitor monitor, PathConfig pcfg, final String... imports) {
+    public static CompletableFuture<Evaluator> makeFutureEvaluator(String label, IRascalMonitor monitor, PathConfig pcfg, ExecutorService exec, final String... imports) {
         return CompletableFuture.supplyAsync(() -> {
             Logger customLog = LogManager.getLogger("Evaluator: " + label);
-            IDEServices services = new LSPIDEServices(context.client, context.docService, context.workspaceService, monitor);
             boolean jobSuccess = false;
             String jobName = "Loading " + label;
             try {
-                services.jobStart(jobName, imports.length);
+                monitor.jobStart(jobName, imports.length);
                 var eval = ShellEvaluatorFactory.getDefaultEvaluatorForPathConfig(
                     pcfg.getProjectRoot(),
                     pcfg,
                     Reader.nullReader(),
                     logWriter(customLog, Level.INFO),
                     logWriter(customLog, Level.ERROR),
-                    services
+                    monitor
                 );
 
                 eval.addClassLoader(RascalLanguageServer.class.getClassLoader());
 
-                eval.doImport(services, imports);
+                eval.doImport(monitor, imports);
 
                 jobSuccess = true;
                 return eval;
             }
             finally {
-                services.jobEnd(jobName, jobSuccess);
+                monitor.jobEnd(jobName, jobSuccess);
             }
-        }, context.exec);
+        }, exec);
     }
 
     private static PrintWriter logWriter(Logger customLog, Level level) {