microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-05 16:38:05 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

added for* statements to isCompletedNode

Browse Source
This commit is contained in:
Vladimir Matveev 2015-03-11 14:03:32 -07:00
parent 76dcfb660b
commit 4b955ee91a
4 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/services/formatting/smartIndenter.ts
View File

@ -461,6 +461,12 @@ module ts.formatting {
case SyntaxKind.DefaultClause:
// there is no such thing as terminator token for CaseClause\DefaultClause so for simplicitly always consider them non-completed
return false;
case SyntaxKind.ForStatement:
return isCompletedNode((<ForStatement>n).statement, sourceFile);
case SyntaxKind.ForInStatement:
return isCompletedNode((<ForInStatement>n).statement, sourceFile);
case SyntaxKind.ForOfStatement:
return isCompletedNode((<ForOfStatement>n).statement, sourceFile);
case SyntaxKind.WhileStatement:
return isCompletedNode((<WhileStatement>n).statement, sourceFile);
case SyntaxKind.DoStatement:

5
tests/cases/fourslash/smartIndentStatementFor.ts
View File

@ -5,6 +5,8 @@
//// /*insideStatement*/
//// }
//// /*afterStatement*/
//// for (var i = 0;;)
//// /*insideStatement2*/
////}
goTo.marker('insideStatement');
@ -12,3 +14,6 @@ verify.indentationIs(8);
goTo.marker('afterStatement');
verify.indentationIs(4);
goTo.marker('insideStatement2');
verify.indentationIs(8);

5
tests/cases/fourslash/smartIndentStatementForIn.ts
View File

@ -6,6 +6,8 @@
//// /*insideStatement*/
//// }
//// /*afterStatement*/
//// for (var i in [])
//// /*insideStatement2*/
////}
goTo.marker('insideStatement');
@ -13,3 +15,6 @@ verify.indentationIs(8);
goTo.marker('afterStatement');
verify.indentationIs(4);
goTo.marker('insideStatement2');
verify.indentationIs(8);

20
tests/cases/fourslash/smartIndentStatementForOf.ts Normal file
View File

@ -0,0 +1,20 @@
/// <reference path='fourslash.ts'/>
////function Foo() {
//// for (var i of [])
//// {
//// /*insideStatement*/
//// }
//// /*afterStatement*/
//// for (var i of [])
//// /*insideStatement2*/
////}
goTo.marker('insideStatement');
verify.indentationIs(8);
goTo.marker('afterStatement');
verify.indentationIs(4);
goTo.marker('insideStatement2');
verify.indentationIs(8);