Merge pull request #2303 from Microsoft/smartIndentInIncompleteForLikeStatements

added for* statements to isCompletedNode

Author: vladima

src/services/formatting/smartIndenter.ts

@@ -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:

tests/cases/fourslash/smartIndentStatementFor.ts

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

tests/cases/fourslash/smartIndentStatementForIn.ts

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

tests/cases/fourslash/smartIndentStatementForOf.ts

@@ -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);