Move refactoring available on cut/paste declarations from an object to top-level

This commit is contained in:
Valentin Kipyatkov
2017-06-03 13:55:09 +03:00
parent b143b1be42
commit cfa442a42a
18 changed files with 250 additions and 23 deletions
@@ -0,0 +1,15 @@
// IS_AVAILABLE: false
fun foo() {
val v = object : Runnable {
override fun run() {
}
<selection>
fun bar() {
}
</selection>
}
}
<caret>
@@ -0,0 +1,24 @@
package source
class X {
companion object {
fun other() {
foo()
}
}
fun f() {
bar++
}
}
fun foo() {
X.other()
bar++
}
var bar = 1
@@ -0,0 +1,24 @@
package source
class X {
companion object {
<selection>
fun foo() {
other()
bar++
}
var bar = 1
</selection>
fun other() {
foo()
}
}
fun f() {
bar++
}
}
<caret>
@@ -0,0 +1,21 @@
package source
fun sourcePackFun(){}
object SourceObject {
fun other() {
foo()
}
}
fun foo() {
SourceObject.other()
sourcePackFun()
bar++
}
var bar = 1
@@ -0,0 +1,21 @@
package source
fun sourcePackFun(){}
object SourceObject {
<selection>
fun foo() {
other()
sourcePackFun()
bar++
}
var bar = 1
</selection>
fun other() {
foo()
}
}
<caret>
@@ -0,0 +1,8 @@
package source
import target.foo
fun f() {
foo()
SourceObject.other()
}
@@ -0,0 +1,6 @@
package source
fun f() {
SourceObject.foo()
SourceObject.other()
}
@@ -0,0 +1,13 @@
package source
import target.foo
fun sourcePackFun(){}
object SourceObject {
fun other() {
foo()
}
}
@@ -0,0 +1,22 @@
package source
import target.targetPackFun
fun sourcePackFun(){}
object SourceObject {
<selection>
fun foo() {
other()
sourcePackFun()
targetPackFun()
bar++
}
var bar = 1
</selection>
fun other() {
foo()
}
}
@@ -0,0 +1,16 @@
package target
import source.SourceObject
import source.sourcePackFun
fun targetPackFun(){}
fun foo() {
SourceObject.other()
sourcePackFun()
targetPackFun()
bar++
}
var bar = 1
@@ -0,0 +1,5 @@
package target
fun targetPackFun(){}
<caret>
@@ -0,0 +1,3 @@
package to
<caret>