diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java index dd5ae82ce94..73c808c8f07 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java @@ -13544,6 +13544,12 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia runTest("compiler/testData/diagnostics/tests/imports/AllUnderImportsSamePriorityForProperty.kt"); } + @Test + @TestMetadata("brokenImport.kt") + public void testBrokenImport() throws Exception { + runTest("compiler/testData/diagnostics/tests/imports/brokenImport.kt"); + } + @Test @TestMetadata("CheckJavaVisibility.kt") public void testCheckJavaVisibility() throws Exception { diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java index 1e8a3f86f5a..c596fec436c 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java @@ -13544,6 +13544,12 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated runTest("compiler/testData/diagnostics/tests/imports/AllUnderImportsSamePriorityForProperty.kt"); } + @Test + @TestMetadata("brokenImport.kt") + public void testBrokenImport() throws Exception { + runTest("compiler/testData/diagnostics/tests/imports/brokenImport.kt"); + } + @Test @TestMetadata("CheckJavaVisibility.kt") public void testCheckJavaVisibility() throws Exception { diff --git a/compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/index/JvmDependenciesIndexImpl.kt b/compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/index/JvmDependenciesIndexImpl.kt index e7985ba5a77..a35a4ed3dd7 100644 --- a/compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/index/JvmDependenciesIndexImpl.kt +++ b/compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/index/JvmDependenciesIndexImpl.kt @@ -112,7 +112,7 @@ class JvmDependenciesIndexImpl(_roots: List) : JvmDependenciesIndex { private fun search(request: SearchRequest, handler: (VirtualFile, JavaRoot.RootType) -> T?): T? { // a list of package sub names, ["org", "jb", "kotlin"] - val packagesPath = request.packageFqName.pathSegments().map { it.identifier } + val packagesPath = request.packageFqName.pathSegments().map { it.identifierOrNullIfSpecial ?: return null } // a list of caches corresponding to packages, [default, "org", "org.jb", "org.jb.kotlin"] val caches = cachesPath(packagesPath) diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java index 75fff2a77cb..b9f91e45359 100644 --- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java +++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java @@ -13544,6 +13544,12 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir runTest("compiler/testData/diagnostics/tests/imports/AllUnderImportsSamePriorityForProperty.kt"); } + @Test + @TestMetadata("brokenImport.kt") + public void testBrokenImport() throws Exception { + runTest("compiler/testData/diagnostics/tests/imports/brokenImport.kt"); + } + @Test @TestMetadata("CheckJavaVisibility.kt") public void testCheckJavaVisibility() throws Exception { diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java index 54de2a489f1..f424c55b3d0 100644 --- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java +++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java @@ -13550,6 +13550,12 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia runTest("compiler/testData/diagnostics/tests/imports/AllUnderImportsSamePriorityForProperty.kt"); } + @Test + @TestMetadata("brokenImport.kt") + public void testBrokenImport() throws Exception { + runTest("compiler/testData/diagnostics/tests/imports/brokenImport.kt"); + } + @Test @TestMetadata("CheckJavaVisibility.kt") public void testCheckJavaVisibility() throws Exception { diff --git a/compiler/testData/diagnostics/tests/imports/brokenImport.fir.kt b/compiler/testData/diagnostics/tests/imports/brokenImport.fir.kt new file mode 100644 index 00000000000..a3847d404e4 --- /dev/null +++ b/compiler/testData/diagnostics/tests/imports/brokenImport.fir.kt @@ -0,0 +1,2 @@ +import foo.bar.baz +import Outer.``.getInner diff --git a/compiler/testData/diagnostics/tests/imports/brokenImport.kt b/compiler/testData/diagnostics/tests/imports/brokenImport.kt new file mode 100644 index 00000000000..ebeb84b43ee --- /dev/null +++ b/compiler/testData/diagnostics/tests/imports/brokenImport.kt @@ -0,0 +1,2 @@ +import foo.bar.baz +import Outer.``.getInner diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java index 5178a473862..c2eb06681af 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java @@ -13550,6 +13550,12 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest { runTest("compiler/testData/diagnostics/tests/imports/AllUnderImportsSamePriorityForProperty.kt"); } + @Test + @TestMetadata("brokenImport.kt") + public void testBrokenImport() throws Exception { + runTest("compiler/testData/diagnostics/tests/imports/brokenImport.kt"); + } + @Test @TestMetadata("CheckJavaVisibility.kt") public void testCheckJavaVisibility() throws Exception {