Improve handling of ignored modules.

toinehartman · toinehartman · commit 80fac65148d5 · 2025-04-23T09:44:07.000+02:00
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
@@ -257,7 +257,14 @@ TModel tmodelForTree(Tree t, PathConfig(loc) getPathConfig) {
     ms = rascalTModelForNames([mname], ccfg, dummy_compile1);
 
     <found, tm, ms> = getTModelForModule(mname, ms);
-    if (!found) throw ms.messages;
+    if (!found) {
+        if (ms.status[mname]?) {
+            // If a module is annotated with `@ignoreCompiler`, silently skip it
+            if (ignored() in ms.status[mname]) return tmodel();
+            throw "No TModel for module \'<mname>\' - status <ms.status[mname]>";
+        }
+        throw "No TModel for module \'<mname>\' - unknown status.";
+    }
     return augmentTModel(t, tm, TModel(loc f) {
         // Prevent endless recursion
         if (f == l) return tm;
diff --git a/rascal-lsp/src/main/rascal/lang/rascal/tests/rename/Performance.rsc b/rascal-lsp/src/main/rascal/lang/rascal/tests/rename/Performance.rsc
@@ -77,3 +77,10 @@ test bool incrementalTypeCheck() {
     remove(procLoc);
     return res;
 }
+
+test bool ignoredModule() = testRenameOccurrences({
+    byText("Ignored", "
+        'import Main;
+        'int quz() = foo();", {}, annotations = "@ignoreCompiler{For test purposes.}"),
+    byText("Main", "int foo() = 8;", {0})
+});
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
@@ -56,7 +56,7 @@ import util::Util;
 
 
 //// Fixtures and utility functions
-data TestModule = byText(str name, str body, set[int] nameOccs, str newName = name, set[int] skipCursors = {})
+data TestModule = byText(str name, str body, set[int] nameOccs, str newName = name, set[int] skipCursors = {}, str annotations = "")
                 | byLoc(str name, loc file, set[int] nameOccs, str newName = name, set[int] skipCursors = {});
 
 data RenameException
@@ -131,7 +131,7 @@ bool testRenameOccurrences(set[TestModule] modules, str oldName = "foo", str new
         }
 
         pcfg = getTestPathConfig(testDir);
-        modulesByLocation = {mByLoc | m <- modules, mByLoc := (m is byLoc ? m : byLoc(m.name, storeTestModule(testDir, m.name, m.body), m.nameOccs, newName = m.newName, skipCursors = m.skipCursors))};
+        modulesByLocation = {mByLoc | m <- modules, mByLoc := (m is byLoc ? m : byLoc(m.name, storeTestModule(testDir, m.name, m.body, annotations = m.annotations), m.nameOccs, newName = m.newName, skipCursors = m.skipCursors))};
 
         for (m <- modulesByLocation) {
             try {
@@ -384,9 +384,9 @@ private tuple[loc, list[Tree]] findCursor(loc f, str id, int occ) {
     return <cl, computeFocusList(m, cl.begin.line, cl.begin.column + 1)>;
 }
 
-private loc storeTestModule(loc dir, str name, str body) {
+private loc storeTestModule(loc dir, str name, str body, str annotations = "") {
     str moduleStr = "
-    'module <name>
+    '<annotations> module <name>
     '<body>
     ";
 
