2 failures

vladima · vladima · commit d9ff2c454e01 · 2017-03-13T23:53:10.000-07:00
diff --git a/src/services/formatting/formattingScanner.ts b/src/services/formatting/formattingScanner.ts
@@ -276,8 +276,8 @@ namespace ts.formatting {
         function isOnToken(): boolean {
             Debug.assert(scanner !== undefined);
 
-            const current = (lastTokenInfo && lastTokenInfo.token.kind) || scanner.getToken();
-            const startPos = (lastTokenInfo && lastTokenInfo.token.pos) || scanner.getStartPos();
+            const current = lastTokenInfo ? lastTokenInfo.token.kind : scanner.getToken();
+            const startPos = lastTokenInfo ? lastTokenInfo.token.pos : scanner.getStartPos();
             return startPos < endPos && current !== SyntaxKind.EndOfFileToken && !isTrivia(current);
         }
 
diff --git a/src/services/textChanges.ts b/src/services/textChanges.ts
@@ -310,6 +310,7 @@ namespace ts.textChanges {
                     });
                     this.changes.push({
                         sourceFile,
+                        useIndentationFromFile: true,
                         range: { pos: adjustedEndPosition, end: adjustedEndPosition },
                         node: newNode,
                         options: {}
diff --git a/tests/baselines/reference/textChanges/insertNodeInListAfter16.js b/tests/baselines/reference/textChanges/insertNodeInListAfter16.js
@@ -0,0 +1,13 @@
+===ORIGINAL===
+
+import {
+    x0,
+    x
+} from "bar"
+===MODIFIED===
+
+import {
+    x0,
+    x,
+    a
+} from "bar"
diff --git a/tests/baselines/reference/textChanges/insertNodeInListAfter17.js b/tests/baselines/reference/textChanges/insertNodeInListAfter17.js
@@ -0,0 +1,13 @@
+===ORIGINAL===
+
+import {
+    x0,
+    x // this is x
+} from "bar"
+===MODIFIED===
+
+import {
+    x0,
+    x, // this is x
+    a
+} from "bar"

Original file line number	Diff line number	Diff line change
`@@ -276,8 +276,8 @@ namespace ts.formatting {`
`276`	`276`	`function isOnToken(): boolean {`
`277`	`277`	`Debug.assert(scanner !== undefined);`
`278`	`278`
`279`		`- const current = (lastTokenInfo && lastTokenInfo.token.kind) \|\| scanner.getToken();`
`280`		`- const startPos = (lastTokenInfo && lastTokenInfo.token.pos) \|\| scanner.getStartPos();`
	`279`	`+ const current = lastTokenInfo ? lastTokenInfo.token.kind : scanner.getToken();`
	`280`	`+ const startPos = lastTokenInfo ? lastTokenInfo.token.pos : scanner.getStartPos();`
`281`	`281`	`return startPos < endPos && current !== SyntaxKind.EndOfFileToken && !isTrivia(current);`
`282`	`282`	`}`
`283`	`283`