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

indentation for export assignments

Browse Source
This commit is contained in:
Vladimir Matveev 2014-10-29 12:25:57 -07:00
parent 41a2a03712
commit 593fb327dc
2 changed files with 31 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -285,29 +285,40 @@ module ts.formatting {
var isChildInRange = rangeOverlapsWithStartEnd(originalRange, start, child.getEnd());
var childIndentationValue: number;
if (containingList && !isChildInRange) {
// child is a list item that is not in span being formatted
// fetch actual indentation for the child item to push it downstream
// TODO: ensure that indentation is picked correctly
var actualIndentation = getListItemIndentation(containingList, listElementIndex, nodeStartLine, options);
if (actualIndentation !== -1) {
inheritedIndentation = actualIndentation;
}
var childIndentationValue = increaseIndentation || indentation;
}
else {
if (inheritedIndentation !== undefined) {
var childIndentationValue = inheritedIndentation;
if (containingList) {
if (isChildInRange) {
if (inheritedIndentation !== undefined) {
// use indentation inherited from preceding list items
childIndentationValue = inheritedIndentation;
}
else {
var increaseIndentation =
node.kind !== SyntaxKind.SourceFile &&
node.pos !== child.pos &&
formattingScanner.lastTrailingTriviaWasNewLine();
var childIndentationValue = increaseIndentation ? indentation + options.IndentSize : indentation;
}
}
else {
var shareLine = nodeStartLine === childStart.line;
var increaseIndentation =
!shareLine &&
!SmartIndenter.childStartsOnTheSameLineWithElseInIfStatement(node, child, childStart.line, sourceFile) &&
SmartIndenter.shouldIndentChildNode(node, child);
var childIndentationValue = increaseIndentation ? indentation + options.IndentSize : indentation;
// child is a list item that is not in span being formatted
// fetch actual indentation for the child item to push it downstream
// TODO: ensure that indentation is picked correctly
var actualIndentation = getListItemIndentation(containingList, listElementIndex, nodeStartLine, options);
if (actualIndentation !== -1) {
inheritedIndentation = actualIndentation;
}
var childIndentationValue = inheritedIndentation || indentation;
}
}
else {
var shareLine = nodeStartLine === childStart.line;
var increaseIndentation =
!shareLine &&
!SmartIndenter.childStartsOnTheSameLineWithElseInIfStatement(node, child, childStart.line, sourceFile) &&
SmartIndenter.shouldIndentChildNode(node, child);
var childIndentationValue = increaseIndentation ? indentation + options.IndentSize : indentation;
}
var childIndentation: DynamicIndentation = {
getIndentation: () => childIndentationValue,

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

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