From 1188f4617afbc691a5fb40656012af93aeaa928b Mon Sep 17 00:00:00 2001
From: Toshiaki Kameyama <kmymtsak@gmail.com>
Date: Tue, 14 Jul 2020 12:21:04 +0900
Subject: [PATCH] Change file's package to match directory: add space after
 package keyword if needed

#KT-39604 Fixed
---
 .../psi/src/org/jetbrains/kotlin/psi/KtPackageDirective.java | 1 +
 .../after/com/example/test.kt                                | 3 +++
 .../before/com/example/test.kt                               | 3 +++
 .../changeToNonDefaultPackageFromRootWithPackageKeyword.test | 5 +++++
 .../inspections/MultiFileLocalInspectionTestGenerated.java   | 5 +++++
 5 files changed, 17 insertions(+)
 create mode 100644 idea/testData/multiFileLocalInspections/reconcilePackageWithDirectory/changeToNonDefaultPackageFromRootWithPackageKeyword/after/com/example/test.kt
 create mode 100644 idea/testData/multiFileLocalInspections/reconcilePackageWithDirectory/changeToNonDefaultPackageFromRootWithPackageKeyword/before/com/example/test.kt
 create mode 100644 idea/testData/multiFileLocalInspections/reconcilePackageWithDirectory/changeToNonDefaultPackageFromRootWithPackageKeyword/changeToNonDefaultPackageFromRootWithPackageKeyword.test

diff --git a/compiler/psi/src/org/jetbrains/kotlin/psi/KtPackageDirective.java b/compiler/psi/src/org/jetbrains/kotlin/psi/KtPackageDirective.java
index 5dc04a7aac5..525bce0873c 100644
--- a/compiler/psi/src/org/jetbrains/kotlin/psi/KtPackageDirective.java
+++ b/compiler/psi/src/org/jetbrains/kotlin/psi/KtPackageDirective.java
@@ -137,6 +137,7 @@ public class KtPackageDirective extends KtModifierListOwnerStub<KotlinPlaceHolde
         PsiElement keyword = getPackageKeyword();
         if (keyword != null) {
             addAfter(newExpression, keyword);
+            addAfter(psiFactory.createWhiteSpace(), keyword);
             return;
         }
 
diff --git a/idea/testData/multiFileLocalInspections/reconcilePackageWithDirectory/changeToNonDefaultPackageFromRootWithPackageKeyword/after/com/example/test.kt b/idea/testData/multiFileLocalInspections/reconcilePackageWithDirectory/changeToNonDefaultPackageFromRootWithPackageKeyword/after/com/example/test.kt
new file mode 100644
index 00000000000..71f2becf9ae
--- /dev/null
+++ b/idea/testData/multiFileLocalInspections/reconcilePackageWithDirectory/changeToNonDefaultPackageFromRootWithPackageKeyword/after/com/example/test.kt
@@ -0,0 +1,3 @@
+package com.example
+
+class Foo
\ No newline at end of file
diff --git a/idea/testData/multiFileLocalInspections/reconcilePackageWithDirectory/changeToNonDefaultPackageFromRootWithPackageKeyword/before/com/example/test.kt b/idea/testData/multiFileLocalInspections/reconcilePackageWithDirectory/changeToNonDefaultPackageFromRootWithPackageKeyword/before/com/example/test.kt
new file mode 100644
index 00000000000..228b0173656
--- /dev/null
+++ b/idea/testData/multiFileLocalInspections/reconcilePackageWithDirectory/changeToNonDefaultPackageFromRootWithPackageKeyword/before/com/example/test.kt
@@ -0,0 +1,3 @@
+<caret>package
+
+class Foo
\ No newline at end of file
diff --git a/idea/testData/multiFileLocalInspections/reconcilePackageWithDirectory/changeToNonDefaultPackageFromRootWithPackageKeyword/changeToNonDefaultPackageFromRootWithPackageKeyword.test b/idea/testData/multiFileLocalInspections/reconcilePackageWithDirectory/changeToNonDefaultPackageFromRootWithPackageKeyword/changeToNonDefaultPackageFromRootWithPackageKeyword.test
new file mode 100644
index 00000000000..5a7dd44f145
--- /dev/null
+++ b/idea/testData/multiFileLocalInspections/reconcilePackageWithDirectory/changeToNonDefaultPackageFromRootWithPackageKeyword/changeToNonDefaultPackageFromRootWithPackageKeyword.test
@@ -0,0 +1,5 @@
+{
+  "mainFile": "com/example/test.kt",
+  "inspectionClass": "org.jetbrains.kotlin.idea.refactoring.move.changePackage.PackageDirectoryMismatchInspection",
+  "fix": "Change file's package to 'com.example'"
+}
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/idea/inspections/MultiFileLocalInspectionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/inspections/MultiFileLocalInspectionTestGenerated.java
index f4509b6c9ea..a94d9769223 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/inspections/MultiFileLocalInspectionTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/inspections/MultiFileLocalInspectionTestGenerated.java
@@ -78,6 +78,11 @@ public class MultiFileLocalInspectionTestGenerated extends AbstractMultiFileLoca
         runTest("idea/testData/multiFileLocalInspections/reconcilePackageWithDirectory/changeToNonDefaultPackageFromRoot/changeToNonDefaultPackageFromRoot.test");
     }
 
+    @TestMetadata("reconcilePackageWithDirectory/changeToNonDefaultPackageFromRootWithPackageKeyword/changeToNonDefaultPackageFromRootWithPackageKeyword.test")
+    public void testReconcilePackageWithDirectory_changeToNonDefaultPackageFromRootWithPackageKeyword_ChangeToNonDefaultPackageFromRootWithPackageKeyword() throws Exception {
+        runTest("idea/testData/multiFileLocalInspections/reconcilePackageWithDirectory/changeToNonDefaultPackageFromRootWithPackageKeyword/changeToNonDefaultPackageFromRootWithPackageKeyword.test");
+    }
+
     @TestMetadata("reconcilePackageWithDirectory/innerClass/innerClass.test")
     public void testReconcilePackageWithDirectory_innerClass_InnerClass() throws Exception {
         runTest("idea/testData/multiFileLocalInspections/reconcilePackageWithDirectory/innerClass/innerClass.test");