Move: Fix processing of callable references to nested Java classes and static methods

#KT-17827 Fixed
2018-02-13 18:58:11 +03:00
parent 441f88c144
commit 17e64ebae0
46 changed files with 230 additions and 12 deletions
@@ -281,7 +281,7 @@ class CallableReferenceMoveRenameUsageInfo(
        val element = element ?: return null
        val reference = reference ?: return null
        val referencedElement = referencedElement ?: return null
-        if (target is KtDeclaration && target.parent is KtFile) {
+        if (target != null && target.isTopLevelKtOrJavaMember()) {
            element.getStrictParentOfType<KtCallableReferenceExpression>()?.receiverExpression?.delete()
            return UnqualifiableMoveRenameUsageInfo(element, reference, referencedElement, element.containingFile!!, addImportToOriginalFile, isInternal)
        }