#1627 [02]: Router: ignore line breaks for blocks #1772
Conversation
|
@olafurpg @tanishiking @poslegm PTAL, 2nd of many #1627 PRs. |
| def getSingleLineLambdaDecision: Policy.Pf = { | ||
| val ok = !style.newlines.alwaysBeforeCurlyBraceLambdaParams && | ||
| getSpaceAndNewlineAfterCurlyLambda(newlines)._1 | ||
| if (ok) getSingleLineDecisionFor2019Nov else null |
There was a problem hiding this comment.
I am concerned about an increasing number of nulls here. It may be error-prone in the future maintaining. Does Option really beats perfomance in this case?
There was a problem hiding this comment.
probably not. i can try to see if we can change to Option instead, the problem earlier was that Split takes a Policy, so i had to do policyOpt.orNull anyway.
There was a problem hiding this comment.
- Why
keepadds newline before lambda argument?
replied on the code line. however, it doesn't add, i ran older scalafmt on the original code, and then the new one also on the original code (not on the formatted output), the diff is the comparison.
- How
foldwill work with braces -> parens replacement (RedundantBraces)? Can I expect this formatting:<<< xs.map { x => println(x) } >>> xs.map(x => println(x))
yes. fold will turn into xs.map { x => println(x) } and then FormatWriter will output with parens.
| def getSingleLineLambdaDecision: Policy.Pf = { | ||
| val ok = !style.newlines.alwaysBeforeCurlyBraceLambdaParams && | ||
| getSpaceAndNewlineAfterCurlyLambda(newlines)._1 | ||
| if (ok) getSingleLineDecisionFor2019Nov else null |
There was a problem hiding this comment.
probably not. i can try to see if we can change to Option instead, the problem earlier was that Split takes a Policy, so i had to do policyOpt.orNull anyway.
| @@ -276,7 +290,8 @@ class Router(formatOps: FormatOps) { | |||
| Split(Space, 0) | |||
| .notIf( | |||
| style.newlines.alwaysBeforeCurlyBraceLambdaParams || | |||
| isSelfAnnotation || lambdaPolicy == null | |||
| isSelfAnnotation || lambdaPolicy == null || | |||
| (style.newlines.source eq Newlines.keep) && newlines != 0 | |||
There was a problem hiding this comment.
- Why
keepadds newline before lambda argument?
this is the line. if newline is present, the Space split is disabled. (of course, it's up to us to define what keep does.)
ah, one more thing which I should have mentioned: the scala-repos diffs are not generated by running one version of scalafmt and then another (because the next one can't undo what the first one did). instead, both ran on the same original, pre-scalafmt commit, and the diff is the comparison between results. that's how a space split becomes a newline in keep.
kitbellew
force-pushed
the
1772
branch
2 times, most recently
from
546510d
to
bee23c8
Compare
While previously we were trying to keep blocks without line breaks if that's how they were originally input, now we actively attempt to take a multi-line representation and fold it into a single line (fold), or take a single-line representation and unfold it into multiple lines (unfold). Fixes scalameta#271 scalameta#1002 scalameta#1043
While previously we were trying to keep blocks without line breaks if that's how they were originally input, now we actively attempt to take a multi-line representation and fold it into a single line (fold), or take a single-line representation and unfold it into multiple lines (unfold). In the [keep] case, we'll keep the line break if it was there before.
Fixes #271 #1002 #1043
Helps with #1627
scala-reposdiffs: