From 60583e557ffe2d9210aa58bce366973765becd70 Mon Sep 17 00:00:00 2001
From: Alexey Sedunov <alexey.sedunov@jetbrains.com>
Date: Tue, 19 Jun 2018 17:18:45 +0300
Subject: [PATCH] PSI: Do not delete package directive for file in default
 package

 #KT-24968 Fixed
---
 .../src/org/jetbrains/kotlin/psi/KtPackageDirective.java    | 5 ++++-
 .../after/test.kt                                           | 6 ++++++
 .../after/test2.kt                                          | 6 ++++++
 .../before/test.kt                                          | 6 ++++++
 .../copyFIleToDefaultPackage.test                           | 5 +++++
 .../kotlin/idea/refactoring/copy/CopyTestGenerated.java     | 5 +++++
 6 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 idea/testData/refactoring/copy/copyFileFromDefaultPackageToDefaultPackage/after/test.kt
 create mode 100644 idea/testData/refactoring/copy/copyFileFromDefaultPackageToDefaultPackage/after/test2.kt
 create mode 100644 idea/testData/refactoring/copy/copyFileFromDefaultPackageToDefaultPackage/before/test.kt
 create mode 100644 idea/testData/refactoring/copy/copyFileFromDefaultPackageToDefaultPackage/copyFIleToDefaultPackage.test

diff --git a/compiler/psi/src/org/jetbrains/kotlin/psi/KtPackageDirective.java b/compiler/psi/src/org/jetbrains/kotlin/psi/KtPackageDirective.java
index a16d35cc9bf..5dc04a7aac5 100644
--- a/compiler/psi/src/org/jetbrains/kotlin/psi/KtPackageDirective.java
+++ b/compiler/psi/src/org/jetbrains/kotlin/psi/KtPackageDirective.java
@@ -119,7 +119,10 @@ public class KtPackageDirective extends KtModifierListOwnerStub<KotlinPlaceHolde
 
     public void setFqName(@NotNull FqName fqName) {
         if (fqName.isRoot()) {
-            delete();
+            if (!getFqName().isRoot()) {
+                //noinspection ConstantConditions
+                replace(new KtPsiFactory(getProject()).createFile("").getPackageDirective());
+            }
             return;
         }
 
diff --git a/idea/testData/refactoring/copy/copyFileFromDefaultPackageToDefaultPackage/after/test.kt b/idea/testData/refactoring/copy/copyFileFromDefaultPackageToDefaultPackage/after/test.kt
new file mode 100644
index 00000000000..71d1b354d30
--- /dev/null
+++ b/idea/testData/refactoring/copy/copyFileFromDefaultPackageToDefaultPackage/after/test.kt
@@ -0,0 +1,6 @@
+val a = 42
+
+// comment
+
+// some other comment
+val s = ""
\ No newline at end of file
diff --git a/idea/testData/refactoring/copy/copyFileFromDefaultPackageToDefaultPackage/after/test2.kt b/idea/testData/refactoring/copy/copyFileFromDefaultPackageToDefaultPackage/after/test2.kt
new file mode 100644
index 00000000000..71d1b354d30
--- /dev/null
+++ b/idea/testData/refactoring/copy/copyFileFromDefaultPackageToDefaultPackage/after/test2.kt
@@ -0,0 +1,6 @@
+val a = 42
+
+// comment
+
+// some other comment
+val s = ""
\ No newline at end of file
diff --git a/idea/testData/refactoring/copy/copyFileFromDefaultPackageToDefaultPackage/before/test.kt b/idea/testData/refactoring/copy/copyFileFromDefaultPackageToDefaultPackage/before/test.kt
new file mode 100644
index 00000000000..71d1b354d30
--- /dev/null
+++ b/idea/testData/refactoring/copy/copyFileFromDefaultPackageToDefaultPackage/before/test.kt
@@ -0,0 +1,6 @@
+val a = 42
+
+// comment
+
+// some other comment
+val s = ""
\ No newline at end of file
diff --git a/idea/testData/refactoring/copy/copyFileFromDefaultPackageToDefaultPackage/copyFIleToDefaultPackage.test b/idea/testData/refactoring/copy/copyFileFromDefaultPackageToDefaultPackage/copyFIleToDefaultPackage.test
new file mode 100644
index 00000000000..2cfb1f383a0
--- /dev/null
+++ b/idea/testData/refactoring/copy/copyFileFromDefaultPackageToDefaultPackage/copyFIleToDefaultPackage.test
@@ -0,0 +1,5 @@
+{
+  "mainFile": "test.kt",
+  "targetPackage": "",
+  "newName": "test2.kt"
+}
diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/copy/CopyTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/refactoring/copy/CopyTestGenerated.java
index 01106c7fe46..9950d5a20d4 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/copy/CopyTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/copy/CopyTestGenerated.java
@@ -64,6 +64,11 @@ public class CopyTestGenerated extends AbstractCopyTest {
         runTest("idea/testData/refactoring/copy/copyFIleFromDefaultPackage/copyFIleFromDefaultPackage.test");
     }
 
+    @TestMetadata("copyFileFromDefaultPackageToDefaultPackage/copyFIleToDefaultPackage.test")
+    public void testCopyFileFromDefaultPackageToDefaultPackage_CopyFIleToDefaultPackage() throws Exception {
+        runTest("idea/testData/refactoring/copy/copyFileFromDefaultPackageToDefaultPackage/copyFIleToDefaultPackage.test");
+    }
+
     @TestMetadata("copyFIleRetainContent/copyFIleRetainContent.test")
     public void testCopyFIleRetainContent_CopyFIleRetainContent() throws Exception {
         runTest("idea/testData/refactoring/copy/copyFIleRetainContent/copyFIleRetainContent.test");