Skip to content

Commit efcf0e6

Browse files
vladimavladima
committed
introduce CaseBlock as a block-scoped container for switch statements
1 parent f747e5a commit efcf0e6

22 files changed

Lines changed: 389 additions & 187 deletions

‎src/compiler/binder.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -534,7 +534,7 @@ module ts {
534534
case SyntaxKind.ForStatement:
535535
case SyntaxKind.ForInStatement:
536536
case SyntaxKind.ForOfStatement:
537-
case SyntaxKind.SwitchStatement:
537+
case SyntaxKind.CaseBlock:
538538
bindChildren(node, 0, /*isBlockScopeContainer*/ true);
539539
break;
540540
default:

‎src/compiler/checker.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9031,7 +9031,7 @@ module ts {
90319031
var hasDuplicateDefaultClause = false;
90329032

90339033
var expressionType = checkExpression(node.expression);
9034-
forEach(node.clauses, clause => {
9034+
forEach(node.caseBlock.clauses, clause => {
90359035
// Grammar check for duplicate default clauses, skip if we already report duplicate default clause
90369036
if (clause.kind === SyntaxKind.DefaultClause && !hasDuplicateDefaultClause) {
90379037
if (firstDefaultClause === undefined) {
@@ -10147,6 +10147,7 @@ module ts {
1014710147
case SyntaxKind.BreakStatement:
1014810148
case SyntaxKind.ReturnStatement:
1014910149
case SyntaxKind.SwitchStatement:
10150+
case SyntaxKind.CaseBlock:
1015010151
case SyntaxKind.CaseClause:
1015110152
case SyntaxKind.DefaultClause:
1015210153
case SyntaxKind.LabeledStatement:

‎src/compiler/emitter.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3541,10 +3541,10 @@ module ts {
35413541
write(" ");
35423542
emitToken(SyntaxKind.OpenBraceToken, endPos);
35433543
increaseIndent();
3544-
emitLines(node.clauses);
3544+
emitLines(node.caseBlock.clauses);
35453545
decreaseIndent();
35463546
writeLine();
3547-
emitToken(SyntaxKind.CloseBraceToken, node.clauses.end);
3547+
emitToken(SyntaxKind.CloseBraceToken, node.caseBlock.clauses.end);
35483548
}
35493549

35503550
function nodeStartPositionsAreOnSameLine(node1: Node, node2: Node) {
@@ -3938,7 +3938,7 @@ module ts {
39383938
}
39393939
switch (current.kind) {
39403940
case SyntaxKind.SourceFile:
3941-
case SyntaxKind.SwitchKeyword:
3941+
case SyntaxKind.CaseBlock:
39423942
case SyntaxKind.CatchClause:
39433943
case SyntaxKind.ModuleDeclaration:
39443944
case SyntaxKind.ForStatement:

‎src/compiler/parser.ts‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,9 @@ module ts {
209209
visitNode(cbNode, (<WithStatement>node).statement);
210210
case SyntaxKind.SwitchStatement:
211211
return visitNode(cbNode, (<SwitchStatement>node).expression) ||
212-
visitNodes(cbNodes, (<SwitchStatement>node).clauses);
212+
visitNode(cbNode, (<SwitchStatement>node).caseBlock);
213+
case SyntaxKind.CaseBlock:
214+
return visitNodes(cbNodes, (<CaseBlock>node).clauses);
213215
case SyntaxKind.CaseClause:
214216
return visitNode(cbNode, (<CaseClause>node).expression) ||
215217
visitNodes(cbNodes, (<CaseClause>node).statements);
@@ -3954,9 +3956,11 @@ module ts {
39543956
parseExpected(SyntaxKind.OpenParenToken);
39553957
node.expression = allowInAnd(parseExpression);
39563958
parseExpected(SyntaxKind.CloseParenToken);
3959+
var caseBlock = <CaseBlock>createNode(SyntaxKind.CaseBlock, scanner.getStartPos());
39573960
parseExpected(SyntaxKind.OpenBraceToken);
3958-
node.clauses = parseList(ParsingContext.SwitchClauses, /*checkForStrictMode*/ false, parseCaseOrDefaultClause);
3961+
caseBlock.clauses = parseList(ParsingContext.SwitchClauses, /*checkForStrictMode*/ false, parseCaseOrDefaultClause);
39593962
parseExpected(SyntaxKind.CloseBraceToken);
3963+
node.caseBlock = finishNode(caseBlock);
39603964
return finishNode(node);
39613965
}
39623966

‎src/compiler/types.ts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,7 @@ module ts {
233233
EnumDeclaration,
234234
ModuleDeclaration,
235235
ModuleBlock,
236+
CaseBlock,
236237
ImportEqualsDeclaration,
237238
ImportDeclaration,
238239
ImportClause,
@@ -790,6 +791,10 @@ module ts {
790791

791792
export interface SwitchStatement extends Statement {
792793
expression: Expression;
794+
caseBlock: CaseBlock;
795+
}
796+
797+
export interface CaseBlock extends Node {
793798
clauses: NodeArray<CaseOrDefaultClause>;
794799
}
795800

‎src/compiler/utilities.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -376,6 +376,7 @@ module ts {
376376
switch (node.kind) {
377377
case SyntaxKind.ReturnStatement:
378378
return visitor(<ReturnStatement>node);
379+
case SyntaxKind.CaseBlock:
379380
case SyntaxKind.Block:
380381
case SyntaxKind.IfStatement:
381382
case SyntaxKind.DoStatement:

‎src/services/breakpoints.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -416,8 +416,8 @@ module ts.BreakpointResolver {
416416
var classDeclaration = <ClassDeclaration>node.parent;
417417
return spanInNodeIfStartsOnSameLine(findPrecedingToken(node.pos, sourceFile, node.parent), classDeclaration.members.length ? classDeclaration.members[0] : classDeclaration.getLastToken(sourceFile));
418418

419-
case SyntaxKind.SwitchStatement:
420-
return spanInNodeIfStartsOnSameLine(node.parent, (<SwitchStatement>node.parent).clauses[0]);
419+
case SyntaxKind.CaseBlock:
420+
return spanInNodeIfStartsOnSameLine(node.parent.parent, (<CaseBlock>node.parent).clauses[0]);
421421
}
422422

423423
// Default to parent node
@@ -447,10 +447,10 @@ module ts.BreakpointResolver {
447447
case SyntaxKind.CatchClause:
448448
return spanInNode((<Block>node.parent).statements[(<Block>node.parent).statements.length - 1]);;
449449

450-
case SyntaxKind.SwitchStatement:
450+
case SyntaxKind.CaseBlock:
451451
// breakpoint in last statement of the last clause
452-
var switchStatement = <SwitchStatement>node.parent;
453-
var lastClause = switchStatement.clauses[switchStatement.clauses.length - 1];
452+
var caseBlock = <CaseBlock>node.parent;
453+
var lastClause = caseBlock.clauses[caseBlock.clauses.length - 1];
454454
if (lastClause) {
455455
return spanInNode(lastClause.statements[lastClause.statements.length - 1]);
456456
}

‎src/services/formatting/rules.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -541,7 +541,7 @@ module ts.formatting {
541541

542542
switch (node.kind) {
543543
case SyntaxKind.Block:
544-
case SyntaxKind.SwitchStatement:
544+
case SyntaxKind.CaseBlock:
545545
case SyntaxKind.ObjectLiteralExpression:
546546
case SyntaxKind.ModuleBlock:
547547
return true;

‎src/services/formatting/smartIndenter.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ module ts.formatting {
357357
case SyntaxKind.ModuleBlock:
358358
case SyntaxKind.ObjectLiteralExpression:
359359
case SyntaxKind.TypeLiteral:
360-
case SyntaxKind.SwitchStatement:
360+
case SyntaxKind.CaseBlock:
361361
case SyntaxKind.DefaultClause:
362362
case SyntaxKind.CaseClause:
363363
case SyntaxKind.ParenthesizedExpression:
@@ -431,7 +431,7 @@ module ts.formatting {
431431
case SyntaxKind.ObjectLiteralExpression:
432432
case SyntaxKind.Block:
433433
case SyntaxKind.ModuleBlock:
434-
case SyntaxKind.SwitchStatement:
434+
case SyntaxKind.CaseBlock:
435435
return nodeEndsWith(n, SyntaxKind.CloseBraceToken, sourceFile);
436436
case SyntaxKind.CatchClause:
437437
return isCompletedNode((<CatchClause>n).block, sourceFile);

‎src/services/outliningElementsCollector.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ module ts {
104104
case SyntaxKind.InterfaceDeclaration:
105105
case SyntaxKind.EnumDeclaration:
106106
case SyntaxKind.ObjectLiteralExpression:
107-
case SyntaxKind.SwitchStatement:
107+
case SyntaxKind.CaseBlock:
108108
var openBrace = findChildOfKind(n, SyntaxKind.OpenBraceToken, sourceFile);
109109
var closeBrace = findChildOfKind(n, SyntaxKind.CloseBraceToken, sourceFile);
110110
addOutliningSpan(n, openBrace, closeBrace, autoCollapse(n));

0 commit comments

Comments
 (0)