Skip to content

Commit

Permalink
Updating to latest rascal-core version
Browse files Browse the repository at this point in the history
  • Loading branch information
DavyLandman committed Oct 2, 2024
1 parent 5bb493c commit c94c742
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 5 deletions.
8 changes: 4 additions & 4 deletions rascal-lsp/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -65,17 +65,17 @@
<dependency>
<groupId>org.rascalmpl</groupId>
<artifactId>rascal</artifactId>
<version>0.40.7</version>
<version>0.40.8</version>
</dependency>
<dependency>
<groupId>org.rascalmpl</groupId>
<artifactId>rascal-core</artifactId>
<version>0.12.4</version>
<version>0.12.5</version>
</dependency>
<dependency>
<groupId>org.rascalmpl</groupId>
<artifactId>typepal</artifactId>
<version>0.14.0</version>
<version>0.14.1</version>
</dependency>
<!-- Rascal tests require JUnit 4 -->
<dependency>
Expand Down Expand Up @@ -164,7 +164,7 @@
<plugin>
<groupId>org.rascalmpl</groupId>
<artifactId>rascal-maven-plugin</artifactId>
<version>0.28.1</version>
<version>0.28.2</version>
<configuration>
<errorsAsWarnings>false</errorsAsWarnings>
<bin>${project.build.outputDirectory}</bin>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@

import static org.rascalmpl.vscode.lsp.util.EvaluatorUtil.makeFutureEvaluator;
import static org.rascalmpl.vscode.lsp.util.EvaluatorUtil.runEvaluator;

import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
Expand All @@ -40,6 +41,7 @@
import java.util.concurrent.ExecutorService;
import java.util.function.Function;
import java.util.stream.Collectors;

import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.checkerframework.checker.nullness.qual.Nullable;
Expand All @@ -60,6 +62,7 @@
import org.rascalmpl.vscode.lsp.util.RascalServices;
import org.rascalmpl.vscode.lsp.util.concurrent.InterruptibleFuture;
import org.rascalmpl.vscode.lsp.util.locations.ColumnMaps;

import io.usethesource.vallang.IConstructor;
import io.usethesource.vallang.IList;
import io.usethesource.vallang.ISet;
Expand Down Expand Up @@ -155,7 +158,7 @@ public InterruptibleFuture<Map<ISourceLocation, ISet>> compileFileList(IList fil
logger.debug("Running rascal check for: {} with: {}", files, pcfg);
return runEvaluator("Rascal check", compilerEvaluator,
e -> {
var config = e.call("getRascalCoreCompilerConfig", addResources(pcfg));
var config = e.call("rascalCompilerConfig", addResources(pcfg));
return translateCheckResults((IList) e.call("check", files, config));
},
buildEmptyResult(files), exec, false, client);
Expand Down

0 comments on commit c94c742

Please sign in to comment.