foster/deno
0
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2025-03-03 09:31:22 -05:00
Code Issues Packages 1 Wiki Activity

Avoid show confusing lines in gen/bundle/main.js that throws error (#1502)

Browse source
This commit is contained in:
Kevin (Kun) "Kassimo" Qian 2019-01-12 06:14:09 -08:00 • committed by Ryan Dahl
parent 6322f45e7b
commit e29a676b78
3 changed files with 23 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/js_errors.rs
View file

@ -75,28 +75,31 @@ impl ToString for StackFrame {
impl ToString for JSError {
fn to_string(&self) -> String {
// TODO use fewer clones.
// TODO Improve the formatting of these error messages.
let mut s = String::new();
if self.script_resource_name.is_some() {
s.push_str(&self.script_resource_name.clone().unwrap());
}
if self.line_number.is_some() {
s.push_str(&format!(
":{}:{}",
self.line_number.unwrap(),
self.start_column.unwrap()
));
assert!(self.start_column.is_some());
}
if self.source_line.is_some() {
s.push_str("\n");
s.push_str(&self.source_line.clone().unwrap());
s.push_str("\n\n");
let script_resource_name = self.script_resource_name.as_ref().unwrap();
// Avoid showing internal code from gen/bundle/main.js
if script_resource_name != "gen/bundle/main.js" {
s.push_str(script_resource_name);
if self.line_number.is_some() {
s.push_str(&format!(
":{}:{}",
self.line_number.unwrap(),
self.start_column.unwrap()
));
assert!(self.start_column.is_some());
}
if self.source_line.is_some() {
s.push_str("\n");
s.push_str(self.source_line.as_ref().unwrap());
s.push_str("\n\n");
}
}
}
s.push_str(&self.message.clone());
s.push_str(&self.message);
for frame in &self.frames {
s.push_str("\n");

3
tests/error_004_missing_module.ts.out
View file

@ -1,4 +1,5 @@
[WILDCARD]NotFound: Cannot resolve module "bad-module.ts" from "[WILDCARD]/tests/error_004_missing_module.ts"
Compiling [WILDCARD]tests/error_004_missing_module.ts
NotFound: Cannot resolve module "bad-module.ts" from "[WILDCARD]/tests/error_004_missing_module.ts"
at DenoError ([WILDCARD]/js/errors.ts:[WILDCARD])
at maybeError ([WILDCARD]/js/errors.ts:[WILDCARD])
at maybeThrowError ([WILDCARD]/js/errors.ts:[WILDCARD])

3
tests/error_006_import_ext_failure.ts.out
View file

@ -1,4 +1,5 @@
[WILDCARD]NotFound: Cannot resolve module "./non-existent" from "[WILDCARD]/tests/error_006_import_ext_failure.ts"
Compiling [WILDCARD]tests/error_006_import_ext_failure.ts
NotFound: Cannot resolve module "./non-existent" from "[WILDCARD]/tests/error_006_import_ext_failure.ts"
at DenoError ([WILDCARD]/js/errors.ts:[WILDCARD])
at maybeError ([WILDCARD]/js/errors.ts:[WILDCARD])
at maybeThrowError ([WILDCARD]/js/errors.ts:[WILDCARD])