Skip to content
This repository has been archived by the owner on Oct 15, 2020. It is now read-only.

Commit

Permalink
deps: update ChakraCore to chakra-core/ChakraCore@8c0764e1aa
Browse files Browse the repository at this point in the history
[1.8>1.9] [MERGE #4631 @digitalinfinity] OS 15681335: Fix inspection of Promise state in debugger

Merge pull request #4631 from digitalinfinity:os_15681335_1.8

RecyclablePromiseObjectWalker::Get had a missing break when inspecting the
state of a promise, causing an unresolved promise to show up as resolved in
F12. Fixed the logic here.

Reviewed-By: chakrabot <chakrabot@users.noreply.github.com>
  • Loading branch information
digitalinfinity authored and chakrabot committed Feb 1, 2018
1 parent fb1f064 commit 8fb8d14
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions deps/chakrashim/core/lib/Runtime/Debug/DiagObjectModel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3896,6 +3896,7 @@ namespace Js
break;
case JavascriptPromise::PromiseStatusCode_Unresolved:
pResolvedObject->obj = scriptContext->GetLibrary()->CreateStringFromCppLiteral(_u("pending"));
break;
case JavascriptPromise::PromiseStatusCode_HasResolution:
pResolvedObject->obj = scriptContext->GetLibrary()->CreateStringFromCppLiteral(_u("resolved"));
break;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
},
"someOtherProp": "string before",
"[Promise]": {
"[status]": "string resolved",
"[status]": "string pending",
"[value]": "string undefined"
}
}
Expand Down

0 comments on commit 8fb8d14

Please sign in to comment.