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

KT-14370 Completion inserts fully qualified name for any Java interface with single abstract method (SAM-interface)

Browse Source 
#KT-14370 Fixed
This commit is contained in:
Valentin Kipyatkov
2016-11-07 20:43:58 +03:00
parent b8981ec546
commit 9b55ad82a0
8 changed files with 55 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-core/src/org/jetbrains/kotlin/idea/core/ShortenReferences.kt
+18 -2
View File
@@ -32,6 +32,7 @@ import org.jetbrains.kotlin.idea.util.ImportInsertHelper
import org.jetbrains.kotlin.idea.util.getResolutionScope
import org.jetbrains.kotlin.incremental.components.NoLookupLocation
import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.psi.psiUtil.getQualifiedExpressionForReceiver
import org.jetbrains.kotlin.psi.psiUtil.parents
import org.jetbrains.kotlin.renderer.DescriptorRenderer
import org.jetbrains.kotlin.resolve.BindingContext
@@ -432,8 +433,7 @@ class ShortenReferences(val options: (KtElement) -> Options = { Options.DEFAULT
val varAsFunResolvedCall = callee.getResolvedCall(bindingContext) as? VariableAsFunctionResolvedCall
if (targets.isEmpty()) return Skip
val selectorCopy = selector.copy() as KtReferenceExpression
val newContext = selectorCopy.analyzeAsReplacement(element, bindingContext, resolutionFacade)
val (newContext, selectorCopy) = copyAndAnalyzeSelector(element, bindingContext)
val newCallee = selectorCopy.getCalleeExpressionIfAny() as KtReferenceExpression
val targetsWhenShort = newCallee.targets(newContext)
val varAsFunResolvedCallWhenShort = newCallee.getResolvedCall(newContext) as? VariableAsFunctionResolvedCall
@@ -465,6 +465,22 @@ class ShortenReferences(val options: (KtElement) -> Options = { Options.DEFAULT
}
}
private fun copyAndAnalyzeSelector(element: KtDotQualifiedExpression, bindingContext: BindingContext): Pair<BindingContext, KtExpression> {
val selector = element.selectorExpression!!
val qualifiedAbove = element.getQualifiedExpressionForReceiver()
if (qualifiedAbove == null) {
val copied = selector.copied()
val newBindingContext = copied.analyzeAsReplacement(element, bindingContext, resolutionFacade)
return newBindingContext to copied
}
else {
val qualifiedAboveCopy = qualifiedAbove.copied()
qualifiedAboveCopy.receiverExpression.replace(selector)
val newBindingContext = qualifiedAboveCopy.analyzeAsReplacement(qualifiedAbove, bindingContext, resolutionFacade)
return newBindingContext to qualifiedAboveCopy.receiverExpression
}
}
private fun targetsMatch(targets1: Collection<DeclarationDescriptor>, targets2: Collection<DeclarationDescriptor>): Boolean {
if (targets1.size != targets2.size) return false
if (targets1.size == 1) {