From e48616e73957666cc9ea82545af34c0ad2fa5047 Mon Sep 17 00:00:00 2001
From: Alexey Sedunov <alexey.sedunov@jetbrains.com>
Date: Fri, 28 Feb 2014 15:53:55 +0400
Subject: [PATCH] Do not insert parentheses into package directives Add tests
 for "Move Package" refactoring

---
 .../src/org/jetbrains/jet/lang/psi/JetPsiUtil.java |  2 ++
 .../movePackage/movePackage/after/_a/noImports.kt  |  8 ++++++++
 .../after/_a/specificImportsWithAliases.kt         | 12 ++++++++++++
 .../movePackage/movePackage/after/b/a/main.kt      |  7 +++++++
 .../movePackage/after/b/a/noImports.java           | 10 ++++++++++
 .../movePackage/movePackage/after/b/a/noImports.kt |  8 ++++++++
 .../after/b/a/onDemandStaticImport.java            | 12 ++++++++++++
 .../after/b/a/specificImportsWithAliases.kt        | 12 ++++++++++++
 .../after/b/a/specificStaticImports.java           | 14 ++++++++++++++
 .../movePackage/movePackage/after/c/noImports.java | 10 ++++++++++
 .../movePackage/movePackage/after/c/noImports.kt   | 11 +++++++++++
 .../movePackage/after/c/onDemandImport.java        | 12 ++++++++++++
 .../movePackage/after/c/onDemandImport.kt          | 10 ++++++++++
 .../movePackage/after/c/onDemandStaticImport.java  | 12 ++++++++++++
 .../movePackage/after/c/specificImports.java       | 13 +++++++++++++
 .../movePackage/after/c/specificImports.kt         | 12 ++++++++++++
 .../after/c/specificImportsWithAliases.kt          | 12 ++++++++++++
 .../movePackage/after/c/specificStaticImports.java | 14 ++++++++++++++
 .../movePackage/movePackage/before/_a/noImports.kt |  8 ++++++++
 .../before/_a/specificImportsWithAliases.kt        | 12 ++++++++++++
 .../movePackage/movePackage/before/a/main.kt       |  7 +++++++
 .../movePackage/before/a/noImports.java            | 10 ++++++++++
 .../movePackage/movePackage/before/a/noImports.kt  |  8 ++++++++
 .../movePackage/before/a/onDemandStaticImport.java | 12 ++++++++++++
 .../before/a/specificImportsWithAliases.kt         | 12 ++++++++++++
 .../before/a/specificStaticImports.java            | 14 ++++++++++++++
 .../movePackage/before/c/noImports.java            | 10 ++++++++++
 .../movePackage/movePackage/before/c/noImports.kt  |  8 ++++++++
 .../movePackage/before/c/onDemandImport.java       | 12 ++++++++++++
 .../movePackage/before/c/onDemandImport.kt         | 10 ++++++++++
 .../movePackage/before/c/onDemandStaticImport.java | 12 ++++++++++++
 .../movePackage/before/c/specificImports.java      | 13 +++++++++++++
 .../movePackage/before/c/specificImports.kt        | 12 ++++++++++++
 .../before/c/specificImportsWithAliases.kt         | 12 ++++++++++++
 .../before/c/specificStaticImports.java            | 14 ++++++++++++++
 .../movePackage/movePackage/movePackage.test       |  6 ++++++
 .../refactoring/move/JetMoveTestGenerated.java     |  5 +++++
 37 files changed, 388 insertions(+)
 create mode 100644 idea/testData/refactoring/move/kotlin/movePackage/movePackage/after/_a/noImports.kt
 create mode 100644 idea/testData/refactoring/move/kotlin/movePackage/movePackage/after/_a/specificImportsWithAliases.kt
 create mode 100644 idea/testData/refactoring/move/kotlin/movePackage/movePackage/after/b/a/main.kt
 create mode 100644 idea/testData/refactoring/move/kotlin/movePackage/movePackage/after/b/a/noImports.java
 create mode 100644 idea/testData/refactoring/move/kotlin/movePackage/movePackage/after/b/a/noImports.kt
 create mode 100644 idea/testData/refactoring/move/kotlin/movePackage/movePackage/after/b/a/onDemandStaticImport.java
 create mode 100644 idea/testData/refactoring/move/kotlin/movePackage/movePackage/after/b/a/specificImportsWithAliases.kt
 create mode 100644 idea/testData/refactoring/move/kotlin/movePackage/movePackage/after/b/a/specificStaticImports.java
 create mode 100644 idea/testData/refactoring/move/kotlin/movePackage/movePackage/after/c/noImports.java
 create mode 100644 idea/testData/refactoring/move/kotlin/movePackage/movePackage/after/c/noImports.kt
 create mode 100644 idea/testData/refactoring/move/kotlin/movePackage/movePackage/after/c/onDemandImport.java
 create mode 100644 idea/testData/refactoring/move/kotlin/movePackage/movePackage/after/c/onDemandImport.kt
 create mode 100644 idea/testData/refactoring/move/kotlin/movePackage/movePackage/after/c/onDemandStaticImport.java
 create mode 100644 idea/testData/refactoring/move/kotlin/movePackage/movePackage/after/c/specificImports.java
 create mode 100644 idea/testData/refactoring/move/kotlin/movePackage/movePackage/after/c/specificImports.kt
 create mode 100644 idea/testData/refactoring/move/kotlin/movePackage/movePackage/after/c/specificImportsWithAliases.kt
 create mode 100644 idea/testData/refactoring/move/kotlin/movePackage/movePackage/after/c/specificStaticImports.java
 create mode 100644 idea/testData/refactoring/move/kotlin/movePackage/movePackage/before/_a/noImports.kt
 create mode 100644 idea/testData/refactoring/move/kotlin/movePackage/movePackage/before/_a/specificImportsWithAliases.kt
 create mode 100644 idea/testData/refactoring/move/kotlin/movePackage/movePackage/before/a/main.kt
 create mode 100644 idea/testData/refactoring/move/kotlin/movePackage/movePackage/before/a/noImports.java
 create mode 100644 idea/testData/refactoring/move/kotlin/movePackage/movePackage/before/a/noImports.kt
 create mode 100644 idea/testData/refactoring/move/kotlin/movePackage/movePackage/before/a/onDemandStaticImport.java
 create mode 100644 idea/testData/refactoring/move/kotlin/movePackage/movePackage/before/a/specificImportsWithAliases.kt
 create mode 100644 idea/testData/refactoring/move/kotlin/movePackage/movePackage/before/a/specificStaticImports.java
 create mode 100644 idea/testData/refactoring/move/kotlin/movePackage/movePackage/before/c/noImports.java
 create mode 100644 idea/testData/refactoring/move/kotlin/movePackage/movePackage/before/c/noImports.kt
 create mode 100644 idea/testData/refactoring/move/kotlin/movePackage/movePackage/before/c/onDemandImport.java
 create mode 100644 idea/testData/refactoring/move/kotlin/movePackage/movePackage/before/c/onDemandImport.kt
 create mode 100644 idea/testData/refactoring/move/kotlin/movePackage/movePackage/before/c/onDemandStaticImport.java
 create mode 100644 idea/testData/refactoring/move/kotlin/movePackage/movePackage/before/c/specificImports.java
 create mode 100644 idea/testData/refactoring/move/kotlin/movePackage/movePackage/before/c/specificImports.kt
 create mode 100644 idea/testData/refactoring/move/kotlin/movePackage/movePackage/before/c/specificImportsWithAliases.kt
 create mode 100644 idea/testData/refactoring/move/kotlin/movePackage/movePackage/before/c/specificStaticImports.java
 create mode 100644 idea/testData/refactoring/move/kotlin/movePackage/movePackage/movePackage.test

diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiUtil.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiUtil.java
index 77cab37c49b..6f26c31a31c 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiUtil.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiUtil.java
@@ -650,6 +650,8 @@ public class JetPsiUtil {
             return false;
         }
 
+        if (parentExpression instanceof JetPackageDirective) return false;
+
         if (parentExpression instanceof JetWhenExpression || innerExpression instanceof JetWhenExpression) {
             return false;
         }
diff --git a/idea/testData/refactoring/move/kotlin/movePackage/movePackage/after/_a/noImports.kt b/idea/testData/refactoring/move/kotlin/movePackage/movePackage/after/_a/noImports.kt
new file mode 100644
index 00000000000..f5ad0f77af5
--- /dev/null
+++ b/idea/testData/refactoring/move/kotlin/movePackage/movePackage/after/_a/noImports.kt
@@ -0,0 +1,8 @@
+package b.a
+
+fun bar() {
+    val t: A = A()
+    foo()
+    println(x)
+    x = ""
+}
diff --git a/idea/testData/refactoring/move/kotlin/movePackage/movePackage/after/_a/specificImportsWithAliases.kt b/idea/testData/refactoring/move/kotlin/movePackage/movePackage/after/_a/specificImportsWithAliases.kt
new file mode 100644
index 00000000000..c4f5c16df32
--- /dev/null
+++ b/idea/testData/refactoring/move/kotlin/movePackage/movePackage/after/_a/specificImportsWithAliases.kt
@@ -0,0 +1,12 @@
+package b.a
+
+import A as AA
+import foo as foofoo
+import x as xx
+
+fun bar() {
+    val t: AA = AA()
+    foofoo()
+    println(xx)
+    xx = ""
+}
diff --git a/idea/testData/refactoring/move/kotlin/movePackage/movePackage/after/b/a/main.kt b/idea/testData/refactoring/move/kotlin/movePackage/movePackage/after/b/a/main.kt
new file mode 100644
index 00000000000..a309511deb1
--- /dev/null
+++ b/idea/testData/refactoring/move/kotlin/movePackage/movePackage/after/b/a/main.kt
@@ -0,0 +1,7 @@
+package b.a
+
+public class A
+
+public fun foo() { }
+
+public var x = ""
diff --git a/idea/testData/refactoring/move/kotlin/movePackage/movePackage/after/b/a/noImports.java b/idea/testData/refactoring/move/kotlin/movePackage/movePackage/after/b/a/noImports.java
new file mode 100644
index 00000000000..0ebb3194108
--- /dev/null
+++ b/idea/testData/refactoring/move/kotlin/movePackage/movePackage/after/b/a/noImports.java
@@ -0,0 +1,10 @@
+package b.a;
+
+class J {
+    void bar() {
+        A t = new A();
+        APackage.foo();
+        System.out.println(APackage.getX());
+        APackage.setX("");
+    }
+}
diff --git a/idea/testData/refactoring/move/kotlin/movePackage/movePackage/after/b/a/noImports.kt b/idea/testData/refactoring/move/kotlin/movePackage/movePackage/after/b/a/noImports.kt
new file mode 100644
index 00000000000..f5ad0f77af5
--- /dev/null
+++ b/idea/testData/refactoring/move/kotlin/movePackage/movePackage/after/b/a/noImports.kt
@@ -0,0 +1,8 @@
+package b.a
+
+fun bar() {
+    val t: A = A()
+    foo()
+    println(x)
+    x = ""
+}
diff --git a/idea/testData/refactoring/move/kotlin/movePackage/movePackage/after/b/a/onDemandStaticImport.java b/idea/testData/refactoring/move/kotlin/movePackage/movePackage/after/b/a/onDemandStaticImport.java
new file mode 100644
index 00000000000..0a619c8a8bb
--- /dev/null
+++ b/idea/testData/refactoring/move/kotlin/movePackage/movePackage/after/b/a/onDemandStaticImport.java
@@ -0,0 +1,12 @@
+package b.a;
+
+import static APackage.*;
+
+class J {
+    void bar() {
+        A t = new A();
+        foo();
+        System.out.println(getX());
+        setX("");
+    }
+}
diff --git a/idea/testData/refactoring/move/kotlin/movePackage/movePackage/after/b/a/specificImportsWithAliases.kt b/idea/testData/refactoring/move/kotlin/movePackage/movePackage/after/b/a/specificImportsWithAliases.kt
new file mode 100644
index 00000000000..c4f5c16df32
--- /dev/null
+++ b/idea/testData/refactoring/move/kotlin/movePackage/movePackage/after/b/a/specificImportsWithAliases.kt
@@ -0,0 +1,12 @@
+package b.a
+
+import A as AA
+import foo as foofoo
+import x as xx
+
+fun bar() {
+    val t: AA = AA()
+    foofoo()
+    println(xx)
+    xx = ""
+}
diff --git a/idea/testData/refactoring/move/kotlin/movePackage/movePackage/after/b/a/specificStaticImports.java b/idea/testData/refactoring/move/kotlin/movePackage/movePackage/after/b/a/specificStaticImports.java
new file mode 100644
index 00000000000..aae3cf61080
--- /dev/null
+++ b/idea/testData/refactoring/move/kotlin/movePackage/movePackage/after/b/a/specificStaticImports.java
@@ -0,0 +1,14 @@
+package b.a;
+
+import static APackage.foo;
+import static APackage.getX;
+import static APackage.setX;
+
+class J {
+    void bar() {
+        A t = new A();
+        foo();
+        System.out.println(getX());
+        setX("");
+    }
+}
diff --git a/idea/testData/refactoring/move/kotlin/movePackage/movePackage/after/c/noImports.java b/idea/testData/refactoring/move/kotlin/movePackage/movePackage/after/c/noImports.java
new file mode 100644
index 00000000000..8a03bb89f23
--- /dev/null
+++ b/idea/testData/refactoring/move/kotlin/movePackage/movePackage/after/c/noImports.java
@@ -0,0 +1,10 @@
+package c;
+
+class J {
+    void bar() {
+        b.a.A t = new b.a.A();
+        b.a.APackage.foo();
+        System.out.println(b.a.APackage.getX());
+        b.a.APackage.setX("");
+    }
+}
diff --git a/idea/testData/refactoring/move/kotlin/movePackage/movePackage/after/c/noImports.kt b/idea/testData/refactoring/move/kotlin/movePackage/movePackage/after/c/noImports.kt
new file mode 100644
index 00000000000..55fba761ff9
--- /dev/null
+++ b/idea/testData/refactoring/move/kotlin/movePackage/movePackage/after/c/noImports.kt
@@ -0,0 +1,11 @@
+package c
+
+import b.a.A
+import b.a
+
+fun bar() {
+    val t: A = A()
+    a.foo()
+    println(a.x)
+    a.x = ""
+}
diff --git a/idea/testData/refactoring/move/kotlin/movePackage/movePackage/after/c/onDemandImport.java b/idea/testData/refactoring/move/kotlin/movePackage/movePackage/after/c/onDemandImport.java
new file mode 100644
index 00000000000..878318a0e4e
--- /dev/null
+++ b/idea/testData/refactoring/move/kotlin/movePackage/movePackage/after/c/onDemandImport.java
@@ -0,0 +1,12 @@
+package c;
+
+import b.a.*;
+
+class J {
+    void bar() {
+        A t = new A();
+        APackage.foo();
+        System.out.println(APackage.getX());
+        APackage.setX("");
+    }
+}
diff --git a/idea/testData/refactoring/move/kotlin/movePackage/movePackage/after/c/onDemandImport.kt b/idea/testData/refactoring/move/kotlin/movePackage/movePackage/after/c/onDemandImport.kt
new file mode 100644
index 00000000000..2d9b3c8b4f1
--- /dev/null
+++ b/idea/testData/refactoring/move/kotlin/movePackage/movePackage/after/c/onDemandImport.kt
@@ -0,0 +1,10 @@
+package c
+
+import b.a.*
+
+fun bar() {
+    val t: A = A()
+    foo()
+    println(x)
+    x = ""
+}
diff --git a/idea/testData/refactoring/move/kotlin/movePackage/movePackage/after/c/onDemandStaticImport.java b/idea/testData/refactoring/move/kotlin/movePackage/movePackage/after/c/onDemandStaticImport.java
new file mode 100644
index 00000000000..04c689966a7
--- /dev/null
+++ b/idea/testData/refactoring/move/kotlin/movePackage/movePackage/after/c/onDemandStaticImport.java
@@ -0,0 +1,12 @@
+package c;
+
+import static b.a.APackage.*;
+
+class J {
+    void bar() {
+        b.a.A t = new b.a.A();
+        foo();
+        System.out.println(getX());
+        setX("");
+    }
+}
diff --git a/idea/testData/refactoring/move/kotlin/movePackage/movePackage/after/c/specificImports.java b/idea/testData/refactoring/move/kotlin/movePackage/movePackage/after/c/specificImports.java
new file mode 100644
index 00000000000..706efa3dfa0
--- /dev/null
+++ b/idea/testData/refactoring/move/kotlin/movePackage/movePackage/after/c/specificImports.java
@@ -0,0 +1,13 @@
+package c;
+
+import b.a.A;
+import b.a.APackage;
+
+class J {
+    void bar() {
+        A t = new A();
+        APackage.foo();
+        System.out.println(APackage.getX());
+        APackage.setX("");
+    }
+}
diff --git a/idea/testData/refactoring/move/kotlin/movePackage/movePackage/after/c/specificImports.kt b/idea/testData/refactoring/move/kotlin/movePackage/movePackage/after/c/specificImports.kt
new file mode 100644
index 00000000000..5b8766b4b5b
--- /dev/null
+++ b/idea/testData/refactoring/move/kotlin/movePackage/movePackage/after/c/specificImports.kt
@@ -0,0 +1,12 @@
+package c
+
+import b.a.A
+import b.a.foo
+import b.a.x
+
+fun bar() {
+    val t: A = A()
+    foo()
+    println(x)
+    x = ""
+}
diff --git a/idea/testData/refactoring/move/kotlin/movePackage/movePackage/after/c/specificImportsWithAliases.kt b/idea/testData/refactoring/move/kotlin/movePackage/movePackage/after/c/specificImportsWithAliases.kt
new file mode 100644
index 00000000000..cb34e9a7d97
--- /dev/null
+++ b/idea/testData/refactoring/move/kotlin/movePackage/movePackage/after/c/specificImportsWithAliases.kt
@@ -0,0 +1,12 @@
+package c
+
+import b.a.A as AA
+import b.a.foo as foofoo
+import b.a.x as xx
+
+fun bar() {
+    val t: AA = AA()
+    foofoo()
+    println(xx)
+    xx = ""
+}
diff --git a/idea/testData/refactoring/move/kotlin/movePackage/movePackage/after/c/specificStaticImports.java b/idea/testData/refactoring/move/kotlin/movePackage/movePackage/after/c/specificStaticImports.java
new file mode 100644
index 00000000000..7019ae4388a
--- /dev/null
+++ b/idea/testData/refactoring/move/kotlin/movePackage/movePackage/after/c/specificStaticImports.java
@@ -0,0 +1,14 @@
+package c;
+
+import static b.a.APackage.foo;
+import static b.a.APackage.getX;
+import static b.a.APackage.setX;
+
+class J {
+    void bar() {
+        b.a.A t = new b.a.A();
+        foo();
+        System.out.println(getX());
+        setX("");
+    }
+}
diff --git a/idea/testData/refactoring/move/kotlin/movePackage/movePackage/before/_a/noImports.kt b/idea/testData/refactoring/move/kotlin/movePackage/movePackage/before/_a/noImports.kt
new file mode 100644
index 00000000000..625fe701b4c
--- /dev/null
+++ b/idea/testData/refactoring/move/kotlin/movePackage/movePackage/before/_a/noImports.kt
@@ -0,0 +1,8 @@
+package a
+
+fun bar() {
+    val t: A = A()
+    foo()
+    println(x)
+    x = ""
+}
diff --git a/idea/testData/refactoring/move/kotlin/movePackage/movePackage/before/_a/specificImportsWithAliases.kt b/idea/testData/refactoring/move/kotlin/movePackage/movePackage/before/_a/specificImportsWithAliases.kt
new file mode 100644
index 00000000000..b8c3b7555e4
--- /dev/null
+++ b/idea/testData/refactoring/move/kotlin/movePackage/movePackage/before/_a/specificImportsWithAliases.kt
@@ -0,0 +1,12 @@
+package a
+
+import A as AA
+import foo as foofoo
+import x as xx
+
+fun bar() {
+    val t: AA = AA()
+    foofoo()
+    println(xx)
+    xx = ""
+}
diff --git a/idea/testData/refactoring/move/kotlin/movePackage/movePackage/before/a/main.kt b/idea/testData/refactoring/move/kotlin/movePackage/movePackage/before/a/main.kt
new file mode 100644
index 00000000000..001d4099e5a
--- /dev/null
+++ b/idea/testData/refactoring/move/kotlin/movePackage/movePackage/before/a/main.kt
@@ -0,0 +1,7 @@
+package a
+
+public class A
+
+public fun foo() { }
+
+public var x = ""
diff --git a/idea/testData/refactoring/move/kotlin/movePackage/movePackage/before/a/noImports.java b/idea/testData/refactoring/move/kotlin/movePackage/movePackage/before/a/noImports.java
new file mode 100644
index 00000000000..0ca0946d2df
--- /dev/null
+++ b/idea/testData/refactoring/move/kotlin/movePackage/movePackage/before/a/noImports.java
@@ -0,0 +1,10 @@
+package a;
+
+class J {
+    void bar() {
+        A t = new A();
+        APackage.foo();
+        System.out.println(APackage.getX());
+        APackage.setX("");
+    }
+}
diff --git a/idea/testData/refactoring/move/kotlin/movePackage/movePackage/before/a/noImports.kt b/idea/testData/refactoring/move/kotlin/movePackage/movePackage/before/a/noImports.kt
new file mode 100644
index 00000000000..625fe701b4c
--- /dev/null
+++ b/idea/testData/refactoring/move/kotlin/movePackage/movePackage/before/a/noImports.kt
@@ -0,0 +1,8 @@
+package a
+
+fun bar() {
+    val t: A = A()
+    foo()
+    println(x)
+    x = ""
+}
diff --git a/idea/testData/refactoring/move/kotlin/movePackage/movePackage/before/a/onDemandStaticImport.java b/idea/testData/refactoring/move/kotlin/movePackage/movePackage/before/a/onDemandStaticImport.java
new file mode 100644
index 00000000000..a9738e9d42e
--- /dev/null
+++ b/idea/testData/refactoring/move/kotlin/movePackage/movePackage/before/a/onDemandStaticImport.java
@@ -0,0 +1,12 @@
+package a;
+
+import static APackage.*;
+
+class J {
+    void bar() {
+        A t = new A();
+        foo();
+        System.out.println(getX());
+        setX("");
+    }
+}
diff --git a/idea/testData/refactoring/move/kotlin/movePackage/movePackage/before/a/specificImportsWithAliases.kt b/idea/testData/refactoring/move/kotlin/movePackage/movePackage/before/a/specificImportsWithAliases.kt
new file mode 100644
index 00000000000..b8c3b7555e4
--- /dev/null
+++ b/idea/testData/refactoring/move/kotlin/movePackage/movePackage/before/a/specificImportsWithAliases.kt
@@ -0,0 +1,12 @@
+package a
+
+import A as AA
+import foo as foofoo
+import x as xx
+
+fun bar() {
+    val t: AA = AA()
+    foofoo()
+    println(xx)
+    xx = ""
+}
diff --git a/idea/testData/refactoring/move/kotlin/movePackage/movePackage/before/a/specificStaticImports.java b/idea/testData/refactoring/move/kotlin/movePackage/movePackage/before/a/specificStaticImports.java
new file mode 100644
index 00000000000..1abff48efa9
--- /dev/null
+++ b/idea/testData/refactoring/move/kotlin/movePackage/movePackage/before/a/specificStaticImports.java
@@ -0,0 +1,14 @@
+package a;
+
+import static APackage.foo;
+import static APackage.getX;
+import static APackage.setX;
+
+class J {
+    void bar() {
+        A t = new A();
+        foo();
+        System.out.println(getX());
+        setX("");
+    }
+}
diff --git a/idea/testData/refactoring/move/kotlin/movePackage/movePackage/before/c/noImports.java b/idea/testData/refactoring/move/kotlin/movePackage/movePackage/before/c/noImports.java
new file mode 100644
index 00000000000..c58d47c569b
--- /dev/null
+++ b/idea/testData/refactoring/move/kotlin/movePackage/movePackage/before/c/noImports.java
@@ -0,0 +1,10 @@
+package c;
+
+class J {
+    void bar() {
+        a.A t = new a.A();
+        a.APackage.foo();
+        System.out.println(a.APackage.getX());
+        a.APackage.setX("");
+    }
+}
diff --git a/idea/testData/refactoring/move/kotlin/movePackage/movePackage/before/c/noImports.kt b/idea/testData/refactoring/move/kotlin/movePackage/movePackage/before/c/noImports.kt
new file mode 100644
index 00000000000..d846897545f
--- /dev/null
+++ b/idea/testData/refactoring/move/kotlin/movePackage/movePackage/before/c/noImports.kt
@@ -0,0 +1,8 @@
+package c
+
+fun bar() {
+    val t: a.A = a.A()
+    a.foo()
+    println(a.x)
+    a.x = ""
+}
diff --git a/idea/testData/refactoring/move/kotlin/movePackage/movePackage/before/c/onDemandImport.java b/idea/testData/refactoring/move/kotlin/movePackage/movePackage/before/c/onDemandImport.java
new file mode 100644
index 00000000000..91ea4c412ec
--- /dev/null
+++ b/idea/testData/refactoring/move/kotlin/movePackage/movePackage/before/c/onDemandImport.java
@@ -0,0 +1,12 @@
+package c;
+
+import a.*;
+
+class J {
+    void bar() {
+        A t = new A();
+        APackage.foo();
+        System.out.println(APackage.getX());
+        APackage.setX("");
+    }
+}
diff --git a/idea/testData/refactoring/move/kotlin/movePackage/movePackage/before/c/onDemandImport.kt b/idea/testData/refactoring/move/kotlin/movePackage/movePackage/before/c/onDemandImport.kt
new file mode 100644
index 00000000000..283f923423a
--- /dev/null
+++ b/idea/testData/refactoring/move/kotlin/movePackage/movePackage/before/c/onDemandImport.kt
@@ -0,0 +1,10 @@
+package c
+
+import a.*
+
+fun bar() {
+    val t: A = A()
+    foo()
+    println(x)
+    x = ""
+}
diff --git a/idea/testData/refactoring/move/kotlin/movePackage/movePackage/before/c/onDemandStaticImport.java b/idea/testData/refactoring/move/kotlin/movePackage/movePackage/before/c/onDemandStaticImport.java
new file mode 100644
index 00000000000..62747278dc0
--- /dev/null
+++ b/idea/testData/refactoring/move/kotlin/movePackage/movePackage/before/c/onDemandStaticImport.java
@@ -0,0 +1,12 @@
+package c;
+
+import static a.APackage.*;
+
+class J {
+    void bar() {
+        a.A t = new a.A();
+        foo();
+        System.out.println(getX());
+        setX("");
+    }
+}
diff --git a/idea/testData/refactoring/move/kotlin/movePackage/movePackage/before/c/specificImports.java b/idea/testData/refactoring/move/kotlin/movePackage/movePackage/before/c/specificImports.java
new file mode 100644
index 00000000000..5ffbdff7168
--- /dev/null
+++ b/idea/testData/refactoring/move/kotlin/movePackage/movePackage/before/c/specificImports.java
@@ -0,0 +1,13 @@
+package c;
+
+import a.A;
+import a.APackage;
+
+class J {
+    void bar() {
+        A t = new A();
+        APackage.foo();
+        System.out.println(APackage.getX());
+        APackage.setX("");
+    }
+}
diff --git a/idea/testData/refactoring/move/kotlin/movePackage/movePackage/before/c/specificImports.kt b/idea/testData/refactoring/move/kotlin/movePackage/movePackage/before/c/specificImports.kt
new file mode 100644
index 00000000000..6d71d53a441
--- /dev/null
+++ b/idea/testData/refactoring/move/kotlin/movePackage/movePackage/before/c/specificImports.kt
@@ -0,0 +1,12 @@
+package c
+
+import a.A
+import a.foo
+import a.x
+
+fun bar() {
+    val t: A = A()
+    foo()
+    println(x)
+    x = ""
+}
diff --git a/idea/testData/refactoring/move/kotlin/movePackage/movePackage/before/c/specificImportsWithAliases.kt b/idea/testData/refactoring/move/kotlin/movePackage/movePackage/before/c/specificImportsWithAliases.kt
new file mode 100644
index 00000000000..4705de3ab6b
--- /dev/null
+++ b/idea/testData/refactoring/move/kotlin/movePackage/movePackage/before/c/specificImportsWithAliases.kt
@@ -0,0 +1,12 @@
+package c
+
+import a.A as AA
+import a.foo as foofoo
+import a.x as xx
+
+fun bar() {
+    val t: AA = AA()
+    foofoo()
+    println(xx)
+    xx = ""
+}
diff --git a/idea/testData/refactoring/move/kotlin/movePackage/movePackage/before/c/specificStaticImports.java b/idea/testData/refactoring/move/kotlin/movePackage/movePackage/before/c/specificStaticImports.java
new file mode 100644
index 00000000000..da42eb14b9e
--- /dev/null
+++ b/idea/testData/refactoring/move/kotlin/movePackage/movePackage/before/c/specificStaticImports.java
@@ -0,0 +1,14 @@
+package c;
+
+import static a.APackage.foo;
+import static a.APackage.getX;
+import static a.APackage.setX;
+
+class J {
+    void bar() {
+        a.A t = new a.A();
+        foo();
+        System.out.println(getX());
+        setX("");
+    }
+}
diff --git a/idea/testData/refactoring/move/kotlin/movePackage/movePackage/movePackage.test b/idea/testData/refactoring/move/kotlin/movePackage/movePackage/movePackage.test
new file mode 100644
index 00000000000..5d74cd59252
--- /dev/null
+++ b/idea/testData/refactoring/move/kotlin/movePackage/movePackage/movePackage.test
@@ -0,0 +1,6 @@
+{
+  "mainFile": "a/main.kt",
+  "type": "MOVE_PACKAGES",
+  "sourcePackage": "a",
+  "targetPackage": "b"
+}
diff --git a/idea/tests/org/jetbrains/jet/plugin/refactoring/move/JetMoveTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/refactoring/move/JetMoveTestGenerated.java
index 8681a1b3e44..086284f5f61 100644
--- a/idea/tests/org/jetbrains/jet/plugin/refactoring/move/JetMoveTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/plugin/refactoring/move/JetMoveTestGenerated.java
@@ -171,4 +171,9 @@ public class JetMoveTestGenerated extends AbstractJetMoveTest {
         doTest("idea/testData/refactoring/move/java/movePackage/movePackageToAnotherPackage/movePackageToAnotherPackage.test");
     }
     
+    @TestMetadata("kotlin/movePackage/movePackage/movePackage.test")
+    public void testKotlin_movePackage_movePackage_MovePackage() throws Exception {
+        doTest("idea/testData/refactoring/move/kotlin/movePackage/movePackage/movePackage.test");
+    }
+    
 }