Fix #2021 #2032
Merged
Fix #2021 #2032
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
arturbosch
reviewed
Oct 24, 2019
| val returnExpressionsInBlock = bodyExpression.getChildrenOfType<KtReturnExpression>() | ||
| val returnExpressionsInBlock = bodyExpression.collectDescendantsOfType<KtReturnExpression> { | ||
| it.parent == bodyExpression || it.parent is KtAnnotatedExpression && it.parent.parent == bodyExpression | ||
| } | ||
| val lastValidReturnExpression = returnExpressionsInBlock.first().returnedExpression |
There was a problem hiding this comment.
Hm is the bodyExpression the Annotation itself?
That could explain why getChildrenOfType is empty and first crashes.
We should also use firstOrNull, don't we?
I'm not sure what happens here, but will try to debug it too.
arturbosch
approved these changes
Oct 28, 2019
schalkms
approved these changes
Oct 28, 2019
Codecov Report
@@ Coverage Diff @@
## master #2032 +/- ##
=========================================
Coverage ? 80.35%
Complexity ? 2015
=========================================
Files ? 332
Lines ? 5661
Branches ? 1044
=========================================
Hits ? 4549
Misses ? 559
Partials ? 553
Continue to review full report at Codecov.
|
smyachenkov
pushed a commit
to smyachenkov/detekt
that referenced
this pull request
Dec 9, 2019
* Fix detekt#2021 * minor refactor * fix typo
smyachenkov
pushed a commit
to smyachenkov/detekt
that referenced
this pull request
Dec 9, 2019
* Fix detekt#2021 * minor refactor * fix typo
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 #2021
This feels slightly hacky but I can't think of any better way at the moment :/