From d0b6152f11800b0baac1ae68d2eef7bfcea13cb5 Mon Sep 17 00:00:00 2001 From: Ryan Dahl Date: Wed, 27 Mar 2019 16:10:31 -0400 Subject: [PATCH] Fix error when JS is executed with --recompile (#2007) test case from @afinch7 --- cli/isolate.rs | 5 ++--- tests/025_reload_js_type_error.js | 5 +++++ tests/025_reload_js_type_error.js.out | 1 + tests/025_reload_js_type_error.test | 2 ++ 4 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 tests/025_reload_js_type_error.js create mode 100644 tests/025_reload_js_type_error.js.out create mode 100644 tests/025_reload_js_type_error.test diff --git a/cli/isolate.rs b/cli/isolate.rs index fad1f5ab50..bc88190aee 100644 --- a/cli/isolate.rs +++ b/cli/isolate.rs @@ -184,9 +184,8 @@ fn fetch_module_meta_data_and_maybe_compile_async( .dir .fetch_module_meta_data_async(&specifier, &referrer) .and_then(move |mut out| { - if (out.media_type == msg::MediaType::TypeScript - && out.maybe_output_code.is_none()) - || state_.flags.recompile + if out.media_type == msg::MediaType::TypeScript + && (out.maybe_output_code.is_none() || state_.flags.recompile) { debug!(">>>>> compile_sync START"); out = compile_sync(state_.clone(), &specifier, &referrer, &out); diff --git a/tests/025_reload_js_type_error.js b/tests/025_reload_js_type_error.js new file mode 100644 index 0000000000..e19275daac --- /dev/null +++ b/tests/025_reload_js_type_error.js @@ -0,0 +1,5 @@ +// There was a bug where if this was executed with --recompile it would throw a +// type error. +window.test = null; +test = console; +test.log("hello"); diff --git a/tests/025_reload_js_type_error.js.out b/tests/025_reload_js_type_error.js.out new file mode 100644 index 0000000000..ce01362503 --- /dev/null +++ b/tests/025_reload_js_type_error.js.out @@ -0,0 +1 @@ +hello diff --git a/tests/025_reload_js_type_error.test b/tests/025_reload_js_type_error.test new file mode 100644 index 0000000000..dba89cea81 --- /dev/null +++ b/tests/025_reload_js_type_error.test @@ -0,0 +1,2 @@ +args: tests/025_reload_js_type_error.js --reload --recompile +output: tests/025_reload_js_type_error.js.out