Do not suggest adding !! on null constant #KT-14643 Fixed

This commit is contained in:
Dmitry Neverov
2017-06-22 07:39:59 +03:00
committed by Mikhail Glukhikh
parent 84418738a7
commit 66bd9d63dd
3 changed files with 19 additions and 1 deletions
@@ -30,6 +30,7 @@ import org.jetbrains.kotlin.diagnostics.Diagnostic
import org.jetbrains.kotlin.diagnostics.Errors
import org.jetbrains.kotlin.idea.KotlinBundle
import org.jetbrains.kotlin.idea.caches.resolve.analyze
import org.jetbrains.kotlin.idea.intentions.branchedTransformations.isNullExpression
import org.jetbrains.kotlin.incremental.components.NoLookupLocation
import org.jetbrains.kotlin.lexer.KtTokens
import org.jetbrains.kotlin.psi.*
@@ -106,7 +107,10 @@ class AddExclExclCallFix(psiElement: PsiElement, val checkImplicitReceivers: Boo
private fun getExpressionForIntroduceCall(): ExpressionForCall? {
val psiElement = element ?: return null
return if (psiElement is LeafPsiElement && psiElement.elementType == KtTokens.DOT) {
return if ((psiElement as? KtExpression).isNullExpression()) {
return null
}
else if (psiElement is LeafPsiElement && psiElement.elementType == KtTokens.DOT) {
(psiElement.prevSibling as? KtExpression).expressionForCall()
}
else if (psiElement is KtArrayAccessExpression) {