Merge pull request microsoft#5970 from DanCorder/5497

mhegazy · mhegazy · commit 37c883d6e817 · 2015-12-07T09:37:15.000-08:00
Fix for issue microsoft#5947
diff --git a/src/services/formatting/smartIndenter.ts b/src/services/formatting/smartIndenter.ts
@@ -461,6 +461,7 @@ namespace ts.formatting {
                 case SyntaxKind.ParenthesizedType:
                 case SyntaxKind.TaggedTemplateExpression:
                 case SyntaxKind.AwaitExpression:
+                case SyntaxKind.NamedImports:
                     return true;
             }
             return false;
diff --git a/tests/cases/fourslash/smartIndentNamedImport.ts b/tests/cases/fourslash/smartIndentNamedImport.ts
@@ -0,0 +1,12 @@
+/// <reference path='fourslash.ts' />
+
+////import {/*0*/
+////    numbers as bn,/*1*/
+////    list/*2*/
+////} from '@bykov/basics';/*3*/
+
+format.document();
+goTo.marker("0"); verify.currentLineContentIs("import {");
+goTo.marker("1"); verify.currentLineContentIs("    numbers as bn,");
+goTo.marker("2"); verify.currentLineContentIs("    list");
+goTo.marker("3"); verify.currentLineContentIs("} from '@bykov/basics';");

Original file line number	Diff line number	Diff line change
`@@ -461,6 +461,7 @@ namespace ts.formatting {`
`461`	`461`	`case SyntaxKind.ParenthesizedType:`
`462`	`462`	`case SyntaxKind.TaggedTemplateExpression:`
`463`	`463`	`case SyntaxKind.AwaitExpression:`
	`464`	`+ case SyntaxKind.NamedImports:`
`464`	`465`	`return true;`
`465`	`466`	`}`
`466`	`467`	`return false;`