[kotlin] KTIJ-36028 Do not report package mismatch on the 1st declaration

vladimirdolzhenko · intellij-monorepo-bot · commit 7a02d5c5d317 · 2025-10-19T09:56:37.000Z
GitOrigin-RevId: e901b4796921c7288d5766628ed7d4a83ff640cb
diff --git a/plugins/kotlin/code-insight/inspections-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/inspections/PackageDirectoryMismatchInspection.kt b/plugins/kotlin/code-insight/inspections-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/inspections/PackageDirectoryMismatchInspection.kt
@@ -69,7 +69,7 @@ class PackageDirectoryMismatchInspection : AbstractKotlinInspection() {
                 fixes += ChangePackageFix("'${fqNameWithImplicitPrefix.asString()}'", fqNameWithImplicitPrefix)
             }
 
-            val element = if (directive.textLength != 0) directive else (file.declarations.firstOrNull() ?: file)
+            val element = if (directive.textLength != 0) directive else file
             holder.registerProblem(
                 element,
               KotlinBundle.message("text.package.directive.dont.match.file.location"),
diff --git a/plugins/kotlin/code-insight/inspections-k2/tests/test/org/jetbrains/kotlin/idea/k2/inspections/tests/K2MultiFileInspectionTestGenerated.java b/plugins/kotlin/code-insight/inspections-k2/tests/test/org/jetbrains/kotlin/idea/k2/inspections/tests/K2MultiFileInspectionTestGenerated.java
@@ -94,23 +94,4 @@ public void testKotlinSealedInJavaTest() throws Exception {
             runTest("../../../idea/tests/testData/multiFileInspections/kotlinSealedInJavaTest/kotlinSealedInJavaTest.test");
         }
     }
-
-    @RunWith(JUnit3RunnerWithInners.class)
-    @TestMetadata("../../../idea/tests/testData/multiFileInspections/mismatchedProjectAndDirectoryRoot")
-    public static class MismatchedProjectAndDirectoryRoot extends AbstractK2MultiFileInspectionTest {
-        @java.lang.Override
-        @org.jetbrains.annotations.NotNull
-        public final KotlinPluginMode getPluginMode() {
-            return KotlinPluginMode.K2;
-        }
-
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-        }
-
-        @TestMetadata("mismatchedProjectAndDirectoryRoot.test")
-        public void testMismatchedProjectAndDirectoryRoot() throws Exception {
-            runTest("../../../idea/tests/testData/multiFileInspections/mismatchedProjectAndDirectoryRoot/mismatchedProjectAndDirectoryRoot.test");
-        }
-    }
 }
diff --git a/plugins/kotlin/highlighting/highlighting-k2/test/org/jetbrains/kotlin/idea/k2/highlighting/K2HighlightingMetaInfoTestGenerated.java b/plugins/kotlin/highlighting/highlighting-k2/test/org/jetbrains/kotlin/idea/k2/highlighting/K2HighlightingMetaInfoTestGenerated.java
@@ -615,6 +615,11 @@ public void testMismatchPackageDirectoryFileLevelProblem() throws Exception {
             runTest("../../idea/tests/testData/highlighterMetaInfo/mismatchPackageDirectoryFileLevelProblem.kt");
         }
 
+        @TestMetadata("mismatchPackageDirectoryFileLevelProblemDeclarations.kt")
+        public void testMismatchPackageDirectoryFileLevelProblemDeclarations() throws Exception {
+            runTest("../../idea/tests/testData/highlighterMetaInfo/mismatchPackageDirectoryFileLevelProblemDeclarations.kt");
+        }
+
         @TestMetadata("NamedArguments.kt")
         public void testNamedArguments() throws Exception {
             runTest("../../idea/tests/testData/highlighterMetaInfo/NamedArguments.kt");
diff --git a/plugins/kotlin/highlighting/highlighting-k2/test/org/jetbrains/kotlin/idea/k2/highlighting/metaInfoKmp/CommonNativeJvmK2HighlightingMetaInfoTestGenerated.java b/plugins/kotlin/highlighting/highlighting-k2/test/org/jetbrains/kotlin/idea/k2/highlighting/metaInfoKmp/CommonNativeJvmK2HighlightingMetaInfoTestGenerated.java
@@ -336,6 +336,11 @@ public void testMismatchPackageDirectoryFileLevelProblem() throws Exception {
             runTest("../../idea/tests/testData/highlighterMetaInfo/mismatchPackageDirectoryFileLevelProblem.kt");
         }
 
+        @TestMetadata("mismatchPackageDirectoryFileLevelProblemDeclarations.kt")
+        public void testMismatchPackageDirectoryFileLevelProblemDeclarations() throws Exception {
+            runTest("../../idea/tests/testData/highlighterMetaInfo/mismatchPackageDirectoryFileLevelProblemDeclarations.kt");
+        }
+
         @TestMetadata("NamedArguments.kt")
         public void testNamedArguments() throws Exception {
             runTest("../../idea/tests/testData/highlighterMetaInfo/NamedArguments.kt");
diff --git a/plugins/kotlin/highlighting/highlighting-k2/test/org/jetbrains/kotlin/idea/k2/highlighting/metaInfoKmp/JsK2HighlightingMetaInfoTestGenerated.java b/plugins/kotlin/highlighting/highlighting-k2/test/org/jetbrains/kotlin/idea/k2/highlighting/metaInfoKmp/JsK2HighlightingMetaInfoTestGenerated.java
@@ -336,6 +336,11 @@ public void testMismatchPackageDirectoryFileLevelProblem() throws Exception {
             runTest("../../idea/tests/testData/highlighterMetaInfo/mismatchPackageDirectoryFileLevelProblem.kt");
         }
 
+        @TestMetadata("mismatchPackageDirectoryFileLevelProblemDeclarations.kt")
+        public void testMismatchPackageDirectoryFileLevelProblemDeclarations() throws Exception {
+            runTest("../../idea/tests/testData/highlighterMetaInfo/mismatchPackageDirectoryFileLevelProblemDeclarations.kt");
+        }
+
         @TestMetadata("NamedArguments.kt")
         public void testNamedArguments() throws Exception {
             runTest("../../idea/tests/testData/highlighterMetaInfo/NamedArguments.kt");
diff --git a/plugins/kotlin/highlighting/highlighting-k2/test/org/jetbrains/kotlin/idea/k2/highlighting/metaInfoKmp/NativeLinuxK2HighlightingMetaInfoTestGenerated.java b/plugins/kotlin/highlighting/highlighting-k2/test/org/jetbrains/kotlin/idea/k2/highlighting/metaInfoKmp/NativeLinuxK2HighlightingMetaInfoTestGenerated.java
@@ -336,6 +336,11 @@ public void testMismatchPackageDirectoryFileLevelProblem() throws Exception {
             runTest("../../idea/tests/testData/highlighterMetaInfo/mismatchPackageDirectoryFileLevelProblem.kt");
         }
 
+        @TestMetadata("mismatchPackageDirectoryFileLevelProblemDeclarations.kt")
+        public void testMismatchPackageDirectoryFileLevelProblemDeclarations() throws Exception {
+            runTest("../../idea/tests/testData/highlighterMetaInfo/mismatchPackageDirectoryFileLevelProblemDeclarations.kt");
+        }
+
         @TestMetadata("NamedArguments.kt")
         public void testNamedArguments() throws Exception {
             runTest("../../idea/tests/testData/highlighterMetaInfo/NamedArguments.kt");
diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/highlighter/K1HighlightingMetaInfoTestGenerated.java b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/highlighter/K1HighlightingMetaInfoTestGenerated.java
@@ -620,6 +620,11 @@ public void testMismatchPackageDirectoryFileLevelProblem() throws Exception {
             runTest("testData/highlighterMetaInfo/mismatchPackageDirectoryFileLevelProblem.kt");
         }
 
+        @TestMetadata("mismatchPackageDirectoryFileLevelProblemDeclarations.kt")
+        public void testMismatchPackageDirectoryFileLevelProblemDeclarations() throws Exception {
+            runTest("testData/highlighterMetaInfo/mismatchPackageDirectoryFileLevelProblemDeclarations.kt");
+        }
+
         @TestMetadata("NamedArguments.kt")
         public void testNamedArguments() throws Exception {
             runTest("testData/highlighterMetaInfo/NamedArguments.kt");
diff --git a/plugins/kotlin/idea/tests/testData/highlighterMetaInfo/mismatchPackageDirectoryFileLevelProblemDeclarations.kt b/plugins/kotlin/idea/tests/testData/highlighterMetaInfo/mismatchPackageDirectoryFileLevelProblemDeclarations.kt
@@ -0,0 +1,11 @@
+fun foo() {
+    // TODO
+    // TODO
+    // TODO
+    // TODO
+}
+// TOOL: org.jetbrains.kotlin.idea.k2.codeinsight.inspections.PackageDirectoryMismatchInspection
+// IGNORE_K1
+// IMPLICIT_PACKAGE_PREFIX: "foo"
+// HIGHLIGHT_WARNINGS
+// ALLOW_ERRORS
diff --git a/plugins/kotlin/idea/tests/testData/highlighterMetaInfo/mismatchPackageDirectoryFileLevelProblemDeclarations.kt.highlighting b/plugins/kotlin/idea/tests/testData/highlighterMetaInfo/mismatchPackageDirectoryFileLevelProblemDeclarations.kt.highlighting
@@ -0,0 +1,11 @@
+fun foo() {
+    // TODO
+    // TODO
+    // TODO
+    // TODO
+}
+// TOOL: org.jetbrains.kotlin.idea.k2.codeinsight.inspections.PackageDirectoryMismatchInspection
+// IGNORE_K1
+// IMPLICIT_PACKAGE_PREFIX: "foo"
+// HIGHLIGHT_WARNINGS
+// ALLOW_ERRORS
diff --git a/plugins/kotlin/idea/tests/testData/highlighterMetaInfo/mismatchPackageDirectoryFileLevelProblemDeclarations.kt.highlighting.k2 b/plugins/kotlin/idea/tests/testData/highlighterMetaInfo/mismatchPackageDirectoryFileLevelProblemDeclarations.kt.highlighting.k2
@@ -0,0 +1,11 @@
+<!FILE_LEVEL_HIGHLIGHTING!>fun foo() {
+    // <!HIGHLIGHTING("descr='TODO'")!>TODO<!>
+    // <!HIGHLIGHTING("descr='TODO'")!>TODO<!>
+    // <!HIGHLIGHTING("descr='TODO'")!>TODO<!>
+    // <!HIGHLIGHTING("descr='TODO'")!>TODO<!>
+}
+// TOOL: org.jetbrains.kotlin.idea.k2.codeinsight.inspections.PackageDirectoryMismatchInspection
+// IGNORE_K1
+// IMPLICIT_PACKAGE_PREFIX: "foo"
+// HIGHLIGHT_WARNINGS
+// ALLOW_ERRORS<!>
diff --git a/plugins/kotlin/idea/tests/testData/multiFileInspections/mismatchedProjectAndDirectoryRoot/mismatchedProjectAndDirectoryRoot.test b/plugins/kotlin/idea/tests/testData/multiFileInspections/mismatchedProjectAndDirectoryRoot/mismatchedProjectAndDirectoryRoot.test
@@ -1,4 +1,3 @@
 {
-    "inspectionClass": "org.jetbrains.kotlin.idea.refactoring.move.changePackage.PackageDirectoryMismatchInspection",
-    "k2InspectionClass": "org.jetbrains.kotlin.idea.k2.codeinsight.inspections.PackageDirectoryMismatchInspection"
+    "inspectionClass": "org.jetbrains.kotlin.idea.refactoring.move.changePackage.PackageDirectoryMismatchInspection"
 }
diff --git a/plugins/kotlin/util/test-generator-fir/test/org/jetbrains/kotlin/fir/testGenerator/codeinsight/GenerateK2InspectionTests.kt b/plugins/kotlin/util/test-generator-fir/test/org/jetbrains/kotlin/fir/testGenerator/codeinsight/GenerateK2InspectionTests.kt
@@ -193,7 +193,8 @@ internal fun MutableTWorkspace.generateK2InspectionTests() {
             model("${idea}/multiFileInspections/mismatchedPackageDirectory", pattern = Patterns.TEST)
             model("${idea}/multiFileInspections/mismatchedProjectAndDirectory", pattern = Patterns.TEST)
             model("${idea}/multiFileInspections/kotlinSealedInJavaTest", pattern = Patterns.TEST)
-            model("${idea}/multiFileInspections/mismatchedProjectAndDirectoryRoot", pattern = Patterns.TEST)
+            // K2 test data intentionally slightly differs from K1
+            //model("${idea}/multiFileInspections/mismatchedProjectAndDirectoryRoot", pattern = Patterns.TEST)
         }
 
         testClass<AbstractK2MultiFileLocalInspectionTest> {

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ class PackageDirectoryMismatchInspection : AbstractKotlinInspection() {`
`69`	`69`	`fixes += ChangePackageFix("'${fqNameWithImplicitPrefix.asString()}'", fqNameWithImplicitPrefix)`
`70`	`70`	`}`
`71`	`71`
`72`		`- val element = if (directive.textLength != 0) directive else (file.declarations.firstOrNull() ?: file)`
	`72`	`+ val element = if (directive.textLength != 0) directive else file`
`73`	`73`	`holder.registerProblem(`
`74`	`74`	`element,`
`75`	`75`	`KotlinBundle.message("text.package.directive.dont.match.file.location"),`