fix formatting for chained callbacks #3001
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -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(); | |||
There was a problem hiding this comment.
split into multiple lines
| @@ -416,7 +419,9 @@ 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 | |||
|
@DanielRosenwasser any other notes? |
|
👍 |
vladima
added a commit
that referenced
this pull request
May 4, 2015
fix formatting for chained callbacks
|
👍 |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
fixes #1917, #1888
in cases like this nodes are processed in order:
CallExpresson->PropertyAccess and its child nodes->ParameterList and its child nodes. Fact that indentation was inserted before the '.' during processing ofPropertyAccessshould be respected later when we return back toCallExpressionand dive intoParameterListhowever this is something that was missed.In this PR when token is indented we record line/indentation and later when computing indentation for the node check if current line was already indented and if yes - use actual indentation.