foster/denoland-deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-12-22 07:14:47 -05:00
Code Issues Packages 1 Wiki Activity

fix misaligned error reporting on tab char (#5032)

Browse source
This commit is contained in:
Fenzland 2020-05-02 01:03:54 +08:00 committed by GitHub
parent fa396c0a22
commit 25b765c123
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 31 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cli/fmt_errors.rs
View file

@ -74,7 +74,11 @@ fn format_maybe_source_line(
'~'
};
for _i in 0..start_column {
s.push(' ');
if source_line.chars().nth(_i as usize).unwrap() == '\t' {
s.push('\t');
} else {
s.push(' ');
}
}
for _i in 0..(end_column - start_column) {
s.push(underline_char);

9
cli/tests/error_025_tab_indent Normal file
View file

@ -0,0 +1,9 @@
function foo() {
throw Error("bad");
}
function bar() {
foo();
}
bar();

6
cli/tests/error_025_tab_indent.out Normal file
View file

@ -0,0 +1,6 @@
[WILDCARD]error: Uncaught Error: bad
throw Error("bad");
^
at foo ([WILDCARD]tests/error_025_tab_indent:2:8)
at bar ([WILDCARD]tests/error_025_tab_indent:6:2)
at [WILDCARD]tests/error_025_tab_indent:9:1

7
cli/tests/integration_tests.rs
View file

@ -1429,6 +1429,13 @@ itest!(error_024_stack_promise_all {
exit_code: 1,
});
itest!(error_025_tab_indent {
args: "error_025_tab_indent",
output: "error_025_tab_indent.out",
check_stderr: true,
exit_code: 1,
});
itest!(error_syntax {
args: "run --reload error_syntax.js",
check_stderr: true,

5
core/js_errors.rs
View file

@ -274,11 +274,14 @@ impl fmt::Display for JSError {
write!(f, "{}", source_loc)?;
}
if self.source_line.is_some() {
write!(f, "\n{}\n", self.source_line.as_ref().unwrap())?;
let source_line = self.source_line.as_ref().unwrap();
write!(f, "\n{}\n", source_line)?;
let mut s = String::new();
for i in 0..self.end_column.unwrap() {
if i >= self.start_column.unwrap() {
s.push('^');
} else if source_line.chars().nth(i as usize).unwrap() == '\t' {
s.push('\t');
} else {
s.push(' ');
}