diff --git a/src/services/breakpoints.ts b/src/services/breakpoints.ts index 5042b72cc23..bc3d7a75674 100644 --- a/src/services/breakpoints.ts +++ b/src/services/breakpoints.ts @@ -287,6 +287,10 @@ namespace ts.BreakpointResolver { // { a = expression, b, c } = someExpression return textSpan(node); } + + if (binaryExpression.operatorToken.kind === SyntaxKind.CommaToken) { + return spanInNode(binaryExpression.left); + } } if (isExpression(node)) { @@ -301,7 +305,6 @@ namespace ts.BreakpointResolver { case SyntaxKind.ForStatement: case SyntaxKind.ForOfStatement: - // For now lets set the span on this expression, fix it later return textSpan(node); case SyntaxKind.BinaryExpression: diff --git a/tests/baselines/reference/bpSpanDestructuringAssignmentForArrayBindingPattern.baseline b/tests/baselines/reference/bpSpanDestructuringAssignmentForArrayBindingPattern.baseline index e08738cffc4..923e0cced09 100644 --- a/tests/baselines/reference/bpSpanDestructuringAssignmentForArrayBindingPattern.baseline +++ b/tests/baselines/reference/bpSpanDestructuringAssignmentForArrayBindingPattern.baseline @@ -95,12 +95,7 @@ -------------------------------- 20 >for ([, nameA] = robotA, i = 0; i < 1; i++) { - ~~~~~ => Pos: (712 to 716) SpanInfo: {"start":717,"length":25} - >[, nameA] = robotA, i = 0 - >:=> (line 20, col 5) to (line 20, col 30) -20 >for ([, nameA] = robotA, i = 0; i < 1; i++) { - - ~~~~~~~~~~~~~~~~~~~ => Pos: (717 to 735) SpanInfo: {"start":720,"length":5} + ~~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (712 to 735) SpanInfo: {"start":720,"length":5} >nameA >:=> (line 20, col 8) to (line 20, col 13) 20 >for ([, nameA] = robotA, i = 0; i < 1; i++) { @@ -133,12 +128,7 @@ -------------------------------- 23 >for ([, nameA] = getRobot(), i = 0; i < 1; i++) { - ~~~~~ => Pos: (784 to 788) SpanInfo: {"start":789,"length":29} - >[, nameA] = getRobot(), i = 0 - >:=> (line 23, col 5) to (line 23, col 34) -23 >for ([, nameA] = getRobot(), i = 0; i < 1; i++) { - - ~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (789 to 811) SpanInfo: {"start":792,"length":5} + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (784 to 811) SpanInfo: {"start":792,"length":5} >nameA >:=> (line 23, col 8) to (line 23, col 13) 23 >for ([, nameA] = getRobot(), i = 0; i < 1; i++) { @@ -171,12 +161,7 @@ -------------------------------- 26 >for ([, nameA] = [2, "trimmer", "trimming"], i = 0; i < 1; i++) { - ~~~~~ => Pos: (860 to 864) SpanInfo: {"start":865,"length":45} - >[, nameA] = [2, "trimmer", "trimming"], i = 0 - >:=> (line 26, col 5) to (line 26, col 50) -26 >for ([, nameA] = [2, "trimmer", "trimming"], i = 0; i < 1; i++) { - - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (865 to 903) SpanInfo: {"start":868,"length":5} + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (860 to 903) SpanInfo: {"start":868,"length":5} >nameA >:=> (line 26, col 8) to (line 26, col 13) 26 >for ([, nameA] = [2, "trimmer", "trimming"], i = 0; i < 1; i++) { @@ -209,12 +194,7 @@ -------------------------------- 29 >for ([, [primarySkillA, secondarySkillA]] = multiRobotA, i = 0; i < 1; i++) { - ~~~~~ => Pos: (952 to 956) SpanInfo: {"start":957,"length":57} - >[, [primarySkillA, secondarySkillA]] = multiRobotA, i = 0 - >:=> (line 29, col 5) to (line 29, col 62) -29 >for ([, [primarySkillA, secondarySkillA]] = multiRobotA, i = 0; i < 1; i++) { - - ~~~~~~~~~~~~~~~~~~ => Pos: (957 to 974) SpanInfo: {"start":961,"length":13} + ~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (952 to 974) SpanInfo: {"start":961,"length":13} >primarySkillA >:=> (line 29, col 9) to (line 29, col 22) 29 >for ([, [primarySkillA, secondarySkillA]] = multiRobotA, i = 0; i < 1; i++) { @@ -257,12 +237,7 @@ -------------------------------- 32 >for ([, [primarySkillA, secondarySkillA]] = getMultiRobot(), i = 0; i < 1; i++) { - ~~~~~ => Pos: (1064 to 1068) SpanInfo: {"start":1069,"length":61} - >[, [primarySkillA, secondarySkillA]] = getMultiRobot(), i = 0 - >:=> (line 32, col 5) to (line 32, col 66) -32 >for ([, [primarySkillA, secondarySkillA]] = getMultiRobot(), i = 0; i < 1; i++) { - - ~~~~~~~~~~~~~~~~~~ => Pos: (1069 to 1086) SpanInfo: {"start":1073,"length":13} + ~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (1064 to 1086) SpanInfo: {"start":1073,"length":13} >primarySkillA >:=> (line 32, col 9) to (line 32, col 22) 32 >for ([, [primarySkillA, secondarySkillA]] = getMultiRobot(), i = 0; i < 1; i++) { @@ -305,12 +280,7 @@ -------------------------------- 35 >for ([, [primarySkillA, secondarySkillA]] = ["trimmer", ["trimming", "edging"]], i = 0; i < 1; i++) { - ~~~~~ => Pos: (1180 to 1184) SpanInfo: {"start":1185,"length":81} - >[, [primarySkillA, secondarySkillA]] = ["trimmer", ["trimming", "edging"]], i = 0 - >:=> (line 35, col 5) to (line 35, col 86) -35 >for ([, [primarySkillA, secondarySkillA]] = ["trimmer", ["trimming", "edging"]], i = 0; i < 1; i++) { - - ~~~~~~~~~~~~~~~~~~ => Pos: (1185 to 1202) SpanInfo: {"start":1189,"length":13} + ~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (1180 to 1202) SpanInfo: {"start":1189,"length":13} >primarySkillA >:=> (line 35, col 9) to (line 35, col 22) 35 >for ([, [primarySkillA, secondarySkillA]] = ["trimmer", ["trimming", "edging"]], i = 0; i < 1; i++) { @@ -353,12 +323,7 @@ -------------------------------- 38 >for ([numberB] = robotA, i = 0; i < 1; i++) { - ~~~~~ => Pos: (1316 to 1320) SpanInfo: {"start":1321,"length":25} - >[numberB] = robotA, i = 0 - >:=> (line 38, col 5) to (line 38, col 30) -38 >for ([numberB] = robotA, i = 0; i < 1; i++) { - - ~~~~~~~~~~~~~~~~~~~ => Pos: (1321 to 1339) SpanInfo: {"start":1322,"length":7} + ~~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (1316 to 1339) SpanInfo: {"start":1322,"length":7} >numberB >:=> (line 38, col 6) to (line 38, col 13) 38 >for ([numberB] = robotA, i = 0; i < 1; i++) { @@ -391,12 +356,7 @@ -------------------------------- 41 >for ([numberB] = getRobot(), i = 0; i < 1; i++) { - ~~~~~ => Pos: (1390 to 1394) SpanInfo: {"start":1395,"length":29} - >[numberB] = getRobot(), i = 0 - >:=> (line 41, col 5) to (line 41, col 34) -41 >for ([numberB] = getRobot(), i = 0; i < 1; i++) { - - ~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (1395 to 1417) SpanInfo: {"start":1396,"length":7} + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (1390 to 1417) SpanInfo: {"start":1396,"length":7} >numberB >:=> (line 41, col 6) to (line 41, col 13) 41 >for ([numberB] = getRobot(), i = 0; i < 1; i++) { @@ -429,12 +389,7 @@ -------------------------------- 44 >for ([numberB] = [2, "trimmer", "trimming"], i = 0; i < 1; i++) { - ~~~~~ => Pos: (1468 to 1472) SpanInfo: {"start":1473,"length":45} - >[numberB] = [2, "trimmer", "trimming"], i = 0 - >:=> (line 44, col 5) to (line 44, col 50) -44 >for ([numberB] = [2, "trimmer", "trimming"], i = 0; i < 1; i++) { - - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (1473 to 1511) SpanInfo: {"start":1474,"length":7} + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (1468 to 1511) SpanInfo: {"start":1474,"length":7} >numberB >:=> (line 44, col 6) to (line 44, col 13) 44 >for ([numberB] = [2, "trimmer", "trimming"], i = 0; i < 1; i++) { @@ -467,12 +422,7 @@ -------------------------------- 47 >for ([nameB] = multiRobotA, i = 0; i < 1; i++) { - ~~~~~ => Pos: (1562 to 1566) SpanInfo: {"start":1567,"length":28} - >[nameB] = multiRobotA, i = 0 - >:=> (line 47, col 5) to (line 47, col 33) -47 >for ([nameB] = multiRobotA, i = 0; i < 1; i++) { - - ~~~~~~~~~~~~~~~~~~~~~~ => Pos: (1567 to 1588) SpanInfo: {"start":1568,"length":5} + ~~~~~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (1562 to 1588) SpanInfo: {"start":1568,"length":5} >nameB >:=> (line 47, col 6) to (line 47, col 11) 47 >for ([nameB] = multiRobotA, i = 0; i < 1; i++) { @@ -505,12 +455,7 @@ -------------------------------- 50 >for ([nameB] = getMultiRobot(), i = 0; i < 1; i++) { - ~~~~~ => Pos: (1637 to 1641) SpanInfo: {"start":1642,"length":32} - >[nameB] = getMultiRobot(), i = 0 - >:=> (line 50, col 5) to (line 50, col 37) -50 >for ([nameB] = getMultiRobot(), i = 0; i < 1; i++) { - - ~~~~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (1642 to 1667) SpanInfo: {"start":1643,"length":5} + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (1637 to 1667) SpanInfo: {"start":1643,"length":5} >nameB >:=> (line 50, col 6) to (line 50, col 11) 50 >for ([nameB] = getMultiRobot(), i = 0; i < 1; i++) { @@ -543,12 +488,7 @@ -------------------------------- 53 >for ([nameB] = ["trimmer", ["trimming", "edging"]], i = 0; i < 1; i++) { - ~~~~~ => Pos: (1716 to 1720) SpanInfo: {"start":1721,"length":52} - >[nameB] = ["trimmer", ["trimming", "edging"]], i = 0 - >:=> (line 53, col 5) to (line 53, col 57) -53 >for ([nameB] = ["trimmer", ["trimming", "edging"]], i = 0; i < 1; i++) { - - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~=> Pos: (1721 to 1766) SpanInfo: {"start":1722,"length":5} + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~=> Pos: (1716 to 1766) SpanInfo: {"start":1722,"length":5} >nameB >:=> (line 53, col 6) to (line 53, col 11) 53 >for ([nameB] = ["trimmer", ["trimming", "edging"]], i = 0; i < 1; i++) { @@ -581,12 +521,7 @@ -------------------------------- 56 >for ([numberA2, nameA2, skillA2] = robotA, i = 0; i < 1; i++) { - ~~~~~ => Pos: (1815 to 1819) SpanInfo: {"start":1820,"length":43} - >[numberA2, nameA2, skillA2] = robotA, i = 0 - >:=> (line 56, col 5) to (line 56, col 48) -56 >for ([numberA2, nameA2, skillA2] = robotA, i = 0; i < 1; i++) { - - ~~~~~~~~~~ => Pos: (1820 to 1829) SpanInfo: {"start":1821,"length":8} + ~~~~~~~~~~~~~~~ => Pos: (1815 to 1829) SpanInfo: {"start":1821,"length":8} >numberA2 >:=> (line 56, col 6) to (line 56, col 14) 56 >for ([numberA2, nameA2, skillA2] = robotA, i = 0; i < 1; i++) { @@ -629,12 +564,7 @@ -------------------------------- 59 >for ([numberA2, nameA2, skillA2] = getRobot(), i = 0; i < 1; i++) { - ~~~~~ => Pos: (1906 to 1910) SpanInfo: {"start":1911,"length":47} - >[numberA2, nameA2, skillA2] = getRobot(), i = 0 - >:=> (line 59, col 5) to (line 59, col 52) -59 >for ([numberA2, nameA2, skillA2] = getRobot(), i = 0; i < 1; i++) { - - ~~~~~~~~~~ => Pos: (1911 to 1920) SpanInfo: {"start":1912,"length":8} + ~~~~~~~~~~~~~~~ => Pos: (1906 to 1920) SpanInfo: {"start":1912,"length":8} >numberA2 >:=> (line 59, col 6) to (line 59, col 14) 59 >for ([numberA2, nameA2, skillA2] = getRobot(), i = 0; i < 1; i++) { @@ -677,12 +607,7 @@ -------------------------------- 62 >for ([numberA2, nameA2, skillA2] = [2, "trimmer", "trimming"], i = 0; i < 1; i++) { - ~~~~~ => Pos: (2001 to 2005) SpanInfo: {"start":2006,"length":63} - >[numberA2, nameA2, skillA2] = [2, "trimmer", "trimming"], i = 0 - >:=> (line 62, col 5) to (line 62, col 68) -62 >for ([numberA2, nameA2, skillA2] = [2, "trimmer", "trimming"], i = 0; i < 1; i++) { - - ~~~~~~~~~~ => Pos: (2006 to 2015) SpanInfo: {"start":2007,"length":8} + ~~~~~~~~~~~~~~~ => Pos: (2001 to 2015) SpanInfo: {"start":2007,"length":8} >numberA2 >:=> (line 62, col 6) to (line 62, col 14) 62 >for ([numberA2, nameA2, skillA2] = [2, "trimmer", "trimming"], i = 0; i < 1; i++) { @@ -725,12 +650,7 @@ -------------------------------- 65 >for ([nameMA, [primarySkillA, secondarySkillA]] = multiRobotA, i = 0; i < 1; i++) { - ~~~~~ => Pos: (2112 to 2116) SpanInfo: {"start":2117,"length":63} - >[nameMA, [primarySkillA, secondarySkillA]] = multiRobotA, i = 0 - >:=> (line 65, col 5) to (line 65, col 68) -65 >for ([nameMA, [primarySkillA, secondarySkillA]] = multiRobotA, i = 0; i < 1; i++) { - - ~~~~~~~~ => Pos: (2117 to 2124) SpanInfo: {"start":2118,"length":6} + ~~~~~~~~~~~~~ => Pos: (2112 to 2124) SpanInfo: {"start":2118,"length":6} >nameMA >:=> (line 65, col 6) to (line 65, col 12) 65 >for ([nameMA, [primarySkillA, secondarySkillA]] = multiRobotA, i = 0; i < 1; i++) { @@ -778,12 +698,7 @@ -------------------------------- 68 >for ([nameMA, [primarySkillA, secondarySkillA]] = getMultiRobot(), i = 0; i < 1; i++) { - ~~~~~ => Pos: (2223 to 2227) SpanInfo: {"start":2228,"length":67} - >[nameMA, [primarySkillA, secondarySkillA]] = getMultiRobot(), i = 0 - >:=> (line 68, col 5) to (line 68, col 72) -68 >for ([nameMA, [primarySkillA, secondarySkillA]] = getMultiRobot(), i = 0; i < 1; i++) { - - ~~~~~~~~ => Pos: (2228 to 2235) SpanInfo: {"start":2229,"length":6} + ~~~~~~~~~~~~~ => Pos: (2223 to 2235) SpanInfo: {"start":2229,"length":6} >nameMA >:=> (line 68, col 6) to (line 68, col 12) 68 >for ([nameMA, [primarySkillA, secondarySkillA]] = getMultiRobot(), i = 0; i < 1; i++) { @@ -831,12 +746,7 @@ -------------------------------- 71 >for ([nameMA, [primarySkillA, secondarySkillA]] = ["trimmer", ["trimming", "edging"]], i = 0; i < 1; i++) { - ~~~~~ => Pos: (2338 to 2342) SpanInfo: {"start":2343,"length":87} - >[nameMA, [primarySkillA, secondarySkillA]] = ["trimmer", ["trimming", "edging"]], i = 0 - >:=> (line 71, col 5) to (line 71, col 92) -71 >for ([nameMA, [primarySkillA, secondarySkillA]] = ["trimmer", ["trimming", "edging"]], i = 0; i < 1; i++) { - - ~~~~~~~~ => Pos: (2343 to 2350) SpanInfo: {"start":2344,"length":6} + ~~~~~~~~~~~~~ => Pos: (2338 to 2350) SpanInfo: {"start":2344,"length":6} >nameMA >:=> (line 71, col 6) to (line 71, col 12) 71 >for ([nameMA, [primarySkillA, secondarySkillA]] = ["trimmer", ["trimming", "edging"]], i = 0; i < 1; i++) { @@ -884,12 +794,7 @@ -------------------------------- 74 >for ([numberA3, ...robotAInfo] = robotA, i = 0; i < 1; i++) { - ~~~~~ => Pos: (2473 to 2477) SpanInfo: {"start":2478,"length":41} - >[numberA3, ...robotAInfo] = robotA, i = 0 - >:=> (line 74, col 5) to (line 74, col 46) -74 >for ([numberA3, ...robotAInfo] = robotA, i = 0; i < 1; i++) { - - ~~~~~~~~~~ => Pos: (2478 to 2487) SpanInfo: {"start":2479,"length":8} + ~~~~~~~~~~~~~~~ => Pos: (2473 to 2487) SpanInfo: {"start":2479,"length":8} >numberA3 >:=> (line 74, col 6) to (line 74, col 14) 74 >for ([numberA3, ...robotAInfo] = robotA, i = 0; i < 1; i++) { @@ -927,12 +832,7 @@ -------------------------------- 77 >for ([numberA3, ...robotAInfo] = getRobot(), i = 0; i < 1; i++) { - ~~~~~ => Pos: (2564 to 2568) SpanInfo: {"start":2569,"length":45} - >[numberA3, ...robotAInfo] = getRobot(), i = 0 - >:=> (line 77, col 5) to (line 77, col 50) -77 >for ([numberA3, ...robotAInfo] = getRobot(), i = 0; i < 1; i++) { - - ~~~~~~~~~~ => Pos: (2569 to 2578) SpanInfo: {"start":2570,"length":8} + ~~~~~~~~~~~~~~~ => Pos: (2564 to 2578) SpanInfo: {"start":2570,"length":8} >numberA3 >:=> (line 77, col 6) to (line 77, col 14) 77 >for ([numberA3, ...robotAInfo] = getRobot(), i = 0; i < 1; i++) { @@ -970,12 +870,7 @@ -------------------------------- 80 >for ([numberA3, ...robotAInfo] = [2, "trimmer", "trimming"], i = 0; i < 1; i++) { - ~~~~~ => Pos: (2659 to 2663) SpanInfo: {"start":2664,"length":68} - >[numberA3, ...robotAInfo] = [2, "trimmer", "trimming"], i = 0 - >:=> (line 80, col 5) to (line 80, col 73) -80 >for ([numberA3, ...robotAInfo] = [2, "trimmer", "trimming"], i = 0; i < 1; i++) { - - ~~~~~~~~~~ => Pos: (2664 to 2673) SpanInfo: {"start":2665,"length":8} + ~~~~~~~~~~~~~~~ => Pos: (2659 to 2673) SpanInfo: {"start":2665,"length":8} >numberA3 >:=> (line 80, col 6) to (line 80, col 14) 80 >for ([numberA3, ...robotAInfo] = [2, "trimmer", "trimming"], i = 0; i < 1; i++) { @@ -1013,12 +908,7 @@ -------------------------------- 83 >for ([...multiRobotAInfo] = multiRobotA, i = 0; i < 1; i++) { - ~~~~~ => Pos: (2777 to 2781) SpanInfo: {"start":2782,"length":41} - >[...multiRobotAInfo] = multiRobotA, i = 0 - >:=> (line 83, col 5) to (line 83, col 46) -83 >for ([...multiRobotAInfo] = multiRobotA, i = 0; i < 1; i++) { - - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (2782 to 2816) SpanInfo: {"start":2783,"length":18} + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (2777 to 2816) SpanInfo: {"start":2783,"length":18} >...multiRobotAInfo >:=> (line 83, col 6) to (line 83, col 24) 83 >for ([...multiRobotAInfo] = multiRobotA, i = 0; i < 1; i++) { @@ -1051,12 +941,7 @@ -------------------------------- 86 >for ([...multiRobotAInfo] = getMultiRobot(), i = 0; i < 1; i++) { - ~~~~~ => Pos: (2875 to 2879) SpanInfo: {"start":2880,"length":45} - >[...multiRobotAInfo] = getMultiRobot(), i = 0 - >:=> (line 86, col 5) to (line 86, col 50) -86 >for ([...multiRobotAInfo] = getMultiRobot(), i = 0; i < 1; i++) { - - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (2880 to 2918) SpanInfo: {"start":2881,"length":18} + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (2875 to 2918) SpanInfo: {"start":2881,"length":18} >...multiRobotAInfo >:=> (line 86, col 6) to (line 86, col 24) 86 >for ([...multiRobotAInfo] = getMultiRobot(), i = 0; i < 1; i++) { @@ -1089,12 +974,7 @@ -------------------------------- 89 >for ([...multiRobotAInfo] = ["trimmer", ["trimming", "edging"]], i = 0; i < 1; i++) { - ~~~~~ => Pos: (2977 to 2981) SpanInfo: {"start":2982,"length":84} - >[...multiRobotAInfo] = ["trimmer", ["trimming", "edging"]], i = 0 - >:=> (line 89, col 5) to (line 89, col 89) -89 >for ([...multiRobotAInfo] = ["trimmer", ["trimming", "edging"]], i = 0; i < 1; i++) { - - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~=> Pos: (2982 to 3059) SpanInfo: {"start":2983,"length":18} + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~=> Pos: (2977 to 3059) SpanInfo: {"start":2983,"length":18} >...multiRobotAInfo >:=> (line 89, col 6) to (line 89, col 24) 89 >for ([...multiRobotAInfo] = ["trimmer", ["trimming", "edging"]], i = 0; i < 1; i++) { diff --git a/tests/baselines/reference/bpSpanDestructuringAssignmentForArrayBindingPatternDefaultValues.baseline b/tests/baselines/reference/bpSpanDestructuringAssignmentForArrayBindingPatternDefaultValues.baseline index 28b4bdb96e9..56894ce9a9a 100644 --- a/tests/baselines/reference/bpSpanDestructuringAssignmentForArrayBindingPatternDefaultValues.baseline +++ b/tests/baselines/reference/bpSpanDestructuringAssignmentForArrayBindingPatternDefaultValues.baseline @@ -95,12 +95,7 @@ -------------------------------- 20 >for ([, nameA = "name"] = robotA, i = 0; i < 1; i++) { - ~~~~~ => Pos: (712 to 716) SpanInfo: {"start":717,"length":34} - >[, nameA = "name"] = robotA, i = 0 - >:=> (line 20, col 5) to (line 20, col 39) -20 >for ([, nameA = "name"] = robotA, i = 0; i < 1; i++) { - - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (717 to 744) SpanInfo: {"start":720,"length":14} + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (712 to 744) SpanInfo: {"start":720,"length":14} >nameA = "name" >:=> (line 20, col 8) to (line 20, col 22) 20 >for ([, nameA = "name"] = robotA, i = 0; i < 1; i++) { @@ -133,12 +128,7 @@ -------------------------------- 23 >for ([, nameA = "name"] = getRobot(), i = 0; i < 1; i++) { - ~~~~~ => Pos: (793 to 797) SpanInfo: {"start":798,"length":38} - >[, nameA = "name"] = getRobot(), i = 0 - >:=> (line 23, col 5) to (line 23, col 43) -23 >for ([, nameA = "name"] = getRobot(), i = 0; i < 1; i++) { - - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (798 to 829) SpanInfo: {"start":801,"length":14} + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (793 to 829) SpanInfo: {"start":801,"length":14} >nameA = "name" >:=> (line 23, col 8) to (line 23, col 22) 23 >for ([, nameA = "name"] = getRobot(), i = 0; i < 1; i++) { @@ -171,12 +161,7 @@ -------------------------------- 26 >for ([, nameA = "name"] = [2, "trimmer", "trimming"], i = 0; i < 1; i++) { - ~~~~~ => Pos: (878 to 882) SpanInfo: {"start":883,"length":54} - >[, nameA = "name"] = [2, "trimmer", "trimming"], i = 0 - >:=> (line 26, col 5) to (line 26, col 59) -26 >for ([, nameA = "name"] = [2, "trimmer", "trimming"], i = 0; i < 1; i++) { - - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~=> Pos: (883 to 930) SpanInfo: {"start":886,"length":14} + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~=> Pos: (878 to 930) SpanInfo: {"start":886,"length":14} >nameA = "name" >:=> (line 26, col 8) to (line 26, col 22) 26 >for ([, nameA = "name"] = [2, "trimmer", "trimming"], i = 0; i < 1; i++) { @@ -209,15 +194,7 @@ -------------------------------- 29 >for ([, [ - ~~~~~ => Pos: (979 to 983) SpanInfo: {"start":984,"length":112} - >[, [ - > primarySkillA = "primary", - > secondarySkillA = "secondary" - >] = ["none", "none"]] = multiRobotA, i = 0 - >:=> (line 29, col 5) to (line 32, col 42) -29 >for ([, [ - - ~~~~~ => Pos: (984 to 988) SpanInfo: {"start":993,"length":25} + ~~~~~~~~~~ => Pos: (979 to 988) SpanInfo: {"start":993,"length":25} >primarySkillA = "primary" >:=> (line 30, col 4) to (line 30, col 29) -------------------------------- @@ -276,15 +253,7 @@ -------------------------------- 35 >for ([, [ - ~~~~~ => Pos: (1146 to 1150) SpanInfo: {"start":1151,"length":116} - >[, [ - > primarySkillA = "primary", - > secondarySkillA = "secondary" - >] = ["none", "none"]] = getMultiRobot(), i = 0 - >:=> (line 35, col 5) to (line 38, col 46) -35 >for ([, [ - - ~~~~~ => Pos: (1151 to 1155) SpanInfo: {"start":1160,"length":25} + ~~~~~~~~~~ => Pos: (1146 to 1155) SpanInfo: {"start":1160,"length":25} >primarySkillA = "primary" >:=> (line 36, col 4) to (line 36, col 29) -------------------------------- @@ -343,15 +312,7 @@ -------------------------------- 41 >for ([, [ - ~~~~~ => Pos: (1317 to 1321) SpanInfo: {"start":1322,"length":136} - >[, [ - > primarySkillA = "primary", - > secondarySkillA = "secondary" - >] = ["none", "none"]] = ["trimmer", ["trimming", "edging"]], i = 0 - >:=> (line 41, col 5) to (line 44, col 66) -41 >for ([, [ - - ~~~~~ => Pos: (1322 to 1326) SpanInfo: {"start":1331,"length":25} + ~~~~~~~~~~ => Pos: (1317 to 1326) SpanInfo: {"start":1331,"length":25} >primarySkillA = "primary" >:=> (line 42, col 4) to (line 42, col 29) -------------------------------- @@ -410,12 +371,7 @@ -------------------------------- 47 >for ([numberB = -1] = robotA, i = 0; i < 1; i++) { - ~~~~~ => Pos: (1508 to 1512) SpanInfo: {"start":1513,"length":30} - >[numberB = -1] = robotA, i = 0 - >:=> (line 47, col 5) to (line 47, col 35) -47 >for ([numberB = -1] = robotA, i = 0; i < 1; i++) { - - ~~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (1513 to 1536) SpanInfo: {"start":1514,"length":12} + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (1508 to 1536) SpanInfo: {"start":1514,"length":12} >numberB = -1 >:=> (line 47, col 6) to (line 47, col 18) 47 >for ([numberB = -1] = robotA, i = 0; i < 1; i++) { @@ -448,12 +404,7 @@ -------------------------------- 50 >for ([numberB = -1] = getRobot(), i = 0; i < 1; i++) { - ~~~~~ => Pos: (1587 to 1591) SpanInfo: {"start":1592,"length":34} - >[numberB = -1] = getRobot(), i = 0 - >:=> (line 50, col 5) to (line 50, col 39) -50 >for ([numberB = -1] = getRobot(), i = 0; i < 1; i++) { - - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (1592 to 1619) SpanInfo: {"start":1593,"length":12} + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (1587 to 1619) SpanInfo: {"start":1593,"length":12} >numberB = -1 >:=> (line 50, col 6) to (line 50, col 18) 50 >for ([numberB = -1] = getRobot(), i = 0; i < 1; i++) { @@ -486,12 +437,7 @@ -------------------------------- 53 >for ([numberB = -1] = [2, "trimmer", "trimming"], i = 0; i < 1; i++) { - ~~~~~ => Pos: (1670 to 1674) SpanInfo: {"start":1675,"length":50} - >[numberB = -1] = [2, "trimmer", "trimming"], i = 0 - >:=> (line 53, col 5) to (line 53, col 55) -53 >for ([numberB = -1] = [2, "trimmer", "trimming"], i = 0; i < 1; i++) { - - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~=> Pos: (1675 to 1718) SpanInfo: {"start":1676,"length":12} + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~=> Pos: (1670 to 1718) SpanInfo: {"start":1676,"length":12} >numberB = -1 >:=> (line 53, col 6) to (line 53, col 18) 53 >for ([numberB = -1] = [2, "trimmer", "trimming"], i = 0; i < 1; i++) { @@ -524,12 +470,7 @@ -------------------------------- 56 >for ([nameB = "name"] = multiRobotA, i = 0; i < 1; i++) { - ~~~~~ => Pos: (1769 to 1773) SpanInfo: {"start":1774,"length":37} - >[nameB = "name"] = multiRobotA, i = 0 - >:=> (line 56, col 5) to (line 56, col 42) -56 >for ([nameB = "name"] = multiRobotA, i = 0; i < 1; i++) { - - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (1774 to 1804) SpanInfo: {"start":1775,"length":14} + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (1769 to 1804) SpanInfo: {"start":1775,"length":14} >nameB = "name" >:=> (line 56, col 6) to (line 56, col 20) 56 >for ([nameB = "name"] = multiRobotA, i = 0; i < 1; i++) { @@ -562,12 +503,7 @@ -------------------------------- 59 >for ([nameB = "name"] = getMultiRobot(), i = 0; i < 1; i++) { - ~~~~~ => Pos: (1853 to 1857) SpanInfo: {"start":1858,"length":41} - >[nameB = "name"] = getMultiRobot(), i = 0 - >:=> (line 59, col 5) to (line 59, col 46) -59 >for ([nameB = "name"] = getMultiRobot(), i = 0; i < 1; i++) { - - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (1858 to 1892) SpanInfo: {"start":1859,"length":14} + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (1853 to 1892) SpanInfo: {"start":1859,"length":14} >nameB = "name" >:=> (line 59, col 6) to (line 59, col 20) 59 >for ([nameB = "name"] = getMultiRobot(), i = 0; i < 1; i++) { @@ -600,12 +536,7 @@ -------------------------------- 62 >for ([nameB = "name"] = ["trimmer", ["trimming", "edging"]], i = 0; i < 1; i++) { - ~~~~~ => Pos: (1941 to 1945) SpanInfo: {"start":1946,"length":61} - >[nameB = "name"] = ["trimmer", ["trimming", "edging"]], i = 0 - >:=> (line 62, col 5) to (line 62, col 66) -62 >for ([nameB = "name"] = ["trimmer", ["trimming", "edging"]], i = 0; i < 1; i++) { - - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~=> Pos: (1946 to 2000) SpanInfo: {"start":1947,"length":14} + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~=> Pos: (1941 to 2000) SpanInfo: {"start":1947,"length":14} >nameB = "name" >:=> (line 62, col 6) to (line 62, col 20) 62 >for ([nameB = "name"] = ["trimmer", ["trimming", "edging"]], i = 0; i < 1; i++) { @@ -638,12 +569,7 @@ -------------------------------- 65 >for ([numberA2 = -1, nameA2 = "name", skillA2 = "skill"] = robotA, i = 0; i < 1; i++) { - ~~~~~ => Pos: (2049 to 2053) SpanInfo: {"start":2054,"length":67} - >[numberA2 = -1, nameA2 = "name", skillA2 = "skill"] = robotA, i = 0 - >:=> (line 65, col 5) to (line 65, col 72) -65 >for ([numberA2 = -1, nameA2 = "name", skillA2 = "skill"] = robotA, i = 0; i < 1; i++) { - - ~~~~~~~~~~~~~~~ => Pos: (2054 to 2068) SpanInfo: {"start":2055,"length":13} + ~~~~~~~~~~~~~~~~~~~~ => Pos: (2049 to 2068) SpanInfo: {"start":2055,"length":13} >numberA2 = -1 >:=> (line 65, col 6) to (line 65, col 19) 65 >for ([numberA2 = -1, nameA2 = "name", skillA2 = "skill"] = robotA, i = 0; i < 1; i++) { @@ -686,12 +612,7 @@ -------------------------------- 68 >for ([numberA2 = -1, nameA2 = "name", skillA2 = "skill"] = getRobot(), i = 0; i < 1; i++) { - ~~~~~ => Pos: (2164 to 2168) SpanInfo: {"start":2169,"length":71} - >[numberA2 = -1, nameA2 = "name", skillA2 = "skill"] = getRobot(), i = 0 - >:=> (line 68, col 5) to (line 68, col 76) -68 >for ([numberA2 = -1, nameA2 = "name", skillA2 = "skill"] = getRobot(), i = 0; i < 1; i++) { - - ~~~~~~~~~~~~~~~ => Pos: (2169 to 2183) SpanInfo: {"start":2170,"length":13} + ~~~~~~~~~~~~~~~~~~~~ => Pos: (2164 to 2183) SpanInfo: {"start":2170,"length":13} >numberA2 = -1 >:=> (line 68, col 6) to (line 68, col 19) 68 >for ([numberA2 = -1, nameA2 = "name", skillA2 = "skill"] = getRobot(), i = 0; i < 1; i++) { @@ -734,12 +655,7 @@ -------------------------------- 71 >for ([numberA2 = -1, nameA2 = "name", skillA2 = "skill"] = [2, "trimmer", "trimming"], i = 0; i < 1; i++) { - ~~~~~ => Pos: (2283 to 2287) SpanInfo: {"start":2288,"length":87} - >[numberA2 = -1, nameA2 = "name", skillA2 = "skill"] = [2, "trimmer", "trimming"], i = 0 - >:=> (line 71, col 5) to (line 71, col 92) -71 >for ([numberA2 = -1, nameA2 = "name", skillA2 = "skill"] = [2, "trimmer", "trimming"], i = 0; i < 1; i++) { - - ~~~~~~~~~~~~~~~ => Pos: (2288 to 2302) SpanInfo: {"start":2289,"length":13} + ~~~~~~~~~~~~~~~~~~~~ => Pos: (2283 to 2302) SpanInfo: {"start":2289,"length":13} >numberA2 = -1 >:=> (line 71, col 6) to (line 71, col 19) 71 >for ([numberA2 = -1, nameA2 = "name", skillA2 = "skill"] = [2, "trimmer", "trimming"], i = 0; i < 1; i++) { @@ -782,17 +698,7 @@ -------------------------------- 74 >for ([nameMA = "noName", - ~~~~~ => Pos: (2418 to 2422) SpanInfo: {"start":2423,"length":166} - >[nameMA = "noName", - > [ - > primarySkillA = "primary", - > secondarySkillA = "secondary" - > ] = ["none", "none"] - > ] = multiRobotA, i = 0 - >:=> (line 74, col 5) to (line 79, col 26) -74 >for ([nameMA = "noName", - - ~~~~~~~~~~~~~~~~~~~~ => Pos: (2423 to 2442) SpanInfo: {"start":2424,"length":17} + ~~~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (2418 to 2442) SpanInfo: {"start":2424,"length":17} >nameMA = "noName" >:=> (line 74, col 6) to (line 74, col 23) -------------------------------- @@ -858,17 +764,7 @@ -------------------------------- 82 >for ([nameMA = "noName", - ~~~~~ => Pos: (2632 to 2636) SpanInfo: {"start":2637,"length":150} - >[nameMA = "noName", - > [ - > primarySkillA = "primary", - > secondarySkillA = "secondary" - > ] = ["none", "none"] - >] = getMultiRobot(), i = 0 - >:=> (line 82, col 5) to (line 87, col 26) -82 >for ([nameMA = "noName", - - ~~~~~~~~~~~~~~~~~~~~ => Pos: (2637 to 2656) SpanInfo: {"start":2638,"length":17} + ~~~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (2632 to 2656) SpanInfo: {"start":2638,"length":17} >nameMA = "noName" >:=> (line 82, col 6) to (line 82, col 23) -------------------------------- @@ -934,17 +830,7 @@ -------------------------------- 90 >for ([nameMA = "noName", - ~~~~~ => Pos: (2830 to 2834) SpanInfo: {"start":2835,"length":170} - >[nameMA = "noName", - > [ - > primarySkillA = "primary", - > secondarySkillA = "secondary" - > ] = ["none", "none"] - >] = ["trimmer", ["trimming", "edging"]], i = 0 - >:=> (line 90, col 5) to (line 95, col 46) -90 >for ([nameMA = "noName", - - ~~~~~~~~~~~~~~~~~~~~ => Pos: (2835 to 2854) SpanInfo: {"start":2836,"length":17} + ~~~~~~~~~~~~~~~~~~~~~~~~~ => Pos: (2830 to 2854) SpanInfo: {"start":2836,"length":17} >nameMA = "noName" >:=> (line 90, col 6) to (line 90, col 23) -------------------------------- @@ -1010,12 +896,7 @@ -------------------------------- 98 >for ([numberA3 = -1, ...robotAInfo] = robotA, i = 0; i < 1; i++) { - ~~~~~ => Pos: (3048 to 3052) SpanInfo: {"start":3053,"length":46} - >[numberA3 = -1, ...robotAInfo] = robotA, i = 0 - >:=> (line 98, col 5) to (line 98, col 51) -98 >for ([numberA3 = -1, ...robotAInfo] = robotA, i = 0; i < 1; i++) { - - ~~~~~~~~~~~~~~~ => Pos: (3053 to 3067) SpanInfo: {"start":3054,"length":13} + ~~~~~~~~~~~~~~~~~~~~ => Pos: (3048 to 3067) SpanInfo: {"start":3054,"length":13} >numberA3 = -1 >:=> (line 98, col 6) to (line 98, col 19) 98 >for ([numberA3 = -1, ...robotAInfo] = robotA, i = 0; i < 1; i++) { @@ -1053,12 +934,7 @@ -------------------------------- 101>for ([numberA3 = -1, ...robotAInfo] = getRobot(), i = 0; i < 1; i++) { - ~~~~~ => Pos: (3144 to 3148) SpanInfo: {"start":3149,"length":50} - >[numberA3 = -1, ...robotAInfo] = getRobot(), i = 0 - >:=> (line 101, col 5) to (line 101, col 55) -101>for ([numberA3 = -1, ...robotAInfo] = getRobot(), i = 0; i < 1; i++) { - - ~~~~~~~~~~~~~~~ => Pos: (3149 to 3163) SpanInfo: {"start":3150,"length":13} + ~~~~~~~~~~~~~~~~~~~~ => Pos: (3144 to 3163) SpanInfo: {"start":3150,"length":13} >numberA3 = -1 >:=> (line 101, col 6) to (line 101, col 19) 101>for ([numberA3 = -1, ...robotAInfo] = getRobot(), i = 0; i < 1; i++) { @@ -1096,12 +972,7 @@ -------------------------------- 104>for ([numberA3 = -1, ...robotAInfo] = [2, "trimmer", "trimming"], i = 0; i < 1; i++) { - ~~~~~ => Pos: (3244 to 3248) SpanInfo: {"start":3249,"length":73} - >[numberA3 = -1, ...robotAInfo] = [2, "trimmer", "trimming"], i = 0 - >:=> (line 104, col 5) to (line 104, col 78) -104>for ([numberA3 = -1, ...robotAInfo] = [2, "trimmer", "trimming"], i = 0; i < 1; i++) { - - ~~~~~~~~~~~~~~~ => Pos: (3249 to 3263) SpanInfo: {"start":3250,"length":13} + ~~~~~~~~~~~~~~~~~~~~ => Pos: (3244 to 3263) SpanInfo: {"start":3250,"length":13} >numberA3 = -1 >:=> (line 104, col 6) to (line 104, col 19) 104>for ([numberA3 = -1, ...robotAInfo] = [2, "trimmer", "trimming"], i = 0; i < 1; i++) { diff --git a/tests/baselines/reference/bpSpan_for.baseline b/tests/baselines/reference/bpSpan_for.baseline index 7fd6ba4c858..46214f6e3b1 100644 --- a/tests/baselines/reference/bpSpan_for.baseline +++ b/tests/baselines/reference/bpSpan_for.baseline @@ -220,12 +220,7 @@ -------------------------------- 32 >for (i = 0, j = 20; j < 20, i < 20; j++) { - ~~~~~ => Pos: (351 to 355) SpanInfo: {"start":356,"length":13} - >i = 0, j = 20 - >:=> (line 32, col 5) to (line 32, col 18) -32 >for (i = 0, j = 20; j < 20, i < 20; j++) { - - ~~~~~~ => Pos: (356 to 361) SpanInfo: {"start":356,"length":5} + ~~~~~~~~~~~ => Pos: (351 to 361) SpanInfo: {"start":356,"length":5} >i = 0 >:=> (line 32, col 5) to (line 32, col 10) 32 >for (i = 0, j = 20; j < 20, i < 20; j++) {