microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-07 05:41:22 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

fix: formatting for chaining methods (#21027)

Browse Source 
Closes: #20996
This commit is contained in:
Alan Agius 2018-01-16 17:53:43 +01:00 committed by Andy
parent f0ce80a5c7
commit bcb9fd7825
2 changed files with 45 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -484,7 +484,13 @@ namespace ts.formatting {
delta = Math.min(options.indentSize, parentDynamicIndentation.getDelta(node) + delta);
}
else if (indentation === Constants.Unknown) {
if (SmartIndenter.childStartsOnTheSameLineWithElseInIfStatement(parent, node, startLine, sourceFile)) {
if (node.kind === SyntaxKind.OpenParenToken && startLine === lastIndentedLine) {
// the is used for chaining methods formatting
// - we need to get the indentation on last line and the delta of parent
indentation = indentationOnLastIndentedLine;
delta = parentDynamicIndentation.getDelta(node);
}
else if (SmartIndenter.childStartsOnTheSameLineWithElseInIfStatement(parent, node, startLine, sourceFile)) {
indentation = parentDynamicIndentation.getIndentation();
}
else {
@ -622,7 +628,7 @@ namespace ts.formatting {
let childContextNode = contextNode;
// if there are any tokens that logically belong to node and interleave child nodes
// such tokens will be consumed in processChildNode for for the child that follows them
// such tokens will be consumed in processChildNode for the child that follows them
forEachChild(
node,
child => {

37
tests/cases/fourslash/formattingChainingMethods.ts Normal file
View File

@ -0,0 +1,37 @@
/// <reference path="fourslash.ts" />
//// z$ = this.store.select(this.fake())
//// .ofType(
//// 'ACTION',
//// 'ACTION-2'
//// )
//// .pipe(
//// filter(x => !!x),
//// switchMap(() =>
//// this.store.select(this.menuSelector.getAll('x'))
//// .pipe(
//// tap(x => {
//// this.x = !x;
//// })
//// )
//// )
//// );
format.document();
verify.currentFileContentIs(`z$ = this.store.select(this.fake())
.ofType(
'ACTION',
'ACTION-2'
)
.pipe(
filter(x => !!x),
switchMap(() =>
this.store.select(this.menuSelector.getAll('x'))
.pipe(
tap(x => {
this.x = !x;
})
)
)
);`
);