microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-15 20:25:23 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

process start and end tokens in list as part of list, indent return statements

Browse Source
This commit is contained in:
Vladimir Matveev 2014-10-30 14:32:39 -07:00
parent dbd5b31a98
commit e830ae28b7
2 changed files with 48 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/services/formatting/format.ts
View File

@ -245,28 +245,62 @@ module ts.formatting {
processChildNode(child, undefined, /*containingList*/ undefined, /*listElementIndex*/ -1)
},
nodes => {
var inheritedIndentation: number = undefined;
for (var i = 0, len = nodes.length; i < len; ++i) {
inheritedIndentation = processChildNode(nodes[i], inheritedIndentation, /*containingList*/ nodes, /*listElementIndex*/ i)
}
var listStartToken = SyntaxKind.Unknown;
var listEndToken = SyntaxKind.Unknown;
switch (node.kind) {
case SyntaxKind.Constructor:
case SyntaxKind.FunctionDeclaration:
case SyntaxKind.FunctionExpression:
case SyntaxKind.Method:
case SyntaxKind.ArrowFunction:
if ((<FunctionDeclaration>node).typeParameters === nodes) {
listStartToken = SyntaxKind.LessThanToken
listEndToken = SyntaxKind.GreaterThanToken;
}
else if ((<FunctionDeclaration>node).parameters === nodes) {
listStartToken = SyntaxKind.OpenParenToken;
listEndToken = SyntaxKind.CloseParenToken;
}
break;
case SyntaxKind.CallExpression:
case SyntaxKind.NewExpression:
//if (formattingScanner.isOnToken()) {
// var tokenInfo = formattingScanner.readTokenInfo(node);
// Debug.assert(rangeContainsRange(node, tokenInfo.token));
// // TODO: check if token is a list terminator
// if (node.parent.kind !== SyntaxKind.SourceFile && formattingScanner.lastTrailingTriviaWasNewLine()) {
// var listTerminatorIndentation = nodeIndentation.getIndentation() + options.IndentSize;
// doConsumeTokenAndAdvanceScanner(tokenInfo, node, getDynamicIndentation(node, listTerminatorIndentation, listTerminatorIndentation, nodeIndentation));
// }
//}
if ((<CallExpression>node).typeArguments === nodes) {
listStartToken = SyntaxKind.LessThanToken
listEndToken = SyntaxKind.GreaterThanToken;
}
else if ((<CallExpression>node).arguments === nodes) {
listStartToken = SyntaxKind.OpenParenToken;
listEndToken = SyntaxKind.CloseParenToken;
}
break;
}
if (listStartToken !== SyntaxKind.Unknown) {
// try to consume open token
if (formattingScanner.isOnToken()) {
var tokenInfo = formattingScanner.readTokenInfo(node);
if (tokenInfo.token.kind === listStartToken) {
// make sure that this token does not belong to the child
doConsumeTokenAndAdvanceScanner(tokenInfo, node, nodeIndentation);
}
}
}
var inheritedIndentation: number = undefined;
for (var i = 0, len = nodes.length; i < len; ++i) {
inheritedIndentation = processChildNode(nodes[i], inheritedIndentation, /*containingList*/ nodes, /*listElementIndex*/ i)
}
if (listEndToken !== SyntaxKind.Unknown) {
if (formattingScanner.isOnToken()) {
var tokenInfo = formattingScanner.readTokenInfo(node);
if (tokenInfo.token.kind === listEndToken && formattingScanner.lastTrailingTriviaWasNewLine()) {
var endTokenIndentation = nodeIndentation.getIndentation() + options.IndentSize;
doConsumeTokenAndAdvanceScanner(tokenInfo, node, getDynamicIndentation(node, endTokenIndentation, endTokenIndentation, nodeIndentation));
}
}
}
}
);

1
src/services/formatting/smartIndenter.ts
View File

@ -319,6 +319,7 @@ module ts.formatting {
case SyntaxKind.VariableStatement:
case SyntaxKind.VariableDeclaration:
case SyntaxKind.ExportAssignment:
case SyntaxKind.ReturnStatement:
return true;
default:
return false;