Address code review: fix indentation

Kanchalai Tanglertsampan · Kanchalai Tanglertsampan · commit 8b8c490ff6b5 · 2017-02-08T13:36:19.000-08:00
diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
@@ -1348,7 +1348,9 @@ namespace ts {
                 writeToken(SyntaxKind.OpenBraceToken, node.pos, /*contextNode*/ node);
                 emitBlockStatements(node);
                 // We have to call emitLeadingComments explicitly here because otherwise leading comments of the close brace token will not be emitted
+                increaseIndent();
                 emitLeadingCommentsOfPosition(node.statements.end);
+                decreaseIndent();
                 writeToken(SyntaxKind.CloseBraceToken, node.statements.end, /*contextNode*/ node);
             }
         }
diff --git a/tests/baselines/reference/amdImportAsPrimaryExpression.js b/tests/baselines/reference/amdImportAsPrimaryExpression.js
@@ -26,6 +26,6 @@ define(["require", "exports"], function (require, exports) {
 define(["require", "exports", "./foo_0"], function (require, exports, foo) {
     "use strict";
     if (foo.E1.A === 0) {
-    // Should cause runtime import - interesting optimization possibility, as gets inlined to 0.
+        // Should cause runtime import - interesting optimization possibility, as gets inlined to 0.
     }
 });
diff --git a/tests/baselines/reference/argsInScope.js b/tests/baselines/reference/argsInScope.js
@@ -17,7 +17,7 @@ var C = (function () {
     }
     C.prototype.P = function (ii, j, k) {
         for (var i = 0; i < arguments.length; i++) {
-        // WScript.Echo("param: " + arguments[i]);
+            // WScript.Echo("param: " + arguments[i]);
         }
     };
     return C;
diff --git a/tests/baselines/reference/commentLeadingCloseBrace.js b/tests/baselines/reference/commentLeadingCloseBrace.js
@@ -16,7 +16,7 @@ function ifelse() {
     if (commentedParameters(1, 2)) {
         /*comment1*/
         commentedParameters(3, 4);
-    /*comment2*/
+        /*comment2*/
     }
     else {
         commentedParameters(5, 6);
diff --git a/tests/baselines/reference/commonJSImportAsPrimaryExpression.js b/tests/baselines/reference/commonJSImportAsPrimaryExpression.js
@@ -27,5 +27,5 @@ exports.C1 = C1;
 "use strict";
 var foo = require("./foo_0");
 if (foo.C1.s1) {
-// Should cause runtime import
+    // Should cause runtime import
 }
diff --git a/tests/baselines/reference/duplicateLocalVariable1.js b/tests/baselines/reference/duplicateLocalVariable1.js
@@ -391,7 +391,7 @@ var TestRunner = (function () {
                     }
                 }
                 if (testResult === false) {
-                //console.log(e.message);
+                    //console.log(e.message);
                 }
             }
             if ((testcase.errorMessageRegEx !== undefined) && !exception) {
diff --git a/tests/baselines/reference/jsFileCompilationLetBeingRenamed.js b/tests/baselines/reference/jsFileCompilationLetBeingRenamed.js
@@ -9,6 +9,6 @@ function foo(a) {
 //// [out.js]
 function foo(a) {
     for (var a_1 = 0; a_1 < 10; a_1++) {
-    // do something
+        // do something
     }
 }
diff --git a/tests/baselines/reference/narrowExceptionVariableInCatchClause.js b/tests/baselines/reference/narrowExceptionVariableInCatchClause.js
@@ -27,7 +27,7 @@ function tryCatch() {
 //// [narrowExceptionVariableInCatchClause.js]
 function tryCatch() {
     try {
-    // do stuff...
+        // do stuff...
     }
     catch (err) {
         if (isFooError(err)) {
diff --git a/tests/baselines/reference/noCatchBlock.js b/tests/baselines/reference/noCatchBlock.js
diff --git a/tests/baselines/reference/noCatchBlock.js.map b/tests/baselines/reference/noCatchBlock.js.map
diff --git a/tests/baselines/reference/noCatchBlock.sourcemap.txt b/tests/baselines/reference/noCatchBlock.sourcemap.txt
@@ -12,7 +12,7 @@ sourceFile:noCatchBlock.ts
 1 >
 2 >^^^^
 3 >    ^
-4 >     ^^->
+4 >     ^^^^^^->
 1 >
   >
 2 >try 
@@ -21,14 +21,14 @@ sourceFile:noCatchBlock.ts
 2 >Emitted(1, 5) Source(2, 5) + SourceIndex(0)
 3 >Emitted(1, 6) Source(2, 6) + SourceIndex(0)
 ---
->>>// ...
-1->
-2 >^^^^^^
+>>>    // ...
+1->^^^^
+2 >    ^^^^^^
 1->
   > 
-2 >// ...
-1->Emitted(2, 1) Source(3, 2) + SourceIndex(0)
-2 >Emitted(2, 7) Source(3, 8) + SourceIndex(0)
+2 >    // ...
+1->Emitted(2, 5) Source(3, 2) + SourceIndex(0)
+2 >Emitted(2, 11) Source(3, 8) + SourceIndex(0)
 ---
 >>>}
 1 >
@@ -43,20 +43,20 @@ sourceFile:noCatchBlock.ts
 >>>finally {
 1->^^^^^^^^
 2 >        ^
-3 >         ^^^^^^^^^^^^^^^^->
+3 >         ^^^^^^^^^^^^^^^^^^^^->
 1-> finally 
 2 >        {
 1->Emitted(4, 9) Source(4, 11) + SourceIndex(0)
 2 >Emitted(4, 10) Source(4, 12) + SourceIndex(0)
 ---
->>>// N.B. No 'catch' block
-1->
-2 >^^^^^^^^^^^^^^^^^^^^^^^^
+>>>    // N.B. No 'catch' block
+1->^^^^
+2 >    ^^^^^^^^^^^^^^^^^^^^^^^^
 1->
   > 
-2 >// N.B. No 'catch' block
-1->Emitted(5, 1) Source(5, 2) + SourceIndex(0)
-2 >Emitted(5, 25) Source(5, 26) + SourceIndex(0)
+2 >    // N.B. No 'catch' block
+1->Emitted(5, 5) Source(5, 2) + SourceIndex(0)
+2 >Emitted(5, 29) Source(5, 26) + SourceIndex(0)
 ---
 >>>}
 1 >
diff --git a/tests/baselines/reference/objectRestForOf.js b/tests/baselines/reference/objectRestForOf.js
@@ -37,5 +37,5 @@ for (let _b of array) {
 }
 for (const norest of array.map(a => (Object.assign({}, a, { x: 'a string' })))) {
     [norest.x, norest.y];
-// x is now a string. who knows why.
+    // x is now a string. who knows why.
 }
diff --git a/tests/baselines/reference/parserRealSource14.js b/tests/baselines/reference/parserRealSource14.js
@@ -1011,7 +1011,7 @@ var TypeScript;
                         ctx.path.push(cur);
                     }
                     else {
-                    //logger.log("TODO: Ignoring node because minChar, limChar not better than previous node in stack");
+                        //logger.log("TODO: Ignoring node because minChar, limChar not better than previous node in stack");
                     }
                 }
                 // The AST walker skips comments, but we might be in one, so check the pre/post comments for this node manually
diff --git a/tests/baselines/reference/recursiveReturns.js b/tests/baselines/reference/recursiveReturns.js
@@ -23,7 +23,7 @@ function R1() {
 function R2() { R2(); }
 function R3(n) {
     if (n == 0) {
-    //return;
+        //return;
     }
     else {
         R3(n--);
diff --git a/tests/baselines/reference/sourceMap-SkippedNode.js b/tests/baselines/reference/sourceMap-SkippedNode.js
diff --git a/tests/baselines/reference/sourceMap-SkippedNode.js.map b/tests/baselines/reference/sourceMap-SkippedNode.js.map
diff --git a/tests/baselines/reference/sourceMap-SkippedNode.sourcemap.txt b/tests/baselines/reference/sourceMap-SkippedNode.sourcemap.txt
@@ -12,22 +12,22 @@ sourceFile:sourceMap-SkippedNode.ts
 1 >
 2 >^^^^
 3 >    ^
-4 >     ^^->
+4 >     ^^^^^^->
 1 >
 2 >try 
 3 >    {
 1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
 2 >Emitted(1, 5) Source(1, 5) + SourceIndex(0)
 3 >Emitted(1, 6) Source(1, 6) + SourceIndex(0)
 ---
->>>// ...
-1->
-2 >^^^^^^
+>>>    // ...
+1->^^^^
+2 >    ^^^^^^
 1->
   >
-2 >// ...
-1->Emitted(2, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
+2 >    // ...
+1->Emitted(2, 5) Source(2, 1) + SourceIndex(0)
+2 >Emitted(2, 11) Source(2, 7) + SourceIndex(0)
 ---
 >>>}
 1 >
@@ -42,20 +42,20 @@ sourceFile:sourceMap-SkippedNode.ts
 >>>finally {
 1->^^^^^^^^
 2 >        ^
-3 >         ^^^^^^^^^^^^^^^^->
+3 >         ^^^^^^^^^^^^^^^^^^^^->
 1-> finally 
 2 >        {
 1->Emitted(4, 9) Source(3, 11) + SourceIndex(0)
 2 >Emitted(4, 10) Source(3, 12) + SourceIndex(0)
 ---
->>>// N.B. No 'catch' block
-1->
-2 >^^^^^^^^^^^^^^^^^^^^^^^^
+>>>    // N.B. No 'catch' block
+1->^^^^
+2 >    ^^^^^^^^^^^^^^^^^^^^^^^^
 1->
   >
-2 >// N.B. No 'catch' block
-1->Emitted(5, 1) Source(4, 1) + SourceIndex(0)
-2 >Emitted(5, 25) Source(4, 25) + SourceIndex(0)
+2 >    // N.B. No 'catch' block
+1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
+2 >Emitted(5, 29) Source(4, 25) + SourceIndex(0)
 ---
 >>>}
 1 >

Original file line number	Diff line number	Diff line change
`@@ -1348,7 +1348,9 @@ namespace ts {`
`1348`	`1348`	`writeToken(SyntaxKind.OpenBraceToken, node.pos, /contextNode/ node);`
`1349`	`1349`	`emitBlockStatements(node);`
`1350`	`1350`	`// We have to call emitLeadingComments explicitly here because otherwise leading comments of the close brace token will not be emitted`
	`1351`	`+ increaseIndent();`
`1351`	`1352`	`emitLeadingCommentsOfPosition(node.statements.end);`
	`1353`	`+ decreaseIndent();`
`1352`	`1354`	`writeToken(SyntaxKind.CloseBraceToken, node.statements.end, /contextNode/ node);`
`1353`	`1355`	`}`
`1354`	`1356`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,6 @@ define(["require", "exports"], function (require, exports) {`
`26`	`26`	`define(["require", "exports", "./foo_0"], function (require, exports, foo) {`
`27`	`27`	`"use strict";`
`28`	`28`	`if (foo.E1.A === 0) {`
`29`		`- // Should cause runtime import - interesting optimization possibility, as gets inlined to 0.`
	`29`	`+ // Should cause runtime import - interesting optimization possibility, as gets inlined to 0.`
`30`	`30`	`}`
`31`	`31`	`});`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ var C = (function () {`
`17`	`17`	`}`
`18`	`18`	`C.prototype.P = function (ii, j, k) {`
`19`	`19`	`for (var i = 0; i < arguments.length; i++) {`
`20`		`- // WScript.Echo("param: " + arguments[i]);`
	`20`	`+ // WScript.Echo("param: " + arguments[i]);`
`21`	`21`	`}`
`22`	`22`	`};`
`23`	`23`	`return C;`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ function ifelse() {`
`16`	`16`	`if (commentedParameters(1, 2)) {`
`17`	`17`	`/comment1/`
`18`	`18`	`commentedParameters(3, 4);`
`19`		`- /comment2/`
	`19`	`+ /comment2/`
`20`	`20`	`}`
`21`	`21`	`else {`
`22`	`22`	`commentedParameters(5, 6);`
Original file line number	Diff line number	Diff line change
`@@ -27,5 +27,5 @@ exports.C1 = C1;`
`27`	`27`	`"use strict";`
`28`	`28`	`var foo = require("./foo_0");`
`29`	`29`	`if (foo.C1.s1) {`
`30`		`-// Should cause runtime import`
	`30`	`+ // Should cause runtime import`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -391,7 +391,7 @@ var TestRunner = (function () {`
`391`	`391`	`}`
`392`	`392`	`}`
`393`	`393`	`if (testResult === false) {`
`394`		`- //console.log(e.message);`
	`394`	`+ //console.log(e.message);`
`395`	`395`	`}`
`396`	`396`	`}`
`397`	`397`	`if ((testcase.errorMessageRegEx !== undefined) && !exception) {`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,6 @@ function foo(a) {`
`9`	`9`	`//// [out.js]`
`10`	`10`	`function foo(a) {`
`11`	`11`	`for (var a_1 = 0; a_1 < 10; a_1++) {`
`12`		`- // do something`
	`12`	`+ // do something`
`13`	`13`	`}`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ function tryCatch() {`
`27`	`27`	`//// [narrowExceptionVariableInCatchClause.js]`
`28`	`28`	`function tryCatch() {`
`29`	`29`	`try {`
`30`		`- // do stuff...`
	`30`	`+ // do stuff...`
`31`	`31`	`}`
`32`	`32`	`catch (err) {`
`33`	`33`	`if (isFooError(err)) {`