Skip to content

Commit

Permalink
deps: V8: resolve remaining whitespace diff
Browse files Browse the repository at this point in the history 
Some whitespace was lost when nodejs#17489 landed. While I restored the one
file causing the V8-CI to fail, I missed the remaining changes from
Myles. This changes restores all whitespace differences with upstream.

PR-URL: nodejs#18366
Refs: nodejs#18360
Reviewed-By: Myles Borins <myles.borins@gmail.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
  • Loading branch information
@MylesBorins @MayaLekova
MylesBorins authored and MayaLekova committed May 8, 2018
1 parent 23d1790 commit 6aa65db
Show file tree
Hide file tree
Showing 8 changed files with 55 additions and 50 deletions.
1 change: 1 addition & 0 deletions deps/v8/test/inspector/debugger/async-stack-for-promise-expected.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,3 +130,4 @@ foo1 (test.js:9:2)
-- Promise.finally --
finally2 (test.js:225:34)
(anonymous) (testFinally2.js:0:0)

4 changes: 2 additions & 2 deletions deps/v8/test/inspector/debugger/external-stack-trace-expected.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ Running test: testInstrumentation
callFrames : [
[0] : {
columnNumber : 15
functionName :
functionName :
lineNumber : 0
scriptId : <scriptId>
url :
url :
}
]
description : stack
Expand Down
1 change: 1 addition & 0 deletions deps/v8/test/inspector/debugger/pause-on-async-call-expected.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -205,3 +205,4 @@ paused at:
debugger;
createPromise().then(#v => v * 2);
}

84 changes: 42 additions & 42 deletions deps/v8/test/inspector/debugger/promise-chain-when-limit-hit-expected.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Run expression 'console.trace()' with async chain len: 3
functionName : asyncCall
lineNumber : 2
scriptId : <scriptId>
url :
url :
}
[1] : {
columnNumber : 33
Expand All @@ -36,7 +36,7 @@ Run expression 'console.trace()' with async chain len: 3
functionName : asyncCall
lineNumber : 5
scriptId : <scriptId>
url :
url :
}
[1] : {
columnNumber : 33
Expand All @@ -54,14 +54,14 @@ Run expression 'console.trace()' with async chain len: 3
functionName : asyncCall
lineNumber : 5
scriptId : <scriptId>
url :
url :
}
[1] : {
columnNumber : 33
functionName : Promise.resolve.then
lineNumber : 5
scriptId : <scriptId>
url :
url :
}
]
description : Promise.then
Expand All @@ -72,14 +72,14 @@ Run expression 'console.trace()' with async chain len: 3
functionName : asyncCall
lineNumber : 5
scriptId : <scriptId>
url :
url :
}
[1] : {
columnNumber : 4
functionName :
functionName :
lineNumber : 6
scriptId : <scriptId>
url :
url :
}
]
description : Promise.then
Expand Down Expand Up @@ -110,7 +110,7 @@ Run expression 'console.trace()' with async chain len: 3
functionName : asyncCall
lineNumber : 2
scriptId : <scriptId>
url :
url :
}
[1] : {
columnNumber : 33
Expand All @@ -127,7 +127,7 @@ Run expression 'console.trace()' with async chain len: 3
functionName : asyncCall
lineNumber : 5
scriptId : <scriptId>
url :
url :
}
[1] : {
columnNumber : 33
Expand All @@ -145,14 +145,14 @@ Run expression 'console.trace()' with async chain len: 3
functionName : asyncCall
lineNumber : 5
scriptId : <scriptId>
url :
url :
}
[1] : {
columnNumber : 33
functionName : Promise.resolve.then
lineNumber : 5
scriptId : <scriptId>
url :
url :
}
]
description : Promise.then
Expand All @@ -163,14 +163,14 @@ Run expression 'console.trace()' with async chain len: 3
functionName : asyncCall
lineNumber : 5
scriptId : <scriptId>
url :
url :
}
[1] : {
columnNumber : 4
functionName :
functionName :
lineNumber : 6
scriptId : <scriptId>
url :
url :
}
]
description : Promise.then
Expand Down Expand Up @@ -201,7 +201,7 @@ Run expression 'console.trace()' with async chain len: 3
functionName : asyncCall
lineNumber : 2
scriptId : <scriptId>
url :
url :
}
[1] : {
columnNumber : 33
Expand All @@ -218,7 +218,7 @@ Run expression 'console.trace()' with async chain len: 3
functionName : asyncCall
lineNumber : 5
scriptId : <scriptId>
url :
url :
}
[1] : {
columnNumber : 33
Expand All @@ -236,14 +236,14 @@ Run expression 'console.trace()' with async chain len: 3
functionName : asyncCall
lineNumber : 5
scriptId : <scriptId>
url :
url :
}
[1] : {
columnNumber : 33
functionName : Promise.resolve.then
lineNumber : 5
scriptId : <scriptId>
url :
url :
}
]
description : Promise.then
Expand All @@ -254,14 +254,14 @@ Run expression 'console.trace()' with async chain len: 3
functionName : asyncCall
lineNumber : 5
scriptId : <scriptId>
url :
url :
}
[1] : {
columnNumber : 4
functionName :
functionName :
lineNumber : 6
scriptId : <scriptId>
url :
url :
}
]
description : Promise.then
Expand Down Expand Up @@ -292,7 +292,7 @@ Run expression 'console.trace()' with async chain len: 3
functionName : asyncCall
lineNumber : 2
scriptId : <scriptId>
url :
url :
}
[1] : {
columnNumber : 33
Expand All @@ -309,7 +309,7 @@ Run expression 'console.trace()' with async chain len: 3
functionName : asyncCall
lineNumber : 5
scriptId : <scriptId>
url :
url :
}
[1] : {
columnNumber : 33
Expand All @@ -327,14 +327,14 @@ Run expression 'console.trace()' with async chain len: 3
functionName : asyncCall
lineNumber : 5
scriptId : <scriptId>
url :
url :
}
[1] : {
columnNumber : 33
functionName : Promise.resolve.then
lineNumber : 5
scriptId : <scriptId>
url :
url :
}
]
description : Promise.then
Expand All @@ -345,14 +345,14 @@ Run expression 'console.trace()' with async chain len: 3
functionName : asyncCall
lineNumber : 5
scriptId : <scriptId>
url :
url :
}
[1] : {
columnNumber : 4
functionName :
functionName :
lineNumber : 6
scriptId : <scriptId>
url :
url :
}
]
description : Promise.then
Expand Down Expand Up @@ -383,7 +383,7 @@ Run expression 'console.trace()' with async chain len: 3
functionName : asyncCall
lineNumber : 2
scriptId : <scriptId>
url :
url :
}
[1] : {
columnNumber : 33
Expand All @@ -400,7 +400,7 @@ Run expression 'console.trace()' with async chain len: 3
functionName : asyncCall
lineNumber : 5
scriptId : <scriptId>
url :
url :
}
[1] : {
columnNumber : 33
Expand All @@ -418,14 +418,14 @@ Run expression 'console.trace()' with async chain len: 3
functionName : asyncCall
lineNumber : 5
scriptId : <scriptId>
url :
url :
}
[1] : {
columnNumber : 33
functionName : Promise.resolve.then
lineNumber : 5
scriptId : <scriptId>
url :
url :
}
]
description : Promise.then
Expand All @@ -436,14 +436,14 @@ Run expression 'console.trace()' with async chain len: 3
functionName : asyncCall
lineNumber : 5
scriptId : <scriptId>
url :
url :
}
[1] : {
columnNumber : 4
functionName :
functionName :
lineNumber : 6
scriptId : <scriptId>
url :
url :
}
]
description : Promise.then
Expand Down Expand Up @@ -474,7 +474,7 @@ Run expression 'console.trace()' with async chain len: 3
functionName : asyncCall
lineNumber : 2
scriptId : <scriptId>
url :
url :
}
[1] : {
columnNumber : 33
Expand All @@ -491,7 +491,7 @@ Run expression 'console.trace()' with async chain len: 3
functionName : asyncCall
lineNumber : 5
scriptId : <scriptId>
url :
url :
}
[1] : {
columnNumber : 33
Expand All @@ -509,14 +509,14 @@ Run expression 'console.trace()' with async chain len: 3
functionName : asyncCall
lineNumber : 5
scriptId : <scriptId>
url :
url :
}
[1] : {
columnNumber : 33
functionName : Promise.resolve.then
lineNumber : 5
scriptId : <scriptId>
url :
url :
}
]
description : Promise.then
Expand All @@ -527,14 +527,14 @@ Run expression 'console.trace()' with async chain len: 3
functionName : asyncCall
lineNumber : 5
scriptId : <scriptId>
url :
url :
}
[1] : {
columnNumber : 4
functionName :
functionName :
lineNumber : 6
scriptId : <scriptId>
url :
url :
}
]
description : Promise.then
Expand Down
1 change: 1 addition & 0 deletions deps/v8/test/inspector/debugger/this-in-arrow-function-expected.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,3 +104,4 @@ This in evaluateOnCallFrame:
type : object
}
Values equal: false

1 change: 1 addition & 0 deletions deps/v8/test/message/fail/console.out
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@ Error: exception
at Object.toString (*%(basename)s:24:39)
at console.info (<anonymous>)
at *%(basename)s:24:9

12 changes: 6 additions & 6 deletions deps/v8/test/message/regress/fail/regress-73.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

try {
throw 'a';
} catch (e) {
throw 'b';
print('c');
}
try {
throw 'a';
} catch (e) {
throw 'b';
print('c');
}
1 change: 1 addition & 0 deletions deps/v8/third_party/colorama/LICENSE
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,4 @@ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

0 comments on commit 6aa65db

Please sign in to comment.