Merge pull request #532 from usethesource/chore/new-faster-rascal-core

Using new rascal-core with fast typechecking and quickfixes
usethesource · Nov 27, 2024 · 24d418b · 24d418b
2 parents 0a8f478 + cbb5e70
commit 24d418b
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/rascal-lsp/pom.xml b/rascal-lsp/pom.xml
@@ -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>

diff --git a/rascal-lsp/src/main/rascal/lang/rascal/lsp/refactor/Rename.rsc b/rascal-lsp/src/main/rascal/lang/rascal/lsp/refactor/Rename.rsc
@@ -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);

diff --git a/rascal-lsp/src/main/rascal/lang/rascal/lsp/refactor/Util.rsc b/rascal-lsp/src/main/rascal/lang/rascal/lsp/refactor/Util.rsc
@@ -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) =

diff --git a/rascal-lsp/src/main/rascal/lang/rascal/tests/rename/TestUtils.rsc b/rascal-lsp/src/main/rascal/lang/rascal/tests/rename/TestUtils.rsc
@@ -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));
 }