Bugfix. Lambda passed as an argument is forced to be on the same line as the previous argument #545
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
### What's done: * Fixed bugs
# Conflicts: # diktat-rules/src/test/resources/test/smoke/src/main/kotlin/Example1Test.kt
### What's done: * Fixed bugs
Codecov Report
@@ Coverage Diff @@
## master #545 +/- ##
=========================================
Coverage 80.80% 80.81%
- Complexity 1709 1712 +3
=========================================
Files 87 87
Lines 4381 4383 +2
Branches 1349 1349
=========================================
+ Hits 3540 3542 +2
Misses 298 298
Partials 543 543
Flags with carried forward coverage won't be shown. Click here to find out more.
Continue to review full report at Codecov.
|
petertrr
requested changes
Nov 23, 2020
diktat-rules/src/test/resources/test/smoke/src/main/kotlin/Example1Test.kt
Outdated
Show resolved
Hide resolved
diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/files/WhiteSpaceRule.kt
Outdated
Show resolved
Hide resolved
# Conflicts: # diktat-rules/src/test/resources/test/smoke/src/main/kotlin/Example4Expected.kt # diktat-rules/src/test/resources/test/smoke/src/main/kotlin/Example4Test.kt
### What's done: * Fixed bugs
### What's done: * Fixed bugs
petertrr
requested changes
Nov 30, 2020
| @@ -193,6 +193,19 @@ class WhiteSpaceRule(private val configRules: List<RulesConfig>) : Rule("horizon | |||
| it[2].prevSibling { prevNode -> prevNode.elementType == COMMA } == null | |||
| } | |||
| ?: false | |||
| val isLambda = node | |||
There was a problem hiding this comment.
Some logic should be reused between isLambdaAsArgument and isLambda. Or maybe you could check whether the lambda is a frist argument inside if (isFromLambdaAsArgument).
### What's done: * Fixed bugs
petertrr
approved these changes
Dec 1, 2020
diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/files/WhiteSpaceRule.kt
Outdated
Show resolved
Hide resolved
diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/files/WhiteSpaceRule.kt
Outdated
Show resolved
Hide resolved
### What's done: * Fixed bugs
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.
What's done:
This pull request closes #490