Merge branch 'development' into hxb_server_cache_simn_cleanup

# Conflicts:
#	src/typing/typeloadModule.ml
#	tests/runci/targets/Jvm.hx

src/compiler/server.ml

@@ -79,7 +79,7 @@ let parse_file cs com (rfile : ClassPaths.resolved_file) p =
 							let ident = Hashtbl.find Parser.special_identifier_files fkey in
 							Printf.sprintf "not cached, using \"%s\" define" ident,true
 						with Not_found ->
-							cc#cache_file fkey rfile ftime data pdi;
+							cc#cache_file fkey (ClassPaths.create_resolved_file ffile rfile.class_path) ftime data pdi;
 							"cached",false
 						end
 				in

src/filters/exceptions.ml

@@ -73,7 +73,7 @@ let std_is ctx e t p =
 		| TFun(_,t) -> t
 		| _ -> raise_typing_error ("Std.isOfType is not a function and cannot be called") p
 	in
-	let type_expr = { eexpr = TTypeExpr(module_type_of_type t); etype = t; epos = p } in
+	let type_expr = TyperBase.type_module_type ctx.typer (module_type_of_type t) p in
 	make_static_call ctx.typer std_cls isOfType_field (fun t -> t) [e; type_expr] return_type p
 
 (**

tests/server/src/utils/macro/TestBuilder.macro.hx

@@ -111,7 +111,10 @@ class TestBuilder {
 			case EBlock(el):
 				var posInfos = Context.getPosInfos(f.expr.pos);
 				var pos = Context.makePosition({min: posInfos.max, max: posInfos.max, file: posInfos.file});
-				el.push(macro @:pos(pos) $i{asyncName}.done());
+				el.push(macro @:pos(pos) {
+					if ($i{asyncName}.timedOut) Assert.fail("timeout");
+					else $i{asyncName}.done();
+				});
 				f.expr = macro {
 					$i{asyncName}.setTimeout(20000);
 					${transformHaxeCalls(asyncName, el)};