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

KT-11955 Copy/Paste inserts FQ-name

Browse Source 
#KT-11955 Fixed
This commit is contained in:
Valentin Kipyatkov
2016-04-19 16:50:23 +03:00
parent 364a8801a3
commit 1535e8ad90
11 changed files with 58 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-core/src/org/jetbrains/kotlin/idea/core/ShortenReferences.kt
+7 -6
View File
@@ -46,6 +46,7 @@ import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
import org.jetbrains.kotlin.resolve.scopes.receivers.ImplicitReceiver
import org.jetbrains.kotlin.resolve.scopes.utils.findClassifier
import org.jetbrains.kotlin.resolve.scopes.utils.findPackage
import org.jetbrains.kotlin.utils.singletonOrEmptyList
import java.util.*
class ShortenReferences(val options: (KtElement) -> Options = { Options.DEFAULT }) {
@@ -210,12 +211,12 @@ class ShortenReferences(val options: (KtElement) -> Options = { Options.DEFAULT
protected fun analyze(element: KtElement)
= resolutionFacade.analyze(element, BodyResolveMode.PARTIAL)
protected fun processQualifiedElement(element: T, target: DeclarationDescriptor?, canShortenNow: Boolean) {
protected fun processQualifiedElement(element: T, targets: Collection<DeclarationDescriptor>, canShortenNow: Boolean) {
if (canShortenNow) {
addElementToShorten(element)
}
else if (target != null && target !in failedToImportDescriptors && mayImport(target, file)) {
descriptorsToImport.add(target)
else if (targets.isNotEmpty() && targets.none { it in failedToImportDescriptors } && targets.all { mayImport(it, file) }) {
descriptorsToImport.addAll(targets)
}
else {
qualifier(element).accept(this)
@@ -283,14 +284,14 @@ class ShortenReferences(val options: (KtElement) -> Options = { Options.DEFAULT
val target = referenceExpression.targets(bindingContext).singleOrNull() ?: return
val scope = type.getResolutionScope(bindingContext, resolutionFacade)
val name = target.getName()
val name = target.name
val targetByName = if (target is ClassifierDescriptor)
scope.findClassifier(name, NoLookupLocation.FROM_IDE)
else
scope.findPackage(name)
val canShortenNow = targetByName?.asString() == target.asString()
processQualifiedElement(type, target, canShortenNow)
processQualifiedElement(type, target.singletonOrEmptyList(), canShortenNow)
}
override fun qualifier(element: KtUserType) = element.qualifier!!
@@ -378,7 +379,7 @@ class ShortenReferences(val options: (KtElement) -> Options = { Options.DEFAULT
return false
}
processQualifiedElement(qualifiedExpression, targets.singleOrNull(), targetsMatch)
processQualifiedElement(qualifiedExpression, targets, targetsMatch)
return true
}