summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDeepanshu Utkarsh <duci9y@users.noreply.github.com>2020-12-29 09:24:19 -0500
committerGitHub <noreply@github.com>2020-12-29 15:24:19 +0100
commit115de4c81ae6e009c66ac36748fa55f8d3b27b0f (patch)
treea8da700a6fe2285bcfc357789970904903d4abad
parent24844a00527f58466b0b057da70b61f8278b84f5 (diff)
fix(core): Fix incorrect index in Promise.all error reporting (#8913)
-rw-r--r--cli/tests/error_024_stack_promise_all.ts1
-rw-r--r--cli/tests/error_024_stack_promise_all.ts.out4
-rw-r--r--core/error.rs2
3 files changed, 4 insertions, 3 deletions
diff --git a/cli/tests/error_024_stack_promise_all.ts b/cli/tests/error_024_stack_promise_all.ts
index 5334e8d77..ddaf0dbaa 100644
--- a/cli/tests/error_024_stack_promise_all.ts
+++ b/cli/tests/error_024_stack_promise_all.ts
@@ -1,4 +1,5 @@
const p = Promise.all([
+ Promise.resolve(),
(async (): Promise<never> => {
await Promise.resolve();
throw new Error("Promise.all()");
diff --git a/cli/tests/error_024_stack_promise_all.ts.out b/cli/tests/error_024_stack_promise_all.ts.out
index 38cb4ac31..e5528d6ab 100644
--- a/cli/tests/error_024_stack_promise_all.ts.out
+++ b/cli/tests/error_024_stack_promise_all.ts.out
@@ -1,8 +1,8 @@
[WILDCARD]Error: Promise.all()
at [WILDCARD]tests/error_024_stack_promise_all.ts:[WILDCARD]
- at async Promise.all (index 0)
+ at async Promise.all (index 1)
at async [WILDCARD]tests/error_024_stack_promise_all.ts:[WILDCARD]
error: Uncaught Error: Promise.all()
at [WILDCARD]tests/error_024_stack_promise_all.ts:[WILDCARD]
- at async Promise.all (index 0)
+ at async Promise.all (index 1)
at async [WILDCARD]tests/error_024_stack_promise_all.ts:[WILDCARD]
diff --git a/core/error.rs b/core/error.rs
index 8e4138889..fafa133b0 100644
--- a/core/error.rs
+++ b/core/error.rs
@@ -293,7 +293,7 @@ impl JsError {
.unwrap();
let is_promise_all = is_promise_all.is_true();
let promise_index: Option<v8::Local<v8::Integer>> =
- get_property(scope, call_site, "columnNumber")
+ get_property(scope, call_site, "promiseIndex")
.unwrap()
.try_into()
.ok();