Merge branch 'main' into fix/better-change-detection-for-extend

Author: PaulKlint

src/org/rascalmpl/interpreter/env/GlobalEnvironment.java

@@ -324,4 +324,11 @@ public List<String> nonInitializedModules() {
 	public void clearLookupChaches() {
 		moduleEnvironment.values().forEach(ModuleEnvironment::clearLookupCaches);
 	}
+
+	/**
+	 * This is for the tutor and eval; sometimes we do not want to keep seeing old messages
+	 */
+	public void clearModuleLoadMessage() {
+		moduleEnvironment.values().forEach(ModuleEnvironment::clearLoadMessages);
+	}
 }

src/org/rascalmpl/interpreter/env/ModuleEnvironment.java

@@ -133,6 +133,16 @@ public void clearLookupCaches() {
 		cachedGeneralKeywordParameters = null;
 		cachedPublicFunctions = null;
 	}
+
+	/**
+	 * This is useful for the tutor and the eval repl where we 
+	 * sometimes need to forget about previous errors without
+	 * actually fixing them. This is not for the real REPL, where
+	 * we _do_ want to be reminded of previous erroneous initializations.
+	 */
+	public void clearLoadMessages() {
+		this.loadMessages.clear();
+	}
 
 	public void extend(ModuleEnvironment other) {
 		extendNameFlags(other);

src/org/rascalmpl/interpreter/result/ConstructorFunction.java

@@ -79,8 +79,8 @@ public Result<IValue> computeDefaultKeywordParameter(String label, IConstructor
 		Set<GenericKeywordParameters> kws = callerEnvironment.lookupGenericKeywordParameters(constructorType.getAbstractDataType());
 		IWithKeywordParameters<? extends IConstructor> wkw = value.asWithKeywordParameters();
 		Environment old = ctx.getCurrentEnvt();
-		Environment resultEnv = new Environment(declarationEnvironment, URIUtil.rootLocation("initializer"), "keyword parameter initializer");
-		
+		Environment resultEnv = new Environment(declarationEnvironment, callerEnvironment, callerEnvironment.getLocation(), URIUtil.rootLocation("initializer"), "keyword parameter initializer");
+
 		// first we compute the keyword parameters for the abstract data-type:
 		for (GenericKeywordParameters gkw : kws) {
 			// for hygiene's sake, each list of generic params needs to be evaluated in its declaring environment

src/org/rascalmpl/repl/rascal/RascalInterpreterREPL.java

@@ -336,4 +336,8 @@ protected void sourceLocationChanged(ISourceLocation srcPath, ISourceLocationCha
             dirtyModules.add(modName);
         }
     }
+
+    public void clearModuleLoadMessages() {
+        eval.getHeap().clearModuleLoadMessage();
+    }
 }

src/org/rascalmpl/tutor/lang/rascal/tutor/Compiler.rsc

@@ -716,6 +716,10 @@ list[Output] compileMarkdown([/^<prefix:.*>\[<title:[^\]]*>\]\(\(<link:[A-Za-z0-
           u = /^\/assets/ := u ? u : "<p2r><u>";
           return compileMarkdown(["<prefix>[<title>](<u>)<postfix>", *rest], line, offset, pcfg, exec, ind, dtls, sidebar_position=sidebar_position);
         }
+        else if ({str u} := ind["<rootName(pcfg.currentRoot, pcfg.isPackageCourse)>:<removeSpaces(link)>"]) {
+          u = /^\/assets/ := u ? u : "<p2r><u>";
+          return compileMarkdown(["<prefix>[<title>](<u>)<postfix>", *rest], line, offset, pcfg, exec, ind, dtls, sidebar_position=sidebar_position);
+        }
 
         exactLinks = exactShortestLinks(ind, removeSpaces(link));
 
@@ -772,6 +776,10 @@ default list[Output] compileMarkdown([/^<prefix:.*>\(\(<link:[A-Za-z0-9\-\ \t\.\
           u = /^\/assets/ := u ? u : "<p2r><u>";
           return compileMarkdown(["<prefix>[<addSpaces(link)>](<u>)<postfix>", *rest], line, offset, pcfg, exec, ind, dtls, sidebar_position=sidebar_position);
         }
+        else if ({str u} := ind["<rootName(pcfg.currentRoot, pcfg.isPackageCourse)>:<removeSpaces(link)>"]) {
+          u = /^\/assets/ := u ? u : "<p2r><u>";
+          return compileMarkdown(["<prefix>[<title>](<u>)<postfix>", *rest], line, offset, pcfg, exec, ind, dtls, sidebar_position=sidebar_position);
+        }
 
         exactLinks = exactShortestLinks(ind, removeSpaces(link));
 

src/org/rascalmpl/tutor/lang/rascal/tutor/repl/TutorCommandExecutor.java

@@ -142,6 +142,7 @@ private static ISourceLocation inferProjectRoot(ISourceLocation member) {
     public void reset() {
         interpreter.cancelRunningCommandRequested();
         interpreter.cleanEnvironment();
+        interpreter.clearModuleLoadMessages();
         outPrinter.flush();
         outWriter.getBuffer().setLength(0);
         errPrinter.flush();