Merge branch 'main' into new-editors

2025-01-22 22:25:21 +01:00
parent 31cc6a4b37 4ae7e045b1
commit 5f51df0f3f
21 changed files with 39 additions and 27 deletions
@@ -101,11 +101,15 @@ class HScript extends Script {

 	private function _errorHandler(error:Error) {
 		var fileName = error.origin;
+		var oldfn = '$fileName:${error.line}: ';
 		if(remappedNames.exists(fileName))
 			fileName = remappedNames.get(fileName);
 		var fn = '$fileName:${error.line}: ';
 		var err = error.toString();
-		if (err.startsWith(fn)) err = err.substr(fn.length);
+		while(err.startsWith(oldfn) || err.startsWith(fn)) {
+			if (err.startsWith(oldfn)) err = err.substr(oldfn.length);
+			if (err.startsWith(fn)) err = err.substr(fn.length);
+		}

 		Logs.traceColored([
 			Logs.logText(fn, GREEN),