RedundantBraces: add noParams option to defnBodies #3031
Merged
Conversation
This file contains 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
tgodzik
approved these changes
Jan 5, 2022
| case d: Defn.Macro => checkBlockAsBody(b, d.body) | ||
| case d: Defn.GivenAlias => checkBlockAsBody(b, d.body) | ||
| case d: Defn.Var => | ||
| defnBodies(true) && d.rhs.exists(checkBlockAsBody(b, _)) |
There was a problem hiding this comment.
Suggested change
| defnBodies(true) && d.rhs.exists(checkBlockAsBody(b, _)) | |
| defnBodies(noParams = true) && d.rhs.exists(checkBlockAsBody(b, _)) |
Otherwise it's a bit unclear
| case d: Defn.Var => | ||
| defnBodies(true) && d.rhs.exists(checkBlockAsBody(b, _)) | ||
| case d: Defn.Val => | ||
| defnBodies(true) && checkBlockAsBody(b, d.rhs) |
There was a problem hiding this comment.
Suggested change
| defnBodies(true) && checkBlockAsBody(b, d.rhs) | |
| defnBodies(noParams = true) && checkBlockAsBody(b, d.rhs) |
| @@ -340,6 +344,25 @@ class RedundantBraces(ftoks: FormatTokens) extends FormatTokensRewrite.Rule { | |||
| ): Boolean = | |||
| rhs.eq(b) && getSingleStatIfLineSpanOk(b).exists(innerOk(b)) | |||
|
|
|||
| private def defnBodies( | |||
There was a problem hiding this comment.
Suggested change
| private def defnBodies( | |
| private def shouldRemoveDefnBraces( |
maybe a bit better explaining ?
| case RedundantBracesSettings.DefnBodies.noParams => noParams | ||
| } | ||
|
|
||
| private def defnBodies( |
There was a problem hiding this comment.
Suggested change
| private def defnBodies( | |
| private def isNoDefnParams( |
kitbellew
commented
Jan 5, 2022
| @@ -149,7 +149,7 @@ class RedundantBraces(ftoks: FormatTokens) extends FormatTokensRewrite.Rule { | |||
| !x.tokens.exists(_.is[Token.RightArrow])) => | |||
| removeToken | |||
| case t: Ctor.Secondary | |||
| if t.stats.isEmpty && style.rewrite.redundantBraces.defnBodies => | |||
| if t.stats.isEmpty && isDefnBodiesEnabled(noParams = false) => | |||
There was a problem hiding this comment.
added explicit noParams = here and everywhere else.
| @@ -340,6 +348,25 @@ class RedundantBraces(ftoks: FormatTokens) extends FormatTokensRewrite.Rule { | |||
| ): Boolean = | |||
| rhs.eq(b) && getSingleStatIfLineSpanOk(b).exists(innerOk(b)) | |||
|
|
|||
| private def isDefnBodiesEnabled( | |||
There was a problem hiding this comment.
renamed this method from defnBodies, should be better explained.
i used the word Enabled to stress that this is a configuration check primarily, and not a complete determination that it's ok to remove braces here (since we are also calling checkBlockAsBody).
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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 #3026.