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

Dot not lengthen references to declarations contained in the moving element

Browse Source
This commit is contained in:
Alexey Sedunov
2014-04-17 18:11:28 +04:00
parent 5f92c22df3
commit 191ea2533e
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/refactoring/move/moveFilesOrDirectories/MoveKotlinFileHandler.kt
+3 -1
View File
@@ -108,12 +108,14 @@ public class MoveKotlinFileHandler : MoveFileHandler() {
val project = psiFile.getProject() val project = psiFile.getProject()
val newPackageName = newParent.getPackage()?.getQualifiedName() ?: "" val newPackageName = newParent.getPackage()?.getQualifiedName() ?: ""
val searchScope = GlobalSearchScope.projectScope(project) intersectWith
GlobalSearchScope.notScope(GlobalSearchScope.fileScope(psiFile))
return psiFile.getDeclarations().flatMap { declaration -> return psiFile.getDeclarations().flatMap { declaration ->
val name = (declaration as? JetNamedDeclaration)?.getName() val name = (declaration as? JetNamedDeclaration)?.getName()
if (name != null) { if (name != null) {
val newFqName = StringUtil.getQualifiedName(newPackageName, name)!! val newFqName = StringUtil.getQualifiedName(newPackageName, name)!!
val results = ReferencesSearch.search(declaration, GlobalSearchScope.projectScope(project), false) val results = ReferencesSearch.search(declaration, searchScope, false)
.toSet() .toSet()
.mapTo(ArrayList<UsageInfo?>()) { ref -> .mapTo(ArrayList<UsageInfo?>()) { ref ->
val range = ref.getRangeInElement()!! val range = ref.getRangeInElement()!!
idea/src/org/jetbrains/jet/plugin/refactoring/move/moveUtils.kt
+6
View File
@@ -33,6 +33,9 @@ import org.jetbrains.jet.plugin.JetFileType
import org.jetbrains.jet.lang.psi.JetClassOrObject import org.jetbrains.jet.lang.psi.JetClassOrObject
import org.jetbrains.jet.lang.psi.JetNamedDeclaration import org.jetbrains.jet.lang.psi.JetNamedDeclaration
import org.jetbrains.jet.plugin.imports.canBeReferencedViaImport import org.jetbrains.jet.plugin.imports.canBeReferencedViaImport
import org.jetbrains.jet.plugin.codeInsight.DescriptorToDeclarationUtil
import org.jetbrains.jet.lang.psi.psiUtil.isInsideOf
import org.jetbrains.jet.lang.psi.psiUtil.isAncestor
public class PackageNameInfo(val oldPackageName: FqName, val newPackageName: FqName) public class PackageNameInfo(val oldPackageName: FqName, val newPackageName: FqName)
@@ -52,6 +55,9 @@ public fun JetElement.updateInternalReferencesOnPackageNameChange(
} }
if (descriptor == null || !descriptor.canBeReferencedViaImport()) continue if (descriptor == null || !descriptor.canBeReferencedViaImport()) continue
val declaration = DescriptorToDeclarationUtil.getDeclaration(file, descriptor, bindingContext)
if (declaration == null || isAncestor(declaration, true)) continue
val packageName = DescriptorUtils.getParentOfType( val packageName = DescriptorUtils.getParentOfType(
descriptor, javaClass<PackageFragmentDescriptor>(), false descriptor, javaClass<PackageFragmentDescriptor>(), false
)?.let { DescriptorUtils.getFqName(it).toSafe() } )?.let { DescriptorUtils.getFqName(it).toSafe() }