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

Minor: !!-related quick-fixes refactoring

Browse Source
This commit is contained in:
Mikhail Glukhikh
2017-07-03 15:18:10 +03:00
parent 4f678fa85c
commit 2d1e1cb6ed
1 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/quickfix/ExclExclCallFixes.kt
+11 -11
View File
@@ -110,16 +110,15 @@ class AddExclExclCallFix(psiElement: PsiElement, val checkImplicitReceivers: Boo
private fun getExpressionForIntroduceCall(): ExpressionForCall? { private fun getExpressionForIntroduceCall(): ExpressionForCall? {
val psiElement = element ?: return null val psiElement = element ?: return null
return if ((psiElement as? KtExpression).isNullExpression()) { if ((psiElement as? KtExpression).isNullExpression()) {
return null return null
} }
else if (psiElement is LeafPsiElement && psiElement.elementType == KtTokens.DOT) { if (psiElement is LeafPsiElement && psiElement.elementType == KtTokens.DOT) {
(psiElement.prevSibling as? KtExpression).expressionForCall() return (psiElement.prevSibling as? KtExpression).expressionForCall()
} }
else if (psiElement is KtArrayAccessExpression) { return when (psiElement) {
psiElement.arrayExpression.expressionForCall() is KtArrayAccessExpression -> psiElement.arrayExpression.expressionForCall()
} is KtOperationReferenceExpression -> {
else if (psiElement is KtOperationReferenceExpression) {
val parent = psiElement.parent val parent = psiElement.parent
when (parent) { when (parent) {
is KtUnaryExpression -> parent.baseExpression.expressionForCall() is KtUnaryExpression -> parent.baseExpression.expressionForCall()
@@ -130,7 +129,7 @@ class AddExclExclCallFix(psiElement: PsiElement, val checkImplicitReceivers: Boo
else -> null else -> null
} }
} }
else if (psiElement is KtExpression) { is KtExpression -> {
val context = psiElement.analyze() val context = psiElement.analyze()
if (checkImplicitReceivers && psiElement.getResolvedCall(context)?.getImplicitReceiverValue() != null) { if (checkImplicitReceivers && psiElement.getResolvedCall(context)?.getImplicitReceiverValue() != null) {
val expressionToReplace = psiElement.parent as? KtCallExpression ?: psiElement val expressionToReplace = psiElement.parent as? KtCallExpression ?: psiElement
@@ -140,15 +139,16 @@ class AddExclExclCallFix(psiElement: PsiElement, val checkImplicitReceivers: Boo
context[BindingContext.EXPRESSION_TYPE_INFO, psiElement]?.let { context[BindingContext.EXPRESSION_TYPE_INFO, psiElement]?.let {
val type = it.type val type = it.type
if (type != null) { if (type != null) {
val nullability = it.dataFlowInfo.getStableNullability(DataFlowValueFactory.createDataFlowValue(psiElement, type, context, psiElement.findModuleDescriptor())) val nullability = it.dataFlowInfo.getStableNullability(
DataFlowValueFactory.createDataFlowValue(psiElement, type, context, psiElement.findModuleDescriptor())
)
if (!nullability.canBeNonNull()) return null if (!nullability.canBeNonNull()) return null
} }
} }
psiElement.expressionForCall() psiElement.expressionForCall()
} }
} }
else { else -> null
null
} }
} }