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

Using new rascal-core with fast typechecking and quickfixes #532

Merged
merged 4 commits into from
Nov 27, 2024
Merged

Using new rascal-core with fast typechecking and quickfixes #532

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
211849f
Using new rascal-core with fast typechecking and quickfixes
DavyLandman Nov 27, 2024
4faa86a
Remove use of compiler parameter (core API change)
toinehartman Nov 27, 2024
af04c3b
Change type of module messages (core API change)
toinehartman Nov 27, 2024
cbb5e70
Merge branch 'main' into chore/new-faster-rascal-core
toinehartman Nov 27, 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
4 changes: 2 additions & 2 deletions rascal-lsp/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,12 +70,12 @@
<dependency>
<groupId>org.rascalmpl</groupId>
<artifactId>rascal-core</artifactId>
<version>0.12.12</version>
<version>0.12.13-RC1</version>
</dependency>
<dependency>
<groupId>org.rascalmpl</groupId>
<artifactId>typepal</artifactId>
<version>0.14.8</version>
<version>0.15.0-RC1</version>
</dependency>
<!-- Rascal tests require JUnit 4 -->
<dependency>
Expand Down
3 changes: 1 addition & 2 deletions rascal-lsp/src/main/rascal/lang/rascal/lsp/refactor/Rename.rsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -554,8 +554,7 @@ Edits rascalRenameSymbol(Tree cursorT, set[loc] workspaceFolders, str newName, P

for (projectFolder <- projectFiles.projectFolder, \files := projectFiles[projectFolder]) {
PathConfig pcfg = getPathConfig(projectFolder);
RascalCompilerConfig ccfg = rascalCompilerConfig(pcfg)[forceCompilationTopModule = true]
[verbose = false]
RascalCompilerConfig ccfg = rascalCompilerConfig(pcfg)[verbose = false]
[logPathConfig = false];
for (<file, true> <- \files) {
ms = rascalTModelForLocs([file], ccfg, dummy_compile1);
Expand Down
4 changes: 2 additions & 2 deletions rascal-lsp/src/main/rascal/lang/rascal/lsp/refactor/Util.rsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,10 +100,10 @@ str toString(error(msg)) = "[error] \'<msg>\'";
str toString(warning(msg, l)) = "[warning] \'<msg>\' at <l>";
str toString(info(msg, l)) = "[info] \'<msg>\' at <l>";

str toString(list[Message] msgs, int indent = 1) =
str toString(set[Message] msgs, int indent = 1) =
intercalate("\n", ([] | it + "<for (_ <- [0..indent]) {> <}>- <toString(msg)>" | msg <- msgs));

str toString(map[str, list[Message]] moduleMsgs) =
str toString(map[str, set[Message]] moduleMsgs) =
intercalate("\n", ([] | it + "Messages for <m>:\n<toString(moduleMsgs[m])>" | m <- moduleMsgs));

rel[&K, &V] groupBy(set[&V] s, &K(&V) pred) =
Expand Down
2 changes: 1 addition & 1 deletion rascal-lsp/src/main/rascal/lang/rascal/tests/rename/TestUtils.rsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ private void verifyTypeCorrectRenaming(loc root, Edits edits, PathConfig pcfg) {
assert size(editLocs) == size(toSet(editLocs)) : "Duplicate locations in suggested edits - VS Code cannot handle this";
executeDocumentEdits(sortEdits(edits<0>));
remove(pcfg.resources);
RascalCompilerConfig ccfg = rascalCompilerConfig(pcfg)[forceCompilationTopModule = true][verbose = false][logPathConfig = false];
RascalCompilerConfig ccfg = rascalCompilerConfig(pcfg)[verbose = false][logPathConfig = false];
throwAnyErrors(checkAll(root, ccfg));
}

Expand Down
Loading