Merge pull request #1208 from Microsoft/indentation_nested_scopes

Fix indentation when multiple nested scopes are involved

tests/cases/fourslash/formattingNestedScopes.ts

@@ -0,0 +1,27 @@
+/// <reference path='fourslash.ts'/>
+
+/////*1*/        module      My.App      {
+/////*2*/export      var appModule =      angular.module("app", [
+/////*3*/            ]).config([() =>            {
+/////*4*/                        configureStates
+/////*5*/($stateProvider);
+/////*6*/}]).run(My.App.setup);
+/////*7*/      }
+
+
+format.document()
+
+goTo.marker("1");
+verify.currentLineContentIs("module My.App {");
+goTo.marker("2");
+verify.currentLineContentIs("    export var appModule = angular.module(\"app\", [");
+goTo.marker("3");
+verify.currentLineContentIs("    ]).config([() => {");
+goTo.marker("4");
+verify.currentLineContentIs("        configureStates");
+goTo.marker("5");
+verify.currentLineContentIs("            ($stateProvider);");
+goTo.marker("6");
+verify.currentLineContentIs("    }]).run(My.App.setup);");
+goTo.marker("7");
+verify.currentLineContentIs("}");

tests/cases/fourslash/smartIndentInCallExpressions.ts

@@ -0,0 +1,12 @@
+/// <reference path='fourslash.ts'/>
+
+////module My.App {
+////    export var appModule = angular.module("app", [
+////    ]).config([() => {
+////        configureStates/*1*/($stateProvider);
+////    }]).run(My.App.setup);
+////}
+
+goTo.marker("1")
+edit.insert("\n");
+verify.indentationIs(12); // 4 (module block) + 4 (function block) + 4 (call expression)