From 40f3fcf575d808bd7b006c5f9a58e8520997a1dd Mon Sep 17 00:00:00 2001 From: SaschaNaz Date: Sat, 5 Sep 2015 11:43:08 +0900 Subject: [PATCH] remove hasBraceShell and add namedBindings check --- src/services/formatting/smartIndenter.ts | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/src/services/formatting/smartIndenter.ts b/src/services/formatting/smartIndenter.ts index d8bc8fc3b98..a95d756f356 100644 --- a/src/services/formatting/smartIndenter.ts +++ b/src/services/formatting/smartIndenter.ts @@ -478,20 +478,13 @@ namespace ts.formatting { } } - function hasBraceShell(node: Node) { - let children = node.getChildren(); - let last = children.length - 1; - // Check if node looks like a block - return children[0] && children[0].kind === SyntaxKind.OpenBraceToken && - children[last] && children[last].kind === SyntaxKind.CloseBraceToken; - } - export function isIndentationPrevented(node: TextRangeWithKind) { switch (node.kind) { case SyntaxKind.NamedExports: - return hasBraceShell(node); + return true; + // Allow indentation only when namedBindings is NamespaceImport. case SyntaxKind.ImportClause: - return hasBraceShell((node).namedBindings); + return (node).namedBindings.kind === SyntaxKind.NamedImports; } return false; }