Merge branch 'completeIsCompleteNode' into completionsInIncompleteConstructs

Conflicts:
	src/services/formatting/smartIndenter.ts
This commit is contained in:
Daniel Rosenwasser 2015-03-17 07:45:01 -07:00
commit 0aa3a72d5b

View File

@ -131,11 +131,17 @@ module ts {
case SyntaxKind.ArrayLiteralExpression:
case SyntaxKind.ArrayBindingPattern:
case SyntaxKind.IndexSignature:
case SyntaxKind.ComputedPropertyName:
case SyntaxKind.TupleType:
return nodeEndsWith(n, SyntaxKind.CloseBracketToken, sourceFile);
case SyntaxKind.IndexSignature:
if ((<IndexSignatureDeclaration>n).type) {
return isCompletedNode((<IndexSignatureDeclaration>n).type, sourceFile);
}
return hasChildOfKind(n, SyntaxKind.CloseBracketToken, sourceFile);
case SyntaxKind.CaseClause:
case SyntaxKind.DefaultClause:
// there is no such thing as terminator token for CaseClause/DefaultClause so for simplicitly always consider them non-completed