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

Reforma ReplaceCallFix

Browse Source
This commit is contained in:
Toshiaki Kameyama
2019-09-19 23:55:20 +09:00
committed by Dmitry Gridin
parent 78affdd2b4
commit 7b56733bda
1 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/quickfix/ReplaceCallFix.kt
+9 -6
View File
@@ -45,8 +45,10 @@ abstract class ReplaceCallFix(
override fun invoke(project: Project, editor: Editor?, file: KtFile) { override fun invoke(project: Project, editor: Editor?, file: KtFile) {
val element = element ?: return val element = element ?: return
val elvis = elvisOrEmpty(notNullNeeded) val elvis = elvisOrEmpty(notNullNeeded)
val newExpression = KtPsiFactory(element).createExpressionByPattern("$0$operation$1$elvis", val newExpression = KtPsiFactory(element).createExpressionByPattern(
element.receiverExpression, element.selectorExpression!!) "$0$operation$1$elvis",
element.receiverExpression, element.selectorExpression!!
)
val replacement = element.replace(newExpression) val replacement = element.replace(newExpression)
if (notNullNeeded) { if (notNullNeeded) {
replacement.moveCaretToEnd(editor, project) replacement.moveCaretToEnd(editor, project)
@@ -86,8 +88,7 @@ class ReplaceWithSafeCallFix(
val qualifiedExpression = psiElement.parent as? KtDotQualifiedExpression val qualifiedExpression = psiElement.parent as? KtDotQualifiedExpression
if (qualifiedExpression != null) { if (qualifiedExpression != null) {
return ReplaceWithSafeCallFix(qualifiedExpression, qualifiedExpression.shouldHaveNotNullType()) return ReplaceWithSafeCallFix(qualifiedExpression, qualifiedExpression.shouldHaveNotNullType())
} } else {
else {
if (psiElement !is KtNameReferenceExpression) return null if (psiElement !is KtNameReferenceExpression) return null
if (psiElement.getResolvedCall(psiElement.analyze())?.getImplicitReceiverValue() != null) { if (psiElement.getResolvedCall(psiElement.analyze())?.getImplicitReceiverValue() != null) {
val expressionToReplace: KtExpression = psiElement.parent as? KtCallExpression ?: psiElement val expressionToReplace: KtExpression = psiElement.parent as? KtCallExpression ?: psiElement
@@ -130,14 +131,16 @@ class ReplaceWithSafeCallForScopeFunctionFix(
} }
ScopeFunctionKind.WITH_RECEIVER -> { ScopeFunctionKind.WITH_RECEIVER -> {
if (internalReceiverDescriptor != scopeFunctionLiteralDescriptor.extensionReceiverParameter && if (internalReceiverDescriptor != scopeFunctionLiteralDescriptor.extensionReceiverParameter &&
internalResolvedCall.getImplicitReceiverValue() == null) { internalResolvedCall.getImplicitReceiverValue() == null
) {
return null return null
} }
} }
} }
return ReplaceWithSafeCallForScopeFunctionFix( return ReplaceWithSafeCallForScopeFunctionFix(
scopeDotQualifiedExpression, scopeDotQualifiedExpression.shouldHaveNotNullType()) scopeDotQualifiedExpression, scopeDotQualifiedExpression.shouldHaveNotNullType()
)
} }
private fun KtCallExpression.scopeFunctionKind(context: BindingContext): ScopeFunctionKind? { private fun KtCallExpression.scopeFunctionKind(context: BindingContext): ScopeFunctionKind? {