diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/changePackage/PackageDirectoryMismatchInspection.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/changePackage/PackageDirectoryMismatchInspection.kt index 5e9dcbe13e4..c7eabac4678 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/changePackage/PackageDirectoryMismatchInspection.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/changePackage/PackageDirectoryMismatchInspection.kt @@ -35,7 +35,7 @@ import org.jetbrains.kotlin.psi.psiUtil.startOffset class PackageDirectoryMismatchInspection : AbstractKotlinInspection() { override fun buildVisitor(holder: ProblemsHolder, isOnTheFly: Boolean) = packageDirectiveVisitor(fun(directive: KtPackageDirective) { val file = directive.containingKtFile - if (file.isInjectedFragment || file.packageMatchesDirectoryOrImplicit()) return + if (file.textLength == 0 || file.isInjectedFragment || file.packageMatchesDirectoryOrImplicit()) return val fixes = mutableListOf() val qualifiedName = directive.qualifiedName diff --git a/idea/testData/multiFileInspections/mismatchedPackageDirectoryWithEmptyKts/before/foo/fooPackageMatched.kts b/idea/testData/multiFileInspections/mismatchedPackageDirectoryWithEmptyKts/before/foo/fooPackageMatched.kts new file mode 100644 index 00000000000..e69de29bb2d diff --git a/idea/testData/multiFileInspections/mismatchedPackageDirectoryWithEmptyKts/expected.xml b/idea/testData/multiFileInspections/mismatchedPackageDirectoryWithEmptyKts/expected.xml new file mode 100644 index 00000000000..e79afdd1c43 --- /dev/null +++ b/idea/testData/multiFileInspections/mismatchedPackageDirectoryWithEmptyKts/expected.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/idea/testData/multiFileInspections/mismatchedPackageDirectoryWithEmptyKts/mismatchedPackageDirectoryWithEmptyKts.test b/idea/testData/multiFileInspections/mismatchedPackageDirectoryWithEmptyKts/mismatchedPackageDirectoryWithEmptyKts.test new file mode 100644 index 00000000000..3ac2faa69dc --- /dev/null +++ b/idea/testData/multiFileInspections/mismatchedPackageDirectoryWithEmptyKts/mismatchedPackageDirectoryWithEmptyKts.test @@ -0,0 +1,3 @@ +{ + "inspectionClass": "org.jetbrains.kotlin.idea.refactoring.move.changePackage.PackageDirectoryMismatchInspection" +} \ No newline at end of file diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/MultiFileInspectionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/MultiFileInspectionTestGenerated.java index 0c3faf051a4..3aec4f9e90a 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/MultiFileInspectionTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/MultiFileInspectionTestGenerated.java @@ -49,6 +49,11 @@ public class MultiFileInspectionTestGenerated extends AbstractMultiFileInspectio runTest("idea/testData/multiFileInspections/mainInTwoModules/mainInTwoModules.test"); } + @TestMetadata("mismatchedPackageDirectoryWithEmptyKts/mismatchedPackageDirectoryWithEmptyKts.test") + public void testMismatchedPackageDirectoryWithEmptyKts_MismatchedPackageDirectoryWithEmptyKts() throws Exception { + runTest("idea/testData/multiFileInspections/mismatchedPackageDirectoryWithEmptyKts/mismatchedPackageDirectoryWithEmptyKts.test"); + } + @TestMetadata("mismatchedProjectAndDirectory/mismatchedProjectAndDirectory.test") public void testMismatchedProjectAndDirectory_MismatchedProjectAndDirectory() throws Exception { runTest("idea/testData/multiFileInspections/mismatchedProjectAndDirectory/mismatchedProjectAndDirectory.test");