microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-17 01:49:57 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

fix formatting for chained callbacks

Browse Source
This commit is contained in:
Vladimir Matveev
2015-05-01 23:13:23 -07:00
parent 1625a6c314
commit f5b13bdb6d
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/services/formatting/formatting.ts
View File

@@ -323,6 +323,9 @@ module ts.formatting {
let previousParent: Node;
let previousRangeStartLine: number;
let lastIndentedLine: number;
let indentationOnLastIndentedLine: number;
let edits: TextChange[] = [];
formattingScanner.advance();
@@ -416,7 +419,7 @@ module ts.formatting {
// if node is located on the same line with the parent
// - inherit indentation from the parent
// - push children if either parent of node itself has non-zero delta
indentation = parentDynamicIndentation.getIndentation();
indentation = startLine === lastIndentedLine ? indentationOnLastIndentedLine : parentDynamicIndentation.getIndentation();
delta = Math.min(options.IndentSize, parentDynamicIndentation.getDelta() + delta);
}
return {
@@ -716,7 +719,6 @@ module ts.formatting {
continue;
}
let triviaStartLine = sourceFile.getLineAndCharacterOfPosition(triviaItem.pos).line;
switch (triviaItem.kind) {
case SyntaxKind.MultiLineCommentTrivia:
let commentIndentation = dynamicIndentation.getIndentationForComment(currentTokenInfo.token.kind);
@@ -741,6 +743,9 @@ module ts.formatting {
if (isTokenInRange && !rangeContainsError(currentTokenInfo.token)) {
let tokenIndentation = dynamicIndentation.getIndentationForToken(tokenStart.line, currentTokenInfo.token.kind);
insertIndentation(currentTokenInfo.token.pos, tokenIndentation, lineAdded);
lastIndentedLine = tokenStart.line;
indentationOnLastIndentedLine = tokenIndentation;
}
}

11
tests/cases/fourslash/formattingOnChainedCallbacks.ts
View File

@@ -4,7 +4,7 @@
//// .resolve()
//// .then(() => {/*1*/""/*2*/
////}).then(() => {/*3*//*4*/
////})/*semi1*/ /*semi2*/
////})/*semi1*//*semi2*/
////function foo() {
//// return Promise.resolve()
@@ -16,8 +16,7 @@
goTo.marker('1');
edit.insertLine('');
goTo.marker('2');
// Expected, with bug 1888: verify.currentLineContentIs(' ""');
verify.currentLineContentIs(' ""');
verify.currentLineContentIs(' ""');
goTo.marker('4');
edit.insertLine('');
goTo.marker('3');
@@ -25,8 +24,7 @@ verify.currentLineContentIs(' }).then(() => {');
goTo.marker("semi1");
edit.insert(';');
// Expected, with bug 1888: verify.currentLineContentIs(' });');
verify.currentLineContentIs('}); ');
verify.currentLineContentIs(' });');
goTo.marker("semi2");
edit.insert(';');
verify.currentLineContentIs(' });;');
@@ -36,5 +34,4 @@ edit.insert(';');
verify.currentLineContentIs(' "";');
goTo.marker('b');
edit.insert(';');
// Expected, with bug 1888: verify.currentLineContentIs(' });');
verify.currentLineContentIs(' });');
verify.currentLineContentIs(' });');