Skip to content
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

Jump to bottom

Updating to latest rascal-core version #463

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Updating to latest rascal-core version #463

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c94c742
Updating to latest rascal-core version
DavyLandman Oct 2, 2024
80529f4
Merge remote-tracking branch 'origin/main' into chore/update-to-lates…
DavyLandman Oct 3, 2024
bcbd0f9
Using latest rascal-core release
DavyLandman Oct 3, 2024
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
8 changes: 4 additions & 4 deletions rascal-lsp/pom.xml
View file
Open in desktop
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.6-RC1</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
5 changes: 4 additions & 1 deletion rascal-lsp/src/main/java/org/rascalmpl/vscode/lsp/rascal/RascalLanguageServices.java
View file
Open in desktop
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
Loading