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

KtUnaryExpression.baseExpression may be null (EA-78379)

Browse Source
This commit is contained in:
Nikolay Krasko
2016-01-25 20:25:21 +03:00
parent 06939b11e4
commit e7685735bb
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/ktPsiUtil.kt
+2 -1
View File
@@ -116,7 +116,7 @@ fun KtSimpleNameExpression.getReceiverExpression(): KtExpression? {
return if (parent.getOperationToken() in OperatorConventions.IN_OPERATIONS) parent.right else parent.left return if (parent.getOperationToken() in OperatorConventions.IN_OPERATIONS) parent.right else parent.left
} }
parent is KtUnaryExpression && parent.operationReference == this -> { parent is KtUnaryExpression && parent.operationReference == this -> {
return parent.baseExpression!! return parent.baseExpression
} }
parent is KtUserType -> { parent is KtUserType -> {
val qualifier = parent.getQualifier() val qualifier = parent.getQualifier()
@@ -125,6 +125,7 @@ fun KtSimpleNameExpression.getReceiverExpression(): KtExpression? {
} }
} }
} }
return null return null
} }
idea/idea-analysis/src/org/jetbrains/kotlin/idea/intentions/OperatorToFunctionIntention.kt
+3 -1
View File
@@ -245,7 +245,9 @@ class OperatorToFunctionIntention : SelfTargetingIntention<KtExpression>(KtExpre
findCallName(result.left!!) findCallName(result.left!!)
} }
is KtUnaryExpression -> findCallName(result.baseExpression!!) is KtUnaryExpression -> {
result.baseExpression?.let { findCallName(it) }
}
else -> result.getQualifiedElementSelector() as KtSimpleNameExpression? else -> result.getQualifiedElementSelector() as KtSimpleNameExpression?
} }