Revert some changes

HaxeFoundation · Oct 20, 2023 · af534b9 · af534b9
1 parent 255d5dd
commit af534b9
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 42 deletions.
diff --git a/src/compiler/args.ml b/src/compiler/args.ml
@@ -378,4 +378,4 @@ let parse_args com =
 	actx.raise_usage <- (fun () -> raise (Helper.HelpMessage (usage_string basic_args_spec usage)));
 	(* Handle CLI arguments *)
 	process com.args;
-	actx
+	actx
diff --git a/src/compiler/compiler.ml b/src/compiler/compiler.ml
@@ -286,7 +286,6 @@ let do_type ctx mctx actx display_file_dot_path macro_cache_enabled =
 	MacroContext.macro_enable_cache := macro_cache_enabled;
 
 	let macros = match mctx with None -> None | Some mctx -> mctx.g.macros in
-	Printf.eprintf "=== Create typer context ===\n";
 	let tctx = Setup.create_typer_context ctx macros actx.native_libs in
 	let display_file_dot_path = DisplayProcessing.maybe_load_display_file_before_typing tctx display_file_dot_path in
 	check_defines ctx.com;

diff --git a/src/filters/filters.ml b/src/filters/filters.ml
@@ -938,7 +938,6 @@ let run tctx main =
 		end;
 		not cached
 	) com.types in
-	Printf.eprintf "%d new types\n" (List.length new_types);
 	(* IMPORTANT:
 	    There may be types in new_types which have already been post-processed, but then had their m_processed flag unset
 		because they received an additional dependency. This could happen in cases such as @:generic methods in #10635.

diff --git a/std/eval/_std/sys/thread/EventLoop.hx b/std/eval/_std/sys/thread/EventLoop.hx
@@ -2,11 +2,9 @@ package sys.thread;
 
 import eval.luv.Loop;
 import eval.luv.Async;
-// import eval.luv.Timer as LuvTimer;
+import eval.luv.Timer as LuvTimer;
 import haxe.MainLoop;
 
-typedef LuvTimer = eval.luv.Timer;
-
 /**
 	When an event loop has an available event to execute.
 **/

diff --git a/tests/server/src/cases/ServerTests.hx b/tests/server/src/cases/ServerTests.hx
@@ -109,26 +109,26 @@ class ServerTests extends TestCase {
 		assertSuccess();
 	}
 
-	// function testDisplayModuleRecache() {
-	// 	vfs.putContent("HelloWorld.hx", getTemplate("HelloWorld.hx"));
-	// 	var args = ["--main", "HelloWorld", "--interp"];
-	// 	runHaxe(args);
-	// 	runHaxe(args);
-	// 	assertReuse("HelloWorld");
+	function testDisplayModuleRecache() {
+		vfs.putContent("HelloWorld.hx", getTemplate("HelloWorld.hx"));
+		var args = ["--main", "HelloWorld", "--interp"];
+		runHaxe(args);
+		runHaxe(args);
+		assertReuse("HelloWorld");
 
-	// 	var args2 = ["--main", "HelloWorld", "--interp", "--display", "HelloWorld.hx@64@type"];
-	// 	runHaxe(args2);
+		var args2 = ["--main", "HelloWorld", "--interp", "--display", "HelloWorld.hx@64@type"];
+		runHaxe(args2);
 
-	// 	runHaxe(args);
-	// 	assertReuse("HelloWorld");
+		runHaxe(args);
+		assertReuse("HelloWorld");
 
-	// 	// make sure we still invalidate if the file does change
-	// 	runHaxeJson([], ServerMethods.Invalidate, {file: new FsPath("HelloWorld.hx")});
-	// 	runHaxe(args2);
+		// make sure we still invalidate if the file does change
+		runHaxeJson([], ServerMethods.Invalidate, {file: new FsPath("HelloWorld.hx")});
+		runHaxe(args2);
 
-	// 	runHaxe(args);
-	// 	assertSkipping("HelloWorld", Tainted("check_display_file"));
-	// }
+		runHaxe(args);
+		assertSkipping("HelloWorld", Tainted("check_display_file"));
+	}
 
 	function testMutuallyDependent() {
 		vfs.putContent("MutuallyDependent1.hx", getTemplate("MutuallyDependent1.hx"));
@@ -154,29 +154,28 @@ class ServerTests extends TestCase {
 		assertSkipping("HelloWorld", Tainted("server/invalidate"));
 		runHaxe(args.concat(["--display", "HelloWorld.hx@0@diagnostics"]));
 		runHaxe(args);
-		// Note: reusing from successful compilation above
 		assertReuse("HelloWorld");
 	}
 
-	// function testDiagnosticsRecache2() {
-	// 	vfs.putContent("HelloWorld.hx", getTemplate("HelloWorld.hx"));
-	// 	var args = ["--main", "HelloWorld", "--interp"];
-	// 	runHaxe(args.concat(["--display", "HelloWorld.hx@0@diagnostics"]));
-	// 	runHaxe(args);
-	// 	assertReuse("HelloWorld");
-	// }
-
-	// function testDiagnosticsRecache3() {
-	// 	vfs.putContent("HelloWorld.hx", getTemplate("HelloWorld.hx"));
-	// 	var args = ["--main", "HelloWorld", "--interp"];
-	// 	runHaxe(args);
-	// 	runHaxe(args);
-	// 	assertReuse("HelloWorld");
-	// 	runHaxeJson([], ServerMethods.Invalidate, {file: new FsPath("HelloWorld.hx")});
-	// 	runHaxe(args.concat(["--display", "HelloWorld.hx@0@diagnostics"]));
-	// 	runHaxe(args.concat(["--display", "HelloWorld.hx@0@hover"]));
-	// 	assertReuse("HelloWorld");
-	// }
+	function testDiagnosticsRecache2() {
+		vfs.putContent("HelloWorld.hx", getTemplate("HelloWorld.hx"));
+		var args = ["--main", "HelloWorld", "--interp"];
+		runHaxe(args.concat(["--display", "HelloWorld.hx@0@diagnostics"]));
+		runHaxe(args);
+		assertReuse("HelloWorld");
+	}
+
+	function testDiagnosticsRecache3() {
+		vfs.putContent("HelloWorld.hx", getTemplate("HelloWorld.hx"));
+		var args = ["--main", "HelloWorld", "--interp"];
+		runHaxe(args);
+		runHaxe(args);
+		assertReuse("HelloWorld");
+		runHaxeJson([], ServerMethods.Invalidate, {file: new FsPath("HelloWorld.hx")});
+		runHaxe(args.concat(["--display", "HelloWorld.hx@0@diagnostics"]));
+		runHaxe(args.concat(["--display", "HelloWorld.hx@0@hover"]));
+		assertReuse("HelloWorld");
+	}
 
 	function testSyntaxCache() {
 		vfs.putContent("HelloWorld.hx", getTemplate("HelloWorld.hx"));