Do not throw an exception on ignored modules.

Author: toinehartman

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

@@ -247,7 +247,13 @@ public Edits rascalRenameSymbol(loc cursorLoc, list[Tree] cursor, str newName, s
         if (!found) {
             if (ms.status[mname]?) {
                 // If a module is annotated with `@ignoreCompiler`, silently skip it
-                if (MStatus::ignored() in ms.status[mname]) return tmodel();
+                if (MStatus::ignored() in ms.status[mname]) {
+                    // We just need a way to map the TModel back to the module location, so let's artificially add that
+                    return tmodel()
+                        [modelName = mname]
+                        [moduleLocs = (mname: l)]
+                        ;
+                }
                 throw "No TModel for module \'<mname>\'";
             }
             throw "No TModel for module \'<mname>\'";
@@ -402,7 +408,7 @@ private loc nameSuffix(loc l, set[Define] defs, Renamer r) {
 
 void renameUses(set[Define] defs, str newName, TModel tm, Renamer r) {
     escName = normalizeEscaping(newName);
-    tm = getConditionallyAugmentedTModel(getModuleScopes(tm)[tm.modelName].top, defs, {augmentUses()}, r);
+    tm = getConditionallyAugmentedTModel(getModuleFile(tm), defs, {augmentUses()}, r);
 
     definitions = {<d.defined, d> | d <- defs};
     useDefs = toMap(tm.useDef o definitions);

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

@@ -66,7 +66,7 @@ bool isContainedInScope(loc l, loc scope, TModel tm) {
     return any(loc fromScope <- reachableFrom, isContainedIn(l, fromScope));
 }
 
-loc getModuleFile(TModel tm) = getModuleScopes(tm)[tm.modelName].top;
+loc getModuleFile(TModel tm) = tm.moduleLocs[tm.modelName] when tm.moduleLocs[tm.modelName]?;
 
 private set[str] reservedNames = getRascalReservedIdentifiers();
 

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

@@ -67,7 +67,7 @@ set[Define] findAdditionalConstructorDefinitions(set[Define] cursorDefs, Tree tr
         return {};
     }
 
-    loc localScope = getModuleScopes(tm)[tm.modelName];
+    loc localScope = getModuleFile(tm);
     if (!any(Define d <- cursorDefs, isContainedInScope(d.defined, localScope, tm) || isContainedInScope(localScope, d.scope, tm))) {
         return {};
     }

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

@@ -167,8 +167,7 @@ bool isUnsupportedCursor(list[Tree] _: [*_, Name n1, *_, (Expression) `<Expressi
 void renameAdditionalUses(set[Define] fieldDefs, str newName, TModel tm, Renamer r) {
     if (any(role <- fieldDefs.idRole, !isFieldRole(role)) || {} := fieldDefs) fail renameAdditionalUses;
 
-    loc mloc = getModuleScopes(tm)[tm.modelName].top;
-    Tree tr = r.getConfig().parseLoc(mloc);
+    Tree tr = r.getConfig().parseLoc(getModuleFile(tm));
     visit (tr) {
         case (Expression) `<Expression e> has <Name n>`: {
             eFieldDefs = getFieldDefinitions(e, "<n>", tm, r.getConfig().tmodelForLoc);

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

@@ -51,7 +51,7 @@ tuple[set[loc], set[loc], set[loc]] findOccurrenceFilesUnchecked(set[Define] _:{
 TModel augmentFormalUses(Tree tr, TModel tm, TModel(loc) getModel) {
     rel[loc funcDef, str kwName, loc kwLoc] keywordFormalDefs = {
         *(fileTm.defines<idRole, scope, id, defined>)[keywordFormalId()]
-        | loc f <- getModuleFile(tm) + (tm.paths<to>)
+        | loc f <- tr.src + (tm.paths<to>)
         , fileTm := getModel(f.top)
     };
     visit (tr) {