maxmustermann/TypeScript
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Emit case clause statements on the same line if that's how they were written in source.

Browse source
This commit is contained in:
Cyrus Najmabadi 2014-11-03 17:15:14 -08:00
parent 296391619e
commit ecd31b6f6f
7 changed files with 282 additions and 293 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/compiler/emitter.ts
View file

@ -1351,6 +1351,10 @@ module ts {
emitToken(SyntaxKind.CloseBraceToken, node.clauses.end);
}
function isOnSameLine(node1: Node, node2: Node) {
return getLineOfLocalPosition(skipTrivia(currentSourceFile.text, node1.pos)) === getLineOfLocalPosition(skipTrivia(currentSourceFile.text, node2.pos));
}
function emitCaseOrDefaultClause(node: CaseOrDefaultClause) {
if (node.kind === SyntaxKind.CaseClause) {
write("case ");
@ -1360,9 +1364,16 @@ module ts {
else {
write("default:");
}
increaseIndent();
emitLines(node.statements);
decreaseIndent();
if (node.statements.length === 1 && isOnSameLine(node, node.statements[0])) {
write(" ");
emit(node.statements[0]);
}
else {
increaseIndent();
emitLines(node.statements);
decreaseIndent();
}
}
function emitThrowStatement(node: ThrowStatement) {

29
tests/baselines/reference/sourceMapValidationStatements.js
View file

@ -136,22 +136,19 @@ function f() {
z = 10;
}
switch (obj.z) {
case 0:
{
x++;
break;
}
case 1:
{
x--;
break;
}
default:
{
x *= 2;
x = 50;
break;
}
case 0: {
x++;
break;
}
case 1: {
x--;
break;
}
default: {
x *= 2;
x = 50;
break;
}
}
while (x < 10) {
x++;

2
tests/baselines/reference/sourceMapValidationStatements.js.map
View file

@ -1,2 +1,2 @@
//// [sourceMapValidationStatements.js.map]
{"version":3,"file":"sourceMapValidationStatements.js","sourceRoot":"","sources":["sourceMapValidationStatements.ts"],"names":["f"],"mappings":"AAAA,SAAS,CAAC;IACNA,IAAIA,CAACA,CAACA;IACNA,IAAIA,CAACA,GAAGA,CAACA,CAACA;IACVA,GAAGA,CAACA,CAACA,GAAGA,CAACA,CAACA,GAAGA,CAACA,EAAEA,CAACA,GAAGA,EAAEA,EAAEA,CAACA,EAAEA,EAAEA,CAACA;QAC1BA,CAACA,IAAIA,CAACA,CAACA;QACPA,CAACA,IAAIA,CAACA,CAACA;IACXA,CAACA;IACDA,EAAEA,CAACA,CAACA,CAACA,GAAGA,EAAEA,CAACA,CAACA,CAACA;QACTA,CAACA,IAAIA,CAACA,CAACA;IACXA,CAACA;IAACA,IAAIA,CAACA,CAACA;QACJA,CAACA,IAAIA,EAAEA,CAACA;QACRA,CAACA,EAAEA,CAACA;IACRA,CAACA;IACDA,IAAIA,CAACA,GAAGA;QACJA,CAACA;QACDA,CAACA;QACDA,CAACA;KACJA,CAACA;IACFA,IAAIA,GAAGA,GAAGA;QACNA,CAACA,EAAEA,CAACA;QACJA,CAACA,EAAEA,OAAOA;KACbA,CAACA;IACFA,GAAGA,CAACA,CAACA,GAAGA,CAACA,CAACA,IAAIA,CAACA,CAACA,CAACA,CAACA;QACdA,GAAGA,CAACA,CAACA,GAAGA,CAACA,CAACA,CAACA,CAACA,CAACA;QACbA,IAAIA,CAACA,GAAGA,EAAEA,CAACA;IACfA,CAACA;IACDA,IAAAA,CAACA;QACGA,GAAGA,CAACA,CAACA,GAAGA,MAAMA,CAACA;IACnBA,CAAEA;IAAAA,KAAKA,CAACA,CAACA,CAACA,CAACA,CAATA,CAACA;QACCA,EAAEA,CAACA,CAACA,GAAGA,CAACA,CAACA,GAAGA,EAAEA,CAACA,CAACA,CAACA;YACbA,GAAGA,CAACA,CAACA,GAAGA,EAAEA,CAACA;QACfA,CAACA;QAACA,IAAIA,CAACA,CAACA;YACJA,GAAGA,CAACA,CAACA,GAAGA,KAAKA,CAACA;QAClBA,CAACA;IACLA,CAACA;IACDA,IAAAA,CAACA;QACGA,MAAMA,IAAIA,KAAKA,EAAEA,CAACA;IACtBA,CAAEA;IAAAA,KAAKA,CAACA,CAACA,EAAEA,CAACA,CAAVA,CAACA;QACCA,IAAIA,CAACA,GAAGA,EAAEA,CAACA;IACfA,CAACA;YAACA,CAACA;QACCA,CAACA,GAAGA,EAAEA,CAACA;IACXA,CAACA;IACDA,MAAMA,GAAGA,EAAEA,CAACA;QACRA,CAACA,GAAGA,CAACA,CAACA;QACNA,CAACA,GAAGA,EAAEA,CAACA;IACXA,CAACA;IACDA,MAAMA,CAACA,CAACA,GAAGA,CAACA,CAACA,CAACA,CAACA,CAACA;QACZA,KAAKA,CAACA;YAAEA,CAACA;gBACLA,CAACA,EAAEA,CAACA;gBACJA,KAAKA,CAACA;YAEVA,CAACA;QACDA,KAAKA,CAACA;YAAEA,CAACA;gBACLA,CAACA,EAAEA,CAACA;gBACJA,KAAKA,CAACA;YAEVA,CAACA;QACDA;YAASA,CAACA;gBACNA,CAACA,IAAIA,CAACA,CAACA;gBACPA,CAACA,GAAGA,EAAEA,CAACA;gBACPA,KAAKA,CAACA;YAEVA,CAACA;IACLA,CAACA;IACDA,OAAOA,CAACA,GAAGA,EAAEA,EAAEA,CAACA;QACZA,CAACA,EAAEA,CAACA;IACRA,CAACA;IACDA,GAAGA,CAACA;QACAA,CAACA,EAAEA,CAACA;IACRA,CAACA,QAAQA,CAACA,GAAGA,CAACA,EAACA;IACfA,CAACA,GAAGA,CAACA,CAACA;IACNA,IAAIA,CAACA,GAAGA,CAACA,CAACA,IAAIA,CAACA,CAACA,GAAGA,CAACA,GAAGA,CAACA,GAAGA,CAACA,GAAGA,CAACA,CAACA;IACjCA,CAACA,CAACA,IAAIA,CAACA,CAACA,GAAGA,CAACA,GAAGA,CAACA,GAAGA,CAACA,GAAGA,CAACA,CAACA;IACzBA,CAACA,KAAKA,CAACA,CAACA;IACRA,CAACA,GAAGA,CAACA,GAAGA,EAAEA,CAACA;IACXA,IAAIA,CAACA,GAAGA,CAACA,CAACA;IACVA,MAAMA,CAACA;AACXA,CAACA;AACD,IAAI,CAAC,GAAG;IACJ,IAAI,CAAC,GAAG,EAAE,CAAC;IACX,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;AACd,CAAC,CAAC;AACF,CAAC,EAAE,CAAC"}
{"version":3,"file":"sourceMapValidationStatements.js","sourceRoot":"","sources":["sourceMapValidationStatements.ts"],"names":["f"],"mappings":"AAAA,SAAS,CAAC;IACNA,IAAIA,CAACA,CAACA;IACNA,IAAIA,CAACA,GAAGA,CAACA,CAACA;IACVA,GAAGA,CAACA,CAACA,GAAGA,CAACA,CAACA,GAAGA,CAACA,EAAEA,CAACA,GAAGA,EAAEA,EAAEA,CAACA,EAAEA,EAAEA,CAACA;QAC1BA,CAACA,IAAIA,CAACA,CAACA;QACPA,CAACA,IAAIA,CAACA,CAACA;IACXA,CAACA;IACDA,EAAEA,CAACA,CAACA,CAACA,GAAGA,EAAEA,CAACA,CAACA,CAACA;QACTA,CAACA,IAAIA,CAACA,CAACA;IACXA,CAACA;IAACA,IAAIA,CAACA,CAACA;QACJA,CAACA,IAAIA,EAAEA,CAACA;QACRA,CAACA,EAAEA,CAACA;IACRA,CAACA;IACDA,IAAIA,CAACA,GAAGA;QACJA,CAACA;QACDA,CAACA;QACDA,CAACA;KACJA,CAACA;IACFA,IAAIA,GAAGA,GAAGA;QACNA,CAACA,EAAEA,CAACA;QACJA,CAACA,EAAEA,OAAOA;KACbA,CAACA;IACFA,GAAGA,CAACA,CAACA,GAAGA,CAACA,CAACA,IAAIA,CAACA,CAACA,CAACA,CAACA;QACdA,GAAGA,CAACA,CAACA,GAAGA,CAACA,CAACA,CAACA,CAACA,CAACA;QACbA,IAAIA,CAACA,GAAGA,EAAEA,CAACA;IACfA,CAACA;IACDA,IAAAA,CAACA;QACGA,GAAGA,CAACA,CAACA,GAAGA,MAAMA,CAACA;IACnBA,CAAEA;IAAAA,KAAKA,CAACA,CAACA,CAACA,CAACA,CAATA,CAACA;QACCA,EAAEA,CAACA,CAACA,GAAGA,CAACA,CAACA,GAAGA,EAAEA,CAACA,CAACA,CAACA;YACbA,GAAGA,CAACA,CAACA,GAAGA,EAAEA,CAACA;QACfA,CAACA;QAACA,IAAIA,CAACA,CAACA;YACJA,GAAGA,CAACA,CAACA,GAAGA,KAAKA,CAACA;QAClBA,CAACA;IACLA,CAACA;IACDA,IAAAA,CAACA;QACGA,MAAMA,IAAIA,KAAKA,EAAEA,CAACA;IACtBA,CAAEA;IAAAA,KAAKA,CAACA,CAACA,EAAEA,CAACA,CAAVA,CAACA;QACCA,IAAIA,CAACA,GAAGA,EAAEA,CAACA;IACfA,CAACA;YAACA,CAACA;QACCA,CAACA,GAAGA,EAAEA,CAACA;IACXA,CAACA;IACDA,MAAMA,GAAGA,EAAEA,CAACA;QACRA,CAACA,GAAGA,CAACA,CAACA;QACNA,CAACA,GAAGA,EAAEA,CAACA;IACXA,CAACA;IACDA,MAAMA,CAACA,CAACA,GAAGA,CAACA,CAACA,CAACA,CAACA,CAACA;QACZA,KAAKA,CAACA,EAAEA,CAACA;YACLA,CAACA,EAAEA,CAACA;YACJA,KAAKA,CAACA;QAEVA,CAACA;QACDA,KAAKA,CAACA,EAAEA,CAACA;YACLA,CAACA,EAAEA,CAACA;YACJA,KAAKA,CAACA;QAEVA,CAACA;QACDA,SAASA,CAACA;YACNA,CAACA,IAAIA,CAACA,CAACA;YACPA,CAACA,GAAGA,EAAEA,CAACA;YACPA,KAAKA,CAACA;QAEVA,CAACA;IACLA,CAACA;IACDA,OAAOA,CAACA,GAAGA,EAAEA,EAAEA,CAACA;QACZA,CAACA,EAAEA,CAACA;IACRA,CAACA;IACDA,GAAGA,CAACA;QACAA,CAACA,EAAEA,CAACA;IACRA,CAACA,QAAQA,CAACA,GAAGA,CAACA,EAACA;IACfA,CAACA,GAAGA,CAACA,CAACA;IACNA,IAAIA,CAACA,GAAGA,CAACA,CAACA,IAAIA,CAACA,CAACA,GAAGA,CAACA,GAAGA,CAACA,GAAGA,CAACA,GAAGA,CAACA,CAACA;IACjCA,CAACA,CAACA,IAAIA,CAACA,CAACA,GAAGA,CAACA,GAAGA,CAACA,GAAGA,CAACA,GAAGA,CAACA,CAACA;IACzBA,CAACA,KAAKA,CAACA,CAACA;IACRA,CAACA,GAAGA,CAACA,GAAGA,EAAEA,CAACA;IACXA,IAAIA,CAACA,GAAGA,CAACA,CAACA;IACVA,MAAMA,CAACA;AACXA,CAACA;AACD,IAAI,CAAC,GAAG;IACJ,IAAI,CAAC,GAAG,EAAE,CAAC;IACX,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;AACd,CAAC,CAAC;AACF,CAAC,EAAE,CAAC"}

493
tests/baselines/reference/sourceMapValidationStatements.sourcemap.txt
View file

@ -936,200 +936,191 @@ sourceFile:sourceMapValidationStatements.ts
9 >Emitted(52, 20) Source(47, 20) + SourceIndex(0) name (f)
10>Emitted(52, 21) Source(47, 21) + SourceIndex(0) name (f)
---
>>> case 0:
>>> case 0: {
1 >^^^^^^^^
2 > ^^^^^
3 > ^
4 > ^^
5 > ^
1 >
>
2 > case
3 > 0
4 > :
5 > {
1 >Emitted(53, 9) Source(48, 9) + SourceIndex(0) name (f)
2 >Emitted(53, 14) Source(48, 14) + SourceIndex(0) name (f)
3 >Emitted(53, 15) Source(48, 15) + SourceIndex(0) name (f)
4 >Emitted(53, 17) Source(48, 17) + SourceIndex(0) name (f)
5 >Emitted(53, 18) Source(48, 18) + SourceIndex(0) name (f)
---
>>> {
>>> x++;
1 >^^^^^^^^^^^^
2 > ^
3 > ^^^^^^^^->
1 >:
2 > {
1 >Emitted(54, 13) Source(48, 17) + SourceIndex(0) name (f)
2 >Emitted(54, 14) Source(48, 18) + SourceIndex(0) name (f)
3 > ^^
4 > ^
5 > ^^^->
1 >
>
2 > x
3 > ++
4 > ;
1 >Emitted(54, 13) Source(49, 13) + SourceIndex(0) name (f)
2 >Emitted(54, 14) Source(49, 14) + SourceIndex(0) name (f)
3 >Emitted(54, 16) Source(49, 16) + SourceIndex(0) name (f)
4 >Emitted(54, 17) Source(49, 17) + SourceIndex(0) name (f)
---
>>> x++;
1->^^^^^^^^^^^^^^^^
2 > ^
3 > ^^
4 > ^
5 > ^^^->
>>> break;
1->^^^^^^^^^^^^
2 > ^^^^^
3 > ^
1->
>
2 > x
3 > ++
4 > ;
1->Emitted(55, 17) Source(49, 13) + SourceIndex(0) name (f)
2 >Emitted(55, 18) Source(49, 14) + SourceIndex(0) name (f)
3 >Emitted(55, 20) Source(49, 16) + SourceIndex(0) name (f)
4 >Emitted(55, 21) Source(49, 17) + SourceIndex(0) name (f)
2 > break
3 > ;
1->Emitted(55, 13) Source(50, 13) + SourceIndex(0) name (f)
2 >Emitted(55, 18) Source(50, 18) + SourceIndex(0) name (f)
3 >Emitted(55, 19) Source(50, 19) + SourceIndex(0) name (f)
---
>>> break;
1->^^^^^^^^^^^^^^^^
2 > ^^^^^
3 > ^
1->
>
2 > break
3 > ;
1->Emitted(56, 17) Source(50, 13) + SourceIndex(0) name (f)
2 >Emitted(56, 22) Source(50, 18) + SourceIndex(0) name (f)
3 >Emitted(56, 23) Source(50, 19) + SourceIndex(0) name (f)
---
>>> }
1 >^^^^^^^^^^^^
2 > ^
3 > ^^^->
>>> }
1 >^^^^^^^^
2 > ^
3 > ^^^^^^^^^->
1 >
>
>
2 > }
1 >Emitted(57, 13) Source(52, 9) + SourceIndex(0) name (f)
2 >Emitted(57, 14) Source(52, 10) + SourceIndex(0) name (f)
2 > }
1 >Emitted(56, 9) Source(52, 9) + SourceIndex(0) name (f)
2 >Emitted(56, 10) Source(52, 10) + SourceIndex(0) name (f)
---
>>> case 1:
>>> case 1: {
1->^^^^^^^^
2 > ^^^^^
3 > ^
4 > ^^
5 > ^
1->
>
2 > case
3 > 1
1->Emitted(58, 9) Source(53, 9) + SourceIndex(0) name (f)
2 >Emitted(58, 14) Source(53, 14) + SourceIndex(0) name (f)
3 >Emitted(58, 15) Source(53, 15) + SourceIndex(0) name (f)
4 > :
5 > {
1->Emitted(57, 9) Source(53, 9) + SourceIndex(0) name (f)
2 >Emitted(57, 14) Source(53, 14) + SourceIndex(0) name (f)
3 >Emitted(57, 15) Source(53, 15) + SourceIndex(0) name (f)
4 >Emitted(57, 17) Source(53, 17) + SourceIndex(0) name (f)
5 >Emitted(57, 18) Source(53, 18) + SourceIndex(0) name (f)
---
>>> {
>>> x--;
1 >^^^^^^^^^^^^
2 > ^
3 > ^^^^^^^^->
1 >:
2 > {
1 >Emitted(59, 13) Source(53, 17) + SourceIndex(0) name (f)
2 >Emitted(59, 14) Source(53, 18) + SourceIndex(0) name (f)
3 > ^^
4 > ^
5 > ^^^->
1 >
>
2 > x
3 > --
4 > ;
1 >Emitted(58, 13) Source(54, 13) + SourceIndex(0) name (f)
2 >Emitted(58, 14) Source(54, 14) + SourceIndex(0) name (f)
3 >Emitted(58, 16) Source(54, 16) + SourceIndex(0) name (f)
4 >Emitted(58, 17) Source(54, 17) + SourceIndex(0) name (f)
---
>>> x--;
1->^^^^^^^^^^^^^^^^
2 > ^
3 > ^^
4 > ^
5 > ^^^->
>>> break;
1->^^^^^^^^^^^^
2 > ^^^^^
3 > ^
1->
>
2 > x
3 > --
4 > ;
1->Emitted(60, 17) Source(54, 13) + SourceIndex(0) name (f)
2 >Emitted(60, 18) Source(54, 14) + SourceIndex(0) name (f)
3 >Emitted(60, 20) Source(54, 16) + SourceIndex(0) name (f)
4 >Emitted(60, 21) Source(54, 17) + SourceIndex(0) name (f)
2 > break
3 > ;
1->Emitted(59, 13) Source(55, 13) + SourceIndex(0) name (f)
2 >Emitted(59, 18) Source(55, 18) + SourceIndex(0) name (f)
3 >Emitted(59, 19) Source(55, 19) + SourceIndex(0) name (f)
---
>>> break;
1->^^^^^^^^^^^^^^^^
2 > ^^^^^
3 > ^
1->
>
2 > break
3 > ;
1->Emitted(61, 17) Source(55, 13) + SourceIndex(0) name (f)
2 >Emitted(61, 22) Source(55, 18) + SourceIndex(0) name (f)
3 >Emitted(61, 23) Source(55, 19) + SourceIndex(0) name (f)
---
>>> }
1 >^^^^^^^^^^^^
2 > ^
3 > ^^^^->
>>> }
1 >^^^^^^^^
2 > ^
3 > ^^^^^^^^^^->
1 >
>
>
2 > }
1 >Emitted(62, 13) Source(57, 9) + SourceIndex(0) name (f)
2 >Emitted(62, 14) Source(57, 10) + SourceIndex(0) name (f)
2 > }
1 >Emitted(60, 9) Source(57, 9) + SourceIndex(0) name (f)
2 >Emitted(60, 10) Source(57, 10) + SourceIndex(0) name (f)
---
>>> default:
>>> default: {
1->^^^^^^^^
2 > ^^^^^^->
2 > ^^^^^^^^^
3 > ^
4 > ^^->
1->
>
1->Emitted(63, 9) Source(58, 9) + SourceIndex(0) name (f)
2 > default:
3 > {
1->Emitted(61, 9) Source(58, 9) + SourceIndex(0) name (f)
2 >Emitted(61, 18) Source(58, 18) + SourceIndex(0) name (f)
3 >Emitted(61, 19) Source(58, 19) + SourceIndex(0) name (f)
---
>>> {
>>> x *= 2;
1->^^^^^^^^^^^^
2 > ^
3 > ^^^^^^^^^^^->
1->default:
2 > {
1->Emitted(64, 13) Source(58, 18) + SourceIndex(0) name (f)
2 >Emitted(64, 14) Source(58, 19) + SourceIndex(0) name (f)
---
>>> x *= 2;
1->^^^^^^^^^^^^^^^^
2 > ^
3 > ^^^^
4 > ^
5 > ^
6 > ^->
3 > ^^^^
4 > ^
5 > ^
6 > ^->
1->
>
2 > x
3 > *=
4 > 2
5 > ;
1->Emitted(65, 17) Source(59, 13) + SourceIndex(0) name (f)
2 >Emitted(65, 18) Source(59, 14) + SourceIndex(0) name (f)
3 >Emitted(65, 22) Source(59, 18) + SourceIndex(0) name (f)
4 >Emitted(65, 23) Source(59, 19) + SourceIndex(0) name (f)
5 >Emitted(65, 24) Source(59, 20) + SourceIndex(0) name (f)
2 > x
3 > *=
4 > 2
5 > ;
1->Emitted(62, 13) Source(59, 13) + SourceIndex(0) name (f)
2 >Emitted(62, 14) Source(59, 14) + SourceIndex(0) name (f)
3 >Emitted(62, 18) Source(59, 18) + SourceIndex(0) name (f)
4 >Emitted(62, 19) Source(59, 19) + SourceIndex(0) name (f)
5 >Emitted(62, 20) Source(59, 20) + SourceIndex(0) name (f)
---
>>> x = 50;
1->^^^^^^^^^^^^^^^^
2 > ^
3 > ^^^
4 > ^^
5 > ^
>>> x = 50;
1->^^^^^^^^^^^^
2 > ^
3 > ^^^
4 > ^^
5 > ^
1->
>
2 > x
3 > =
4 > 50
5 > ;
1->Emitted(66, 17) Source(60, 13) + SourceIndex(0) name (f)
2 >Emitted(66, 18) Source(60, 14) + SourceIndex(0) name (f)
3 >Emitted(66, 21) Source(60, 17) + SourceIndex(0) name (f)
4 >Emitted(66, 23) Source(60, 19) + SourceIndex(0) name (f)
5 >Emitted(66, 24) Source(60, 20) + SourceIndex(0) name (f)
2 > x
3 > =
4 > 50
5 > ;
1->Emitted(63, 13) Source(60, 13) + SourceIndex(0) name (f)
2 >Emitted(63, 14) Source(60, 14) + SourceIndex(0) name (f)
3 >Emitted(63, 17) Source(60, 17) + SourceIndex(0) name (f)
4 >Emitted(63, 19) Source(60, 19) + SourceIndex(0) name (f)
5 >Emitted(63, 20) Source(60, 20) + SourceIndex(0) name (f)
---
>>> break;
1 >^^^^^^^^^^^^^^^^
2 > ^^^^^
3 > ^
>>> break;
1 >^^^^^^^^^^^^
2 > ^^^^^
3 > ^
1 >
>
2 > break
3 > ;
1 >Emitted(67, 17) Source(61, 13) + SourceIndex(0) name (f)
2 >Emitted(67, 22) Source(61, 18) + SourceIndex(0) name (f)
3 >Emitted(67, 23) Source(61, 19) + SourceIndex(0) name (f)
2 > break
3 > ;
1 >Emitted(64, 13) Source(61, 13) + SourceIndex(0) name (f)
2 >Emitted(64, 18) Source(61, 18) + SourceIndex(0) name (f)
3 >Emitted(64, 19) Source(61, 19) + SourceIndex(0) name (f)
---
>>> }
1 >^^^^^^^^^^^^
2 > ^
>>> }
1 >^^^^^^^^
2 > ^
1 >
>
>
2 > }
1 >Emitted(68, 13) Source(63, 9) + SourceIndex(0) name (f)
2 >Emitted(68, 14) Source(63, 10) + SourceIndex(0) name (f)
2 > }
1 >Emitted(65, 9) Source(63, 9) + SourceIndex(0) name (f)
2 >Emitted(65, 10) Source(63, 10) + SourceIndex(0) name (f)
---
>>> }
1 >^^^^
@ -1138,8 +1129,8 @@ sourceFile:sourceMapValidationStatements.ts
1 >
>
2 > }
1 >Emitted(69, 5) Source(64, 5) + SourceIndex(0) name (f)
2 >Emitted(69, 6) Source(64, 6) + SourceIndex(0) name (f)
1 >Emitted(66, 5) Source(64, 5) + SourceIndex(0) name (f)
2 >Emitted(66, 6) Source(64, 6) + SourceIndex(0) name (f)
---
>>> while (x < 10) {
1->^^^^
@ -1157,13 +1148,13 @@ sourceFile:sourceMapValidationStatements.ts
5 > 10
6 > )
7 > {
1->Emitted(70, 5) Source(65, 5) + SourceIndex(0) name (f)
2 >Emitted(70, 12) Source(65, 12) + SourceIndex(0) name (f)
3 >Emitted(70, 13) Source(65, 13) + SourceIndex(0) name (f)
4 >Emitted(70, 16) Source(65, 16) + SourceIndex(0) name (f)
5 >Emitted(70, 18) Source(65, 18) + SourceIndex(0) name (f)
6 >Emitted(70, 20) Source(65, 20) + SourceIndex(0) name (f)
7 >Emitted(70, 21) Source(65, 21) + SourceIndex(0) name (f)
1->Emitted(67, 5) Source(65, 5) + SourceIndex(0) name (f)
2 >Emitted(67, 12) Source(65, 12) + SourceIndex(0) name (f)
3 >Emitted(67, 13) Source(65, 13) + SourceIndex(0) name (f)
4 >Emitted(67, 16) Source(65, 16) + SourceIndex(0) name (f)
5 >Emitted(67, 18) Source(65, 18) + SourceIndex(0) name (f)
6 >Emitted(67, 20) Source(65, 20) + SourceIndex(0) name (f)
7 >Emitted(67, 21) Source(65, 21) + SourceIndex(0) name (f)
---
>>> x++;
1 >^^^^^^^^
@ -1175,10 +1166,10 @@ sourceFile:sourceMapValidationStatements.ts
2 > x
3 > ++
4 > ;
1 >Emitted(71, 9) Source(66, 9) + SourceIndex(0) name (f)
2 >Emitted(71, 10) Source(66, 10) + SourceIndex(0) name (f)
3 >Emitted(71, 12) Source(66, 12) + SourceIndex(0) name (f)
4 >Emitted(71, 13) Source(66, 13) + SourceIndex(0) name (f)
1 >Emitted(68, 9) Source(66, 9) + SourceIndex(0) name (f)
2 >Emitted(68, 10) Source(66, 10) + SourceIndex(0) name (f)
3 >Emitted(68, 12) Source(66, 12) + SourceIndex(0) name (f)
4 >Emitted(68, 13) Source(66, 13) + SourceIndex(0) name (f)
---
>>> }
1 >^^^^
@ -1187,8 +1178,8 @@ sourceFile:sourceMapValidationStatements.ts
1 >
>
2 > }
1 >Emitted(72, 5) Source(67, 5) + SourceIndex(0) name (f)
2 >Emitted(72, 6) Source(67, 6) + SourceIndex(0) name (f)
1 >Emitted(69, 5) Source(67, 5) + SourceIndex(0) name (f)
2 >Emitted(69, 6) Source(67, 6) + SourceIndex(0) name (f)
---
>>> do {
1->^^^^
@ -1199,9 +1190,9 @@ sourceFile:sourceMapValidationStatements.ts
>
2 > do
3 > {
1->Emitted(73, 5) Source(68, 5) + SourceIndex(0) name (f)
2 >Emitted(73, 8) Source(68, 8) + SourceIndex(0) name (f)
3 >Emitted(73, 9) Source(68, 9) + SourceIndex(0) name (f)
1->Emitted(70, 5) Source(68, 5) + SourceIndex(0) name (f)
2 >Emitted(70, 8) Source(68, 8) + SourceIndex(0) name (f)
3 >Emitted(70, 9) Source(68, 9) + SourceIndex(0) name (f)
---
>>> x--;
1->^^^^^^^^
@ -1214,10 +1205,10 @@ sourceFile:sourceMapValidationStatements.ts
2 > x
3 > --
4 > ;
1->Emitted(74, 9) Source(69, 9) + SourceIndex(0) name (f)
2 >Emitted(74, 10) Source(69, 10) + SourceIndex(0) name (f)
3 >Emitted(74, 12) Source(69, 12) + SourceIndex(0) name (f)
4 >Emitted(74, 13) Source(69, 13) + SourceIndex(0) name (f)
1->Emitted(71, 9) Source(69, 9) + SourceIndex(0) name (f)
2 >Emitted(71, 10) Source(69, 10) + SourceIndex(0) name (f)
3 >Emitted(71, 12) Source(69, 12) + SourceIndex(0) name (f)
4 >Emitted(71, 13) Source(69, 13) + SourceIndex(0) name (f)
---
>>> } while (x > 4);
1->^^^^
@ -1235,13 +1226,13 @@ sourceFile:sourceMapValidationStatements.ts
5 > >
6 > 4
7 > )
1->Emitted(75, 5) Source(70, 5) + SourceIndex(0) name (f)
2 >Emitted(75, 6) Source(70, 6) + SourceIndex(0) name (f)
3 >Emitted(75, 14) Source(70, 14) + SourceIndex(0) name (f)
4 >Emitted(75, 15) Source(70, 15) + SourceIndex(0) name (f)
5 >Emitted(75, 18) Source(70, 18) + SourceIndex(0) name (f)
6 >Emitted(75, 19) Source(70, 19) + SourceIndex(0) name (f)
7 >Emitted(75, 21) Source(70, 20) + SourceIndex(0) name (f)
1->Emitted(72, 5) Source(70, 5) + SourceIndex(0) name (f)
2 >Emitted(72, 6) Source(70, 6) + SourceIndex(0) name (f)
3 >Emitted(72, 14) Source(70, 14) + SourceIndex(0) name (f)
4 >Emitted(72, 15) Source(70, 15) + SourceIndex(0) name (f)
5 >Emitted(72, 18) Source(70, 18) + SourceIndex(0) name (f)
6 >Emitted(72, 19) Source(70, 19) + SourceIndex(0) name (f)
7 >Emitted(72, 21) Source(70, 20) + SourceIndex(0) name (f)
---
>>> x = y;
1 >^^^^
@ -1256,11 +1247,11 @@ sourceFile:sourceMapValidationStatements.ts
3 > =
4 > y
5 > ;
1 >Emitted(76, 5) Source(71, 5) + SourceIndex(0) name (f)
2 >Emitted(76, 6) Source(71, 6) + SourceIndex(0) name (f)
3 >Emitted(76, 9) Source(71, 9) + SourceIndex(0) name (f)
4 >Emitted(76, 10) Source(71, 10) + SourceIndex(0) name (f)
5 >Emitted(76, 11) Source(71, 11) + SourceIndex(0) name (f)
1 >Emitted(73, 5) Source(71, 5) + SourceIndex(0) name (f)
2 >Emitted(73, 6) Source(71, 6) + SourceIndex(0) name (f)
3 >Emitted(73, 9) Source(71, 9) + SourceIndex(0) name (f)
4 >Emitted(73, 10) Source(71, 10) + SourceIndex(0) name (f)
5 >Emitted(73, 11) Source(71, 11) + SourceIndex(0) name (f)
---
>>> var z = (x == 1) ? x + 1 : x - 1;
1->^^^^
@ -1300,24 +1291,24 @@ sourceFile:sourceMapValidationStatements.ts
16> -
17> 1
18> ;
1->Emitted(77, 5) Source(72, 5) + SourceIndex(0) name (f)
2 >Emitted(77, 9) Source(72, 9) + SourceIndex(0) name (f)
3 >Emitted(77, 10) Source(72, 10) + SourceIndex(0) name (f)
4 >Emitted(77, 13) Source(72, 13) + SourceIndex(0) name (f)
5 >Emitted(77, 14) Source(72, 14) + SourceIndex(0) name (f)
6 >Emitted(77, 15) Source(72, 15) + SourceIndex(0) name (f)
7 >Emitted(77, 19) Source(72, 19) + SourceIndex(0) name (f)
8 >Emitted(77, 20) Source(72, 20) + SourceIndex(0) name (f)
9 >Emitted(77, 21) Source(72, 21) + SourceIndex(0) name (f)
10>Emitted(77, 24) Source(72, 24) + SourceIndex(0) name (f)
11>Emitted(77, 25) Source(72, 25) + SourceIndex(0) name (f)
12>Emitted(77, 28) Source(72, 28) + SourceIndex(0) name (f)
13>Emitted(77, 29) Source(72, 29) + SourceIndex(0) name (f)
14>Emitted(77, 32) Source(72, 32) + SourceIndex(0) name (f)
15>Emitted(77, 33) Source(72, 33) + SourceIndex(0) name (f)
16>Emitted(77, 36) Source(72, 36) + SourceIndex(0) name (f)
17>Emitted(77, 37) Source(72, 37) + SourceIndex(0) name (f)
18>Emitted(77, 38) Source(72, 38) + SourceIndex(0) name (f)
1->Emitted(74, 5) Source(72, 5) + SourceIndex(0) name (f)
2 >Emitted(74, 9) Source(72, 9) + SourceIndex(0) name (f)
3 >Emitted(74, 10) Source(72, 10) + SourceIndex(0) name (f)
4 >Emitted(74, 13) Source(72, 13) + SourceIndex(0) name (f)
5 >Emitted(74, 14) Source(72, 14) + SourceIndex(0) name (f)
6 >Emitted(74, 15) Source(72, 15) + SourceIndex(0) name (f)
7 >Emitted(74, 19) Source(72, 19) + SourceIndex(0) name (f)
8 >Emitted(74, 20) Source(72, 20) + SourceIndex(0) name (f)
9 >Emitted(74, 21) Source(72, 21) + SourceIndex(0) name (f)
10>Emitted(74, 24) Source(72, 24) + SourceIndex(0) name (f)
11>Emitted(74, 25) Source(72, 25) + SourceIndex(0) name (f)
12>Emitted(74, 28) Source(72, 28) + SourceIndex(0) name (f)
13>Emitted(74, 29) Source(72, 29) + SourceIndex(0) name (f)
14>Emitted(74, 32) Source(72, 32) + SourceIndex(0) name (f)
15>Emitted(74, 33) Source(72, 33) + SourceIndex(0) name (f)
16>Emitted(74, 36) Source(72, 36) + SourceIndex(0) name (f)
17>Emitted(74, 37) Source(72, 37) + SourceIndex(0) name (f)
18>Emitted(74, 38) Source(72, 38) + SourceIndex(0) name (f)
---
>>> (x == 1) ? x + 1 : x - 1;
1 >^^^^
@ -1351,21 +1342,21 @@ sourceFile:sourceMapValidationStatements.ts
13> -
14> 1
15> ;
1 >Emitted(78, 5) Source(73, 5) + SourceIndex(0) name (f)
2 >Emitted(78, 6) Source(73, 6) + SourceIndex(0) name (f)
3 >Emitted(78, 7) Source(73, 7) + SourceIndex(0) name (f)
4 >Emitted(78, 11) Source(73, 11) + SourceIndex(0) name (f)
5 >Emitted(78, 12) Source(73, 12) + SourceIndex(0) name (f)
6 >Emitted(78, 13) Source(73, 13) + SourceIndex(0) name (f)
7 >Emitted(78, 16) Source(73, 16) + SourceIndex(0) name (f)
8 >Emitted(78, 17) Source(73, 17) + SourceIndex(0) name (f)
9 >Emitted(78, 20) Source(73, 20) + SourceIndex(0) name (f)
10>Emitted(78, 21) Source(73, 21) + SourceIndex(0) name (f)
11>Emitted(78, 24) Source(73, 24) + SourceIndex(0) name (f)
12>Emitted(78, 25) Source(73, 25) + SourceIndex(0) name (f)
13>Emitted(78, 28) Source(73, 28) + SourceIndex(0) name (f)
14>Emitted(78, 29) Source(73, 29) + SourceIndex(0) name (f)
15>Emitted(78, 30) Source(73, 30) + SourceIndex(0) name (f)
1 >Emitted(75, 5) Source(73, 5) + SourceIndex(0) name (f)
2 >Emitted(75, 6) Source(73, 6) + SourceIndex(0) name (f)
3 >Emitted(75, 7) Source(73, 7) + SourceIndex(0) name (f)
4 >Emitted(75, 11) Source(73, 11) + SourceIndex(0) name (f)
5 >Emitted(75, 12) Source(73, 12) + SourceIndex(0) name (f)
6 >Emitted(75, 13) Source(73, 13) + SourceIndex(0) name (f)
7 >Emitted(75, 16) Source(73, 16) + SourceIndex(0) name (f)
8 >Emitted(75, 17) Source(73, 17) + SourceIndex(0) name (f)
9 >Emitted(75, 20) Source(73, 20) + SourceIndex(0) name (f)
10>Emitted(75, 21) Source(73, 21) + SourceIndex(0) name (f)
11>Emitted(75, 24) Source(73, 24) + SourceIndex(0) name (f)
12>Emitted(75, 25) Source(73, 25) + SourceIndex(0) name (f)
13>Emitted(75, 28) Source(73, 28) + SourceIndex(0) name (f)
14>Emitted(75, 29) Source(73, 29) + SourceIndex(0) name (f)
15>Emitted(75, 30) Source(73, 30) + SourceIndex(0) name (f)
---
>>> x === 1;
1 >^^^^
@ -1380,11 +1371,11 @@ sourceFile:sourceMapValidationStatements.ts
3 > ===
4 > 1
5 > ;
1 >Emitted(79, 5) Source(74, 5) + SourceIndex(0) name (f)
2 >Emitted(79, 6) Source(74, 6) + SourceIndex(0) name (f)
3 >Emitted(79, 11) Source(74, 11) + SourceIndex(0) name (f)
4 >Emitted(79, 12) Source(74, 12) + SourceIndex(0) name (f)
5 >Emitted(79, 13) Source(74, 13) + SourceIndex(0) name (f)
1 >Emitted(76, 5) Source(74, 5) + SourceIndex(0) name (f)
2 >Emitted(76, 6) Source(74, 6) + SourceIndex(0) name (f)
3 >Emitted(76, 11) Source(74, 11) + SourceIndex(0) name (f)
4 >Emitted(76, 12) Source(74, 12) + SourceIndex(0) name (f)
5 >Emitted(76, 13) Source(74, 13) + SourceIndex(0) name (f)
---
>>> x = z = 40;
1->^^^^
@ -1402,13 +1393,13 @@ sourceFile:sourceMapValidationStatements.ts
5 > =
6 > 40
7 > ;
1->Emitted(80, 5) Source(75, 5) + SourceIndex(0) name (f)
2 >Emitted(80, 6) Source(75, 6) + SourceIndex(0) name (f)
3 >Emitted(80, 9) Source(75, 9) + SourceIndex(0) name (f)
4 >Emitted(80, 10) Source(75, 10) + SourceIndex(0) name (f)
5 >Emitted(80, 13) Source(75, 13) + SourceIndex(0) name (f)
6 >Emitted(80, 15) Source(75, 15) + SourceIndex(0) name (f)
7 >Emitted(80, 16) Source(75, 16) + SourceIndex(0) name (f)
1->Emitted(77, 5) Source(75, 5) + SourceIndex(0) name (f)
2 >Emitted(77, 6) Source(75, 6) + SourceIndex(0) name (f)
3 >Emitted(77, 9) Source(75, 9) + SourceIndex(0) name (f)
4 >Emitted(77, 10) Source(75, 10) + SourceIndex(0) name (f)
5 >Emitted(77, 13) Source(75, 13) + SourceIndex(0) name (f)
6 >Emitted(77, 15) Source(75, 15) + SourceIndex(0) name (f)
7 >Emitted(77, 16) Source(75, 16) + SourceIndex(0) name (f)
---
>>> eval("y");
1 >^^^^
@ -1424,12 +1415,12 @@ sourceFile:sourceMapValidationStatements.ts
4 > "y"
5 > )
6 > ;
1 >Emitted(81, 5) Source(76, 5) + SourceIndex(0) name (f)
2 >Emitted(81, 9) Source(76, 9) + SourceIndex(0) name (f)
3 >Emitted(81, 10) Source(76, 10) + SourceIndex(0) name (f)
4 >Emitted(81, 13) Source(76, 13) + SourceIndex(0) name (f)
5 >Emitted(81, 14) Source(76, 14) + SourceIndex(0) name (f)
6 >Emitted(81, 15) Source(76, 15) + SourceIndex(0) name (f)
1 >Emitted(78, 5) Source(76, 5) + SourceIndex(0) name (f)
2 >Emitted(78, 9) Source(76, 9) + SourceIndex(0) name (f)
3 >Emitted(78, 10) Source(76, 10) + SourceIndex(0) name (f)
4 >Emitted(78, 13) Source(76, 13) + SourceIndex(0) name (f)
5 >Emitted(78, 14) Source(76, 14) + SourceIndex(0) name (f)
6 >Emitted(78, 15) Source(76, 15) + SourceIndex(0) name (f)
---
>>> return;
1 >^^^^
@ -1439,9 +1430,9 @@ sourceFile:sourceMapValidationStatements.ts
>
2 > return
3 > ;
1 >Emitted(82, 5) Source(77, 5) + SourceIndex(0) name (f)
2 >Emitted(82, 11) Source(77, 11) + SourceIndex(0) name (f)
3 >Emitted(82, 12) Source(77, 12) + SourceIndex(0) name (f)
1 >Emitted(79, 5) Source(77, 5) + SourceIndex(0) name (f)
2 >Emitted(79, 11) Source(77, 11) + SourceIndex(0) name (f)
3 >Emitted(79, 12) Source(77, 12) + SourceIndex(0) name (f)
---
>>>}
1 >
@ -1450,8 +1441,8 @@ sourceFile:sourceMapValidationStatements.ts
1 >
>
2 >}
1 >Emitted(83, 1) Source(78, 1) + SourceIndex(0) name (f)
2 >Emitted(83, 2) Source(78, 2) + SourceIndex(0) name (f)
1 >Emitted(80, 1) Source(78, 1) + SourceIndex(0) name (f)
2 >Emitted(80, 2) Source(78, 2) + SourceIndex(0) name (f)
---
>>>var b = function () {
1->
@ -1464,10 +1455,10 @@ sourceFile:sourceMapValidationStatements.ts
2 >var
3 > b
4 > =
1->Emitted(84, 1) Source(79, 1) + SourceIndex(0)
2 >Emitted(84, 5) Source(79, 5) + SourceIndex(0)
3 >Emitted(84, 6) Source(79, 6) + SourceIndex(0)
4 >Emitted(84, 9) Source(79, 9) + SourceIndex(0)
1->Emitted(81, 1) Source(79, 1) + SourceIndex(0)
2 >Emitted(81, 5) Source(79, 5) + SourceIndex(0)
3 >Emitted(81, 6) Source(79, 6) + SourceIndex(0)
4 >Emitted(81, 9) Source(79, 9) + SourceIndex(0)
---
>>> var x = 10;
1->^^^^
@ -1483,12 +1474,12 @@ sourceFile:sourceMapValidationStatements.ts
4 > =
5 > 10
6 > ;
1->Emitted(85, 5) Source(80, 5) + SourceIndex(0)
2 >Emitted(85, 9) Source(80, 9) + SourceIndex(0)
3 >Emitted(85, 10) Source(80, 10) + SourceIndex(0)
4 >Emitted(85, 13) Source(80, 13) + SourceIndex(0)
5 >Emitted(85, 15) Source(80, 15) + SourceIndex(0)
6 >Emitted(85, 16) Source(80, 16) + SourceIndex(0)
1->Emitted(82, 5) Source(80, 5) + SourceIndex(0)
2 >Emitted(82, 9) Source(80, 9) + SourceIndex(0)
3 >Emitted(82, 10) Source(80, 10) + SourceIndex(0)
4 >Emitted(82, 13) Source(80, 13) + SourceIndex(0)
5 >Emitted(82, 15) Source(80, 15) + SourceIndex(0)
6 >Emitted(82, 16) Source(80, 16) + SourceIndex(0)
---
>>> x = x + 1;
1 >^^^^
@ -1506,13 +1497,13 @@ sourceFile:sourceMapValidationStatements.ts
5 > +
6 > 1
7 > ;
1 >Emitted(86, 5) Source(81, 5) + SourceIndex(0)
2 >Emitted(86, 6) Source(81, 6) + SourceIndex(0)
3 >Emitted(86, 9) Source(81, 9) + SourceIndex(0)
4 >Emitted(86, 10) Source(81, 10) + SourceIndex(0)
5 >Emitted(86, 13) Source(81, 13) + SourceIndex(0)
6 >Emitted(86, 14) Source(81, 14) + SourceIndex(0)
7 >Emitted(86, 15) Source(81, 15) + SourceIndex(0)
1 >Emitted(83, 5) Source(81, 5) + SourceIndex(0)
2 >Emitted(83, 6) Source(81, 6) + SourceIndex(0)
3 >Emitted(83, 9) Source(81, 9) + SourceIndex(0)
4 >Emitted(83, 10) Source(81, 10) + SourceIndex(0)
5 >Emitted(83, 13) Source(81, 13) + SourceIndex(0)
6 >Emitted(83, 14) Source(81, 14) + SourceIndex(0)
7 >Emitted(83, 15) Source(81, 15) + SourceIndex(0)
---
>>>};
1 >
@ -1523,9 +1514,9 @@ sourceFile:sourceMapValidationStatements.ts
>
2 >}
3 > ;
1 >Emitted(87, 1) Source(82, 1) + SourceIndex(0)
2 >Emitted(87, 2) Source(82, 2) + SourceIndex(0)
3 >Emitted(87, 3) Source(82, 3) + SourceIndex(0)
1 >Emitted(84, 1) Source(82, 1) + SourceIndex(0)
2 >Emitted(84, 2) Source(82, 2) + SourceIndex(0)
3 >Emitted(84, 3) Source(82, 3) + SourceIndex(0)
---
>>>f();
1->
@ -1538,9 +1529,9 @@ sourceFile:sourceMapValidationStatements.ts
2 >f
3 > ()
4 > ;
1->Emitted(88, 1) Source(83, 1) + SourceIndex(0)
2 >Emitted(88, 2) Source(83, 2) + SourceIndex(0)
3 >Emitted(88, 4) Source(83, 4) + SourceIndex(0)
4 >Emitted(88, 5) Source(83, 5) + SourceIndex(0)
1->Emitted(85, 1) Source(83, 1) + SourceIndex(0)
2 >Emitted(85, 2) Source(83, 2) + SourceIndex(0)
3 >Emitted(85, 4) Source(83, 4) + SourceIndex(0)
4 >Emitted(85, 5) Source(83, 5) + SourceIndex(0)
---
>>>//# sourceMappingURL=sourceMapValidationStatements.js.map

3
tests/baselines/reference/switchAssignmentCompat.js
View file

@ -13,6 +13,5 @@ var Foo = (function () {
return Foo;
})();
switch (0) {
case Foo:
break;
case Foo: break;
}

24
tests/baselines/reference/switchCasesExpressionTypeMismatch.js
View file

@ -25,23 +25,15 @@ var Foo = (function () {
return Foo;
})();
switch (0) {
case Foo:
break;
case "sss":
break;
case 123:
break;
case true:
break;
case Foo: break;
case "sss": break;
case 123: break;
case true: break;
}
var s = 0;
switch (s) {
case Foo:
break;
case "sss":
break;
case 123:
break;
case true:
break;
case Foo: break;
case "sss": break;
case 123: break;
case true: break;
}

7
tests/baselines/reference/switchFallThroughs.js
View file

@ -26,10 +26,9 @@ function R1(index) {
var a = 'a';
return a;
case 3:
case 4:
{
return 'b';
}
case 4: {
return 'b';
}
case 5:
default:
return 'c';