Move: Fix reference binding for the case of default target package

#KT-6457 Fixed
This commit is contained in:
Alexey Sedunov
2014-12-15 15:22:23 +03:00
parent bbbd46d9d6
commit bbf951ff03
7 changed files with 32 additions and 0 deletions
@@ -257,6 +257,7 @@ public fun JetSimpleNameExpression.getTopmostParentQualifiedExpressionForSelecto
public fun JetElement.getQualifiedElementSelector(): JetElement? {
return when (this) {
is JetSimpleNameExpression -> this
is JetCallExpression -> getCalleeExpression()
is JetQualifiedExpression -> {
val selector = getSelectorExpression()
if (selector is JetCallExpression) selector.getCalleeExpression() else selector
@@ -0,0 +1,7 @@
package a
class X: Y() {
fun main() {
Y().foo()
}
}
@@ -0,0 +1,5 @@
class <caret>X: Y() {
fun main() {
Y().foo()
}
}
@@ -0,0 +1,5 @@
{
"mainFile": "X.kt",
"type": "MOVE_KOTLIN_TOP_LEVEL_DECLARATIONS",
"targetPackage": "a"
}
@@ -246,6 +246,12 @@ public class JetMoveTestGenerated extends AbstractJetMoveTest {
doTest(fileName);
}
@TestMetadata("kotlin/moveTopLevelDeclarations/misc/moveClassFromDefaultPackage/moveClassFromDefaultPackage.test")
public void testKotlin_moveTopLevelDeclarations_misc_moveClassFromDefaultPackage_MoveClassFromDefaultPackage() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveClassFromDefaultPackage/moveClassFromDefaultPackage.test");
doTest(fileName);
}
@TestMetadata("kotlin/moveTopLevelDeclarations/misc/moveClassToDefaultPackage/moveClassToDefaultPackage.test")
public void testKotlin_moveTopLevelDeclarations_misc_moveClassToDefaultPackage_MoveClassToDefaultPackage() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveClassToDefaultPackage/moveClassToDefaultPackage.test");