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

Minor. Fix reporting diagnostic in contract with callable reference

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2019-03-04 17:47:32 +03:00
parent 518b03125c
commit d0462859bf
6 changed files with 29 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/contracts/parsing/PsiContractParserDispatcher.kt
+4 -6
View File
@@ -35,10 +35,7 @@ import org.jetbrains.kotlin.contracts.parsing.effects.PsiReturnsEffectParser
import org.jetbrains.kotlin.descriptors.ParameterDescriptor
import org.jetbrains.kotlin.descriptors.ReceiverParameterDescriptor
import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.psi.KtBinaryExpression
import org.jetbrains.kotlin.psi.KtCallExpression
import org.jetbrains.kotlin.psi.KtExpression
import org.jetbrains.kotlin.psi.KtLambdaExpression
import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall
import org.jetbrains.kotlin.resolve.calls.callUtil.getType
import org.jetbrains.kotlin.storage.StorageManager
@@ -129,9 +126,10 @@ internal class PsiContractParserDispatcher(
fun parseVariable(expression: KtExpression?): VariableReference? {
if (expression == null) return null
val descriptor = expression.getResolvedCall(callContext.bindingContext)?.resultingDescriptor ?: return null
val descriptor = expression.getResolvedCall(callContext.bindingContext)?.resultingDescriptor
if (descriptor !is ParameterDescriptor) {
collector.badDescription("only references to parameters are allowed in contract description", expression)
if (expression !is KtConstantExpression)
collector.badDescription("only references to parameters are allowed in contract description", expression)
return null
}