azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Has suspend calls: fix suspend iterator case

Browse Source
This commit is contained in:
Mikhail Glukhikh
2017-12-05 20:22:24 +03:00
parent 4404439521
commit 24bd31457c
2 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinSuspendCallLineMarkerProvider.kt
+14 -6
View File
@@ -85,10 +85,18 @@ private fun KtExpression.isValidCandidateExpression(): Boolean {
fun KtExpression.hasSuspendCalls(bindingContext: BindingContext = analyze(BodyResolveMode.PARTIAL)): Boolean { fun KtExpression.hasSuspendCalls(bindingContext: BindingContext = analyze(BodyResolveMode.PARTIAL)): Boolean {
if (!isValidCandidateExpression()) return false if (!isValidCandidateExpression()) return false
val resolvedCall = if (this is KtForExpression) { return when (this) {
bindingContext[BindingContext.LOOP_RANGE_NEXT_RESOLVED_CALL, loopRange] is KtForExpression -> {
} else { val iteratorResolvedCall = bindingContext[BindingContext.LOOP_RANGE_ITERATOR_RESOLVED_CALL, loopRange]
this.getResolvedCall(bindingContext) val loopRangeHasNextResolvedCall = bindingContext[BindingContext.LOOP_RANGE_HAS_NEXT_RESOLVED_CALL, loopRange]
} ?: return false val loopRangeNextResolvedCall = bindingContext[BindingContext.LOOP_RANGE_NEXT_RESOLVED_CALL, loopRange]
return (resolvedCall.resultingDescriptor as? FunctionDescriptor)?.isSuspend == true listOf(iteratorResolvedCall, loopRangeHasNextResolvedCall, loopRangeNextResolvedCall).any {
it?.resultingDescriptor?.isSuspend == true
}
}
else -> {
val resolvedCall = getResolvedCall(bindingContext)
(resolvedCall?.resultingDescriptor as? FunctionDescriptor)?.isSuspend == true
}
}
} }
idea/testData/inspections/redundantSuspendModifier/inspectionData/expected.xml
Vendored
-9
View File
@@ -31,15 +31,6 @@
<problem_class severity="WARNING" attribute_key="NOT_USED_ELEMENT_ATTRIBUTES">Redundant 'suspend' modifier</problem_class> <problem_class severity="WARNING" attribute_key="NOT_USED_ELEMENT_ATTRIBUTES">Redundant 'suspend' modifier</problem_class>
<description>Redundant 'suspend' modifier</description> <description>Redundant 'suspend' modifier</description>
</problem> </problem>
<!-- FIXME: Incorrect problem -->
<problem>
<file>test.kt</file>
<line>57</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="temp:///src/test.kt" />
<problem_class severity="WARNING" attribute_key="NOT_USED_ELEMENT_ATTRIBUTES">Redundant 'suspend' modifier</problem_class>
<description>Redundant 'suspend' modifier</description>
</problem>
<problem> <problem>
<file>operators.kt</file> <file>operators.kt</file>
<line>5</line> <line>5</line>