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

temporary disable smart indentation for type literals, fix computation for end line position

Browse Source
This commit is contained in:
Vladimir Matveev 2014-10-14 18:39:51 -07:00
parent b9e5384f10
commit 27cb5b0c18
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,8 +58,8 @@ module ts.formatting {
function getEndLinePosition(line: number, sourceFile: SourceFile): number {
var lineStarts = sourceFile.getLineStarts();
if (line === lineStarts.length - 1) {
// last line - return EOF - <start pos of line>
return sourceFile.text.length - lineStarts[line];
// last line - return EOF
return sourceFile.text.length - 1;
}
else {
// current line start
@ -351,7 +351,9 @@ module ts.formatting {
processTrivia(currentTokenInfo.leadingTrivia, parent, contextNode, indentation);
}
processRange(currentTokenInfo.token, parent, contextNode, indentation);
if (rangeContainsRange(originalRange, currentTokenInfo.token)) {
processRange(currentTokenInfo.token, parent, contextNode, indentation);
}
if (currentTokenInfo.trailingTrivia) {
processTrivia(currentTokenInfo.trailingTrivia, parent, contextNode, indentation);
@ -363,7 +365,7 @@ module ts.formatting {
function processTrivia(trivia: TextRangeWithKind[], parent: Node, contextNode: Node, currentIndentation: number): void {
for (var i = 0, len = trivia.length; i < len; ++i) {
var triviaItem = trivia[i];
if (isComment(triviaItem.kind)) {
if (isComment(triviaItem.kind) && rangeContainsRange(originalRange, triviaItem)) {
processRange(triviaItem, parent, contextNode, currentIndentation);
}
}
@ -371,8 +373,8 @@ module ts.formatting {
function processRange(range: TextRangeWithKind, parent: Node, contextNode: Node, indentation: number) {
var rangeStart = getNonAdjustedLineAndCharacterFromPosition(range.pos, sourceFile);
if (rangeContainsRange(originalRange, range)) {
var indentToken = false;
if (rangeContainsRange(originalRange, range)) {
var indentToken = true;
if (!previousRange) {
var originalStart = getNonAdjustedLineAndCharacterFromPosition(originalRange.pos, sourceFile);
// TODO: implement

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

@ -229,8 +229,8 @@ module ts.formatting {
break;
case SyntaxKind.ObjectLiteral:
return getActualIndentationFromList((<ObjectLiteral>node.parent).properties);
case SyntaxKind.TypeLiteral:
return getActualIndentationFromList((<TypeLiteralNode>node.parent).members);
//case SyntaxKind.TypeLiteral:
// return getActualIndentationFromList((<TypeLiteralNode>node.parent).members);
case SyntaxKind.ArrayLiteral:
return getActualIndentationFromList((<ArrayLiteral>node.parent).elements);
case SyntaxKind.FunctionDeclaration: