Merge the --recompile and --reload flags (#2003)

1 files changed, 4 insertions, 2 deletions

diff --git a/cli/isolate.rs b/cli/isolate.rs
index bc88190ae..711c46ead 100644
--- a/cli/isolate.rs
+++ b/cli/isolate.rs
@@ -172,20 +172,22 @@ impl<B: DenoBehavior> Future for Isolate<B> {
     self.inner.poll().map_err(|err| self.apply_source_map(err))
   }
 }
+
 fn fetch_module_meta_data_and_maybe_compile_async(
   state: &Arc<IsolateState>,
   specifier: &str,
   referrer: &str,
 ) -> impl Future<Item = ModuleMetaData, Error = DenoError> {
+  let use_cache = !state.flags.reload;
   let state_ = state.clone();
   let specifier = specifier.to_string();
   let referrer = referrer.to_string();
   state
     .dir
-    .fetch_module_meta_data_async(&specifier, &referrer)
+    .fetch_module_meta_data_async(&specifier, &referrer, use_cache)
     .and_then(move |mut out| {
       if out.media_type == msg::MediaType::TypeScript
-        && (out.maybe_output_code.is_none() || state_.flags.recompile)
+        && !out.has_output_code_and_source_map()
       {
         debug!(">>>>> compile_sync START");
         out = compile_sync(state_.clone(), &specifier, &referrer, &out);