Merge pull request denoland#1 from denoland/master

Handle compiler diagnostics in Rust (denoland#2445)

cli/BUILD.gn

@@ -74,6 +74,7 @@ ts_sources = [
   "../js/core.ts",
   "../js/custom_event.ts",
   "../js/deno.ts",
+  "../js/diagnostics.ts",
   "../js/dir.ts",
   "../js/dispatch.ts",
   "../js/dispatch_minimal.ts",

cli/ansi.rs

@@ -1,6 +1,8 @@
 // Copyright 2018-2019 the Deno authors. All rights reserved. MIT license.
+use ansi_term::Color::Black;
 use ansi_term::Color::Fixed;
 use ansi_term::Color::Red;
+use ansi_term::Color::White;
 use ansi_term::Style;
 use regex::Regex;
 use std::env;
@@ -43,6 +45,14 @@ pub fn italic_bold(s: String) -> impl fmt::Display {
   style.paint(s)
 }
 
+pub fn black_on_white(s: String) -> impl fmt::Display {
+  let mut style = Style::new();
+  if use_color() {
+    style = style.on(White).fg(Black);
+  }
+  style.paint(s)
+}
+
 pub fn yellow(s: String) -> impl fmt::Display {
   let mut style = Style::new();
   if use_color() {
@@ -61,6 +71,22 @@ pub fn cyan(s: String) -> impl fmt::Display {
   style.paint(s)
 }
 
+pub fn red(s: String) -> impl fmt::Display {
+  let mut style = Style::new();
+  if use_color() {
+    style = style.fg(Red);
+  }
+  style.paint(s)
+}
+
+pub fn grey(s: String) -> impl fmt::Display {
+  let mut style = Style::new();
+  if use_color() {
+    style = style.fg(Fixed(8));
+  }
+  style.paint(s)
+}
+
 pub fn bold(s: String) -> impl fmt::Display {
   let mut style = Style::new();
   if use_color() {

cli/compiler.rs

@@ -1,4 +1,5 @@
 // Copyright 2018-2019 the Deno authors. All rights reserved. MIT license.
+use crate::diagnostics::Diagnostic;
 use crate::msg;
 use crate::resources;
 use crate::startup_data;
@@ -7,7 +8,6 @@ use crate::tokio_util;
 use crate::worker::Worker;
 use deno::js_check;
 use deno::Buf;
-use deno::JSError;
 use futures::Future;
 use futures::Stream;
 use std::str;
@@ -87,7 +87,7 @@ pub fn compile_async(
   specifier: &str,
   referrer: &str,
   module_meta_data: &ModuleMetaData,
-) -> impl Future<Item = ModuleMetaData, Error = JSError> {
+) -> impl Future<Item = ModuleMetaData, Error = Diagnostic> {
   debug!(
     "Running rust part of compile_sync. specifier: {}, referrer: {}",
     &specifier, &referrer
@@ -136,14 +136,15 @@ pub fn compile_async(
   first_msg_fut
     .map_err(|_| panic!("not handled"))
     .and_then(move |maybe_msg: Option<Buf>| {
-      let _res_msg = maybe_msg.unwrap();
-
       debug!("Received message from worker");
 
-      // TODO res is EmitResult, use serde_derive to parse it. Errors from the
-      // worker or Diagnostics should be somehow forwarded to the caller!
-      // Currently they are handled inside compiler.ts with os.exit(1) and above
-      // with std::process::exit(1). This bad.
+      if let Some(msg) = maybe_msg {
+        let json_str = std::str::from_utf8(&msg).unwrap();
+        debug!("Message: {}", json_str);
+        if let Some(diagnostics) = Diagnostic::from_emit_result(json_str) {
+          return Err(diagnostics);
+        }
+      }
 
       let r = state.dir.fetch_module_meta_data(
         &module_meta_data_.module_name,
@@ -169,7 +170,7 @@ pub fn compile_sync(
   specifier: &str,
   referrer: &str,
   module_meta_data: &ModuleMetaData,
-) -> Result<ModuleMetaData, JSError> {
+) -> Result<ModuleMetaData, Diagnostic> {
   tokio_util::block_on(compile_async(
     state,
     specifier,