Merge pull request #1020 from usethesource/fix/various-type-errors

Fix various type errors

Author: toinehartman

rascal-lsp/src/main/rascal/lsp/lang/rascal/lsp/Templates.rsc

@@ -34,7 +34,7 @@ import util::PathConfig;
 import util::Reflective;
 import analysis::diff::edits::AnnotatedTextEdits;
 
-import analysis::diff::edits::TextEdits;
+import analysis::diff::edits::AnnotatedTextEdits;
 
 import lang::rascal::\syntax::Rascal;
 

rascal-lsp/src/main/rascal/lsp/lang/rascal/lsp/refactor/Rename.rsc

@@ -69,7 +69,7 @@ import util::FileSystem;
 import util::Maybe;
 import util::Reflective;
 
-import analysis::diff::edits::TextEdits;
+import analysis::diff::edits::AnnotatedTextEdits;
 
 private bool isQualifiedUse(loc use, Define _:<_, str id, _, _, _, _>) = size(id) != use.length;
 

rascal-lsp/src/main/rascal/lsp/lang/rascal/lsp/refactor/rename/Fields.rsc

@@ -42,7 +42,7 @@ import lang::rascal::\syntax::Rascal;
 
 import analysis::typepal::Collector;
 import analysis::typepal::TModel;
-import analysis::diff::edits::TextEdits;
+import analysis::diff::edits::AnnotatedTextEdits;
 
 import Map;
 import util::Maybe;

rascal-lsp/src/main/rascal/lsp/lang/rascal/lsp/refactor/rename/Modules.rsc

@@ -31,7 +31,7 @@ extend analysis::typepal::refactor::Rename;
 import lang::rascal::\syntax::Rascal;
 
 import analysis::typepal::TModel;
-import analysis::diff::edits::TextEdits;
+import analysis::diff::edits::AnnotatedTextEdits;
 import lang::rascal::lsp::refactor::Rename;
 import lang::rascal::lsp::refactor::rename::Common;
 

rascal-lsp/src/main/rascal/lsp/lang/rascal/tests/rename/Benchmark.rsc

@@ -45,7 +45,7 @@ public loc typepalLib = |mvn://org.rascalmpl--typepal--0.15.1-SNAPSHOT/|;
 
 void() run(loc proj, str file, str oldName, str newName = "<oldName>2", int occurrence = 0, list[str] srcDirs = ["src/main/rascal"], list[loc] libs = []) = void() {
     println("Renaming \'<oldName>\' to \'<newName>\' in <proj + file>");
-    <edits, msgs> = testProjectOnDisk(proj, file, oldName, newName = newName, occurrence = occurrence, srcDirs = srcDirs, libs = libs);
+    <edits, msgs> = renameOnDisk(proj, file, oldName, newName = newName, occurrence = occurrence, srcDirs = srcDirs, libs = libs);
     if (errors:{_, *_} := {msg | msg <- msgs, msg is error}) throw errors;
     if (size({r | /r:replace(_, _) := edits}) < 2) throw "Unexpected number of edits: <edits>";
 };

rascal-lsp/src/main/rascal/lsp/lang/rascal/tests/rename/ProjectOnDisk.rsc

@@ -51,7 +51,7 @@ Edits renameOnDisk(loc projectDir, str file, str oldName, int occurrence = 0, st
         pcfg = pathConfig(
             srcs = [projectDir + dir | dir <- srcDirs],
             bin = projectDir + "target/classes",
-            libs = [calculateRascalLib(), *libs]
+            libs = [*calculateRascalLibs(), *libs]
         );
     }
     // extension for Rascal compiler