Merge pull request #1437 from Microsoft/formatting_conditionals

conditionals are now introduce indentation scope

src/services/smartIndenter.ts

@@ -342,6 +342,7 @@ module ts.formatting {
                 case SyntaxKind.VariableDeclaration:
                 case SyntaxKind.ExportAssignment:
                 case SyntaxKind.ReturnStatement:
+                case SyntaxKind.ConditionalExpression:
                     return true;
             }
             return false;