MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
(cherry picked from commit e901b4796921c7288d5766628ed7d4a83ff640cb)

GitOrigin-RevId: 130058f0814f7976912805d4de7e4b2f6748a623
This commit is contained in:
Vladimir Dolzhenko
2025-10-31 20:54:21 +00:00
committed by intellij-monorepo-bot
parent de81d39bc1
commit ac85e72f4d
12 changed files with 62 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/kotlin/code-insight/inspections-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/inspections/PackageDirectoryMismatchInspection.kt
+1 -1
View File
@@ -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"),
plugins/kotlin/code-insight/inspections-k2/tests/test/org/jetbrains/kotlin/idea/k2/inspections/tests/K2MultiFileInspectionTestGenerated.java
-19
View File
@@ -94,23 +94,4 @@ public abstract class K2MultiFileInspectionTestGenerated extends AbstractK2Multi
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");
}
}
}
plugins/kotlin/highlighting/highlighting-k2/test/org/jetbrains/kotlin/idea/k2/highlighting/K2HighlightingMetaInfoTestGenerated.java
+5
View File
@@ -615,6 +615,11 @@ public abstract class K2HighlightingMetaInfoTestGenerated extends AbstractK2High
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");
plugins/kotlin/highlighting/highlighting-k2/test/org/jetbrains/kotlin/idea/k2/highlighting/metaInfoKmp/CommonNativeJvmK2HighlightingMetaInfoTestGenerated.java
+5
View File
@@ -336,6 +336,11 @@ public abstract class CommonNativeJvmK2HighlightingMetaInfoTestGenerated extends
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");
plugins/kotlin/highlighting/highlighting-k2/test/org/jetbrains/kotlin/idea/k2/highlighting/metaInfoKmp/JsK2HighlightingMetaInfoTestGenerated.java
+5
View File
@@ -336,6 +336,11 @@ public abstract class JsK2HighlightingMetaInfoTestGenerated extends AbstractK2Hi
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");
plugins/kotlin/highlighting/highlighting-k2/test/org/jetbrains/kotlin/idea/k2/highlighting/metaInfoKmp/NativeLinuxK2HighlightingMetaInfoTestGenerated.java
+5
View File
@@ -336,6 +336,11 @@ public abstract class NativeLinuxK2HighlightingMetaInfoTestGenerated extends Abs
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");
plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/highlighter/K1HighlightingMetaInfoTestGenerated.java
+5
View File
@@ -620,6 +620,11 @@ public abstract class K1HighlightingMetaInfoTestGenerated extends AbstractK1High
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");
plugins/kotlin/idea/tests/testData/highlighterMetaInfo/mismatchPackageDirectoryFileLevelProblemDeclarations.kt
+11
View File
@@ -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
plugins/kotlin/idea/tests/testData/highlighterMetaInfo/mismatchPackageDirectoryFileLevelProblemDeclarations.kt.highlighting
+11
View File
@@ -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
plugins/kotlin/idea/tests/testData/highlighterMetaInfo/mismatchPackageDirectoryFileLevelProblemDeclarations.kt.highlighting.k2
+11
View File
@@ -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<!>
plugins/kotlin/idea/tests/testData/multiFileInspections/mismatchedProjectAndDirectoryRoot/mismatchedProjectAndDirectoryRoot.test
+1 -2
View File
@@ -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"
}
plugins/kotlin/util/test-generator-fir/test/org/jetbrains/kotlin/fir/testGenerator/codeinsight/GenerateK2InspectionTests.kt
+2 -1
View File
@@ -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> {