Wrong newlines in functional style #346
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
### What's done: * Fixed bugs
### What's done: * Fixed bugs
### What's done: * Fixed bugs
Codecov Report
@@ Coverage Diff @@
## master #346 +/- ##
============================================
- Coverage 82.92% 82.90% -0.02%
- Complexity 1224 1239 +15
============================================
Files 60 60
Lines 3027 3047 +20
Branches 968 973 +5
============================================
+ Hits 2510 2526 +16
Misses 170 170
- Partials 347 351 +4
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
Sep 30, 2020
diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/files/NewlinesRule.kt
Outdated
Show resolved
Hide resolved
diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/files/NewlinesRule.kt
Outdated
Show resolved
Hide resolved
diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/files/NewlinesRule.kt
Outdated
Show resolved
Hide resolved
### What's done: * Fixed bugs
### What's done: * Fixed bugs
petertrr
requested changes
Oct 2, 2020
diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/files/NewlinesRule.kt
Outdated
Show resolved
Hide resolved
diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/files/NewlinesRule.kt
Outdated
Show resolved
Hide resolved
diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/files/NewlinesRuleWarnTest.kt
Outdated
Show resolved
Hide resolved
diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/files/NewlinesRule.kt
Outdated
Show resolved
Hide resolved
### What's done: * Fixed bugs
petertrr
requested changes
Oct 2, 2020
diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/files/NewlinesRule.kt
Outdated
Show resolved
Hide resolved
diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/files/NewlinesRule.kt
Outdated
Show resolved
Hide resolved
diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/files/NewlinesRuleWarnTest.kt
Show resolved
Hide resolved
diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/files/NewlinesRule.kt
Outdated
Show resolved
Hide resolved
| @@ -330,6 +332,10 @@ class NewlinesRule(private val configRules: List<RulesConfig>) : Rule("newlines" | |||
| private fun ASTNode.getParentExpressions() = | |||
| parents().takeWhile { it.elementType in chainExpressionTypes && it.elementType != LAMBDA_ARGUMENT } | |||
|
|
|||
| private fun isMultilineLambda(node: ASTNode): Boolean = | |||
| node.findAllNodesWithSpecificType(LAMBDA_ARGUMENT).firstOrNull()?.text?.count { it == '\n' } ?: -1 > 0 | |||
There was a problem hiding this comment.
Won't findAllNodesWithSpecificType trigger on some nested lambdas or lambdas further in a call chain?
### What's done: * Fixed bugs * Call chains logic remade
petertrr
requested changes
Oct 5, 2020
diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/files/NewlinesRule.kt
Outdated
Show resolved
Hide resolved
diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/files/NewlinesRule.kt
Outdated
Show resolved
Hide resolved
### What's done: * Fixed bugs
### What's done: * Fixed bugs
petertrr
reviewed
Oct 7, 2020
| } | ||
| } | ||
| ?.dropWhile { !it.treeParent.textContains('(') && !it.treeParent.textContains('{') } | ||
| // fixme: we can't distinguish fully qualified names from chain of calls for now |
There was a problem hiding this comment.
Suggested change
| // fixme: we can't distinguish fully qualified names from chain of calls for now | |
| // fixme: we can't distinguish fully qualified names (like java.lang) from chain of property accesses (like list.size) for now |
Just to be sure we don't forget what this was about
|
|
||
| @Test | ||
| @Tag(WarningNames.WRONG_NEWLINES) | ||
| fun `should trigger on non-multiline lambdas`() { |
There was a problem hiding this comment.
Please add example like
list.filter {
}
.map(::foo).filter {
bar()
}It should be considered incorrect, when multiline lambda is not the first call.
### 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 #321 #326
Actions checklist