diff --git a/analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/references/Fe10IdeNormalAnalysisSourceModuleReferenceResolveTestGenerated.java b/analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/references/Fe10IdeNormalAnalysisSourceModuleReferenceResolveTestGenerated.java index ede2a54dee4..dced2a1c26b 100644 --- a/analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/references/Fe10IdeNormalAnalysisSourceModuleReferenceResolveTestGenerated.java +++ b/analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/references/Fe10IdeNormalAnalysisSourceModuleReferenceResolveTestGenerated.java @@ -2064,6 +2064,22 @@ public class Fe10IdeNormalAnalysisSourceModuleReferenceResolveTestGenerated exte } } + @Nested + @TestMetadata("analysis/analysis-api/testData/referenceResolve/kotlinPackage") + @TestDataPath("$PROJECT_ROOT") + public class KotlinPackage { + @Test + public void testAllFilesPresentInKotlinPackage() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/referenceResolve/kotlinPackage"), Pattern.compile("^([^.]+)\\.kt$"), null, true); + } + + @Test + @TestMetadata("kotlinxPackage.kt") + public void testKotlinxPackage() throws Exception { + runTest("analysis/analysis-api/testData/referenceResolve/kotlinPackage/kotlinxPackage.kt"); + } + } + @Nested @TestMetadata("analysis/analysis-api/testData/referenceResolve/nestedTypes") @TestDataPath("$PROJECT_ROOT") diff --git a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/references/FirIdeDependentAnalysisScriptSourceModuleReferenceResolveTestGenerated.java b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/references/FirIdeDependentAnalysisScriptSourceModuleReferenceResolveTestGenerated.java index ba188e428f7..47cdf03b40c 100644 --- a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/references/FirIdeDependentAnalysisScriptSourceModuleReferenceResolveTestGenerated.java +++ b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/references/FirIdeDependentAnalysisScriptSourceModuleReferenceResolveTestGenerated.java @@ -378,6 +378,16 @@ public class FirIdeDependentAnalysisScriptSourceModuleReferenceResolveTestGenera } } + @Nested + @TestMetadata("analysis/analysis-api/testData/referenceResolve/kotlinPackage") + @TestDataPath("$PROJECT_ROOT") + public class KotlinPackage { + @Test + public void testAllFilesPresentInKotlinPackage() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/referenceResolve/kotlinPackage"), Pattern.compile("^(.+)\\.kts$"), null, true); + } + } + @Nested @TestMetadata("analysis/analysis-api/testData/referenceResolve/nestedTypes") @TestDataPath("$PROJECT_ROOT") diff --git a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/references/FirIdeDependentAnalysisSourceModuleReferenceResolveTestGenerated.java b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/references/FirIdeDependentAnalysisSourceModuleReferenceResolveTestGenerated.java index e9d0b99c786..24b593caa7c 100644 --- a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/references/FirIdeDependentAnalysisSourceModuleReferenceResolveTestGenerated.java +++ b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/references/FirIdeDependentAnalysisSourceModuleReferenceResolveTestGenerated.java @@ -2064,6 +2064,22 @@ public class FirIdeDependentAnalysisSourceModuleReferenceResolveTestGenerated ex } } + @Nested + @TestMetadata("analysis/analysis-api/testData/referenceResolve/kotlinPackage") + @TestDataPath("$PROJECT_ROOT") + public class KotlinPackage { + @Test + public void testAllFilesPresentInKotlinPackage() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/referenceResolve/kotlinPackage"), Pattern.compile("^([^.]+)\\.kt$"), null, true); + } + + @Test + @TestMetadata("kotlinxPackage.kt") + public void testKotlinxPackage() throws Exception { + runTest("analysis/analysis-api/testData/referenceResolve/kotlinPackage/kotlinxPackage.kt"); + } + } + @Nested @TestMetadata("analysis/analysis-api/testData/referenceResolve/nestedTypes") @TestDataPath("$PROJECT_ROOT") diff --git a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/references/FirIdeNormalAnalysisLibrarySourceModuleReferenceResolveTestGenerated.java b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/references/FirIdeNormalAnalysisLibrarySourceModuleReferenceResolveTestGenerated.java index 4a258942e32..8208091c044 100644 --- a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/references/FirIdeNormalAnalysisLibrarySourceModuleReferenceResolveTestGenerated.java +++ b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/references/FirIdeNormalAnalysisLibrarySourceModuleReferenceResolveTestGenerated.java @@ -1908,6 +1908,22 @@ public class FirIdeNormalAnalysisLibrarySourceModuleReferenceResolveTestGenerate } } + @Nested + @TestMetadata("analysis/analysis-api/testData/referenceResolve/kotlinPackage") + @TestDataPath("$PROJECT_ROOT") + public class KotlinPackage { + @Test + public void testAllFilesPresentInKotlinPackage() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/referenceResolve/kotlinPackage"), Pattern.compile("^([^.]+)\\.kt$"), null, true, "withErrors"); + } + + @Test + @TestMetadata("kotlinxPackage.kt") + public void testKotlinxPackage() throws Exception { + runTest("analysis/analysis-api/testData/referenceResolve/kotlinPackage/kotlinxPackage.kt"); + } + } + @Nested @TestMetadata("analysis/analysis-api/testData/referenceResolve/nestedTypes") @TestDataPath("$PROJECT_ROOT") diff --git a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/references/FirIdeNormalAnalysisScriptSourceModuleReferenceResolveTestGenerated.java b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/references/FirIdeNormalAnalysisScriptSourceModuleReferenceResolveTestGenerated.java index 3b1276b1ce9..2a524302805 100644 --- a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/references/FirIdeNormalAnalysisScriptSourceModuleReferenceResolveTestGenerated.java +++ b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/references/FirIdeNormalAnalysisScriptSourceModuleReferenceResolveTestGenerated.java @@ -378,6 +378,16 @@ public class FirIdeNormalAnalysisScriptSourceModuleReferenceResolveTestGenerated } } + @Nested + @TestMetadata("analysis/analysis-api/testData/referenceResolve/kotlinPackage") + @TestDataPath("$PROJECT_ROOT") + public class KotlinPackage { + @Test + public void testAllFilesPresentInKotlinPackage() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/referenceResolve/kotlinPackage"), Pattern.compile("^(.+)\\.kts$"), null, true); + } + } + @Nested @TestMetadata("analysis/analysis-api/testData/referenceResolve/nestedTypes") @TestDataPath("$PROJECT_ROOT") diff --git a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/references/FirIdeNormalAnalysisSourceModuleReferenceResolveTestGenerated.java b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/references/FirIdeNormalAnalysisSourceModuleReferenceResolveTestGenerated.java index e06b7e38acb..abf17e693ce 100644 --- a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/references/FirIdeNormalAnalysisSourceModuleReferenceResolveTestGenerated.java +++ b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/references/FirIdeNormalAnalysisSourceModuleReferenceResolveTestGenerated.java @@ -2064,6 +2064,22 @@ public class FirIdeNormalAnalysisSourceModuleReferenceResolveTestGenerated exten } } + @Nested + @TestMetadata("analysis/analysis-api/testData/referenceResolve/kotlinPackage") + @TestDataPath("$PROJECT_ROOT") + public class KotlinPackage { + @Test + public void testAllFilesPresentInKotlinPackage() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/referenceResolve/kotlinPackage"), Pattern.compile("^([^.]+)\\.kt$"), null, true); + } + + @Test + @TestMetadata("kotlinxPackage.kt") + public void testKotlinxPackage() throws Exception { + runTest("analysis/analysis-api/testData/referenceResolve/kotlinPackage/kotlinxPackage.kt"); + } + } + @Nested @TestMetadata("analysis/analysis-api/testData/referenceResolve/nestedTypes") @TestDataPath("$PROJECT_ROOT") diff --git a/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/references/FirStandaloneNormalAnalysisSourceModuleReferenceResolveTestGenerated.java b/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/references/FirStandaloneNormalAnalysisSourceModuleReferenceResolveTestGenerated.java index fce3bdc3489..753ed08e4af 100644 --- a/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/references/FirStandaloneNormalAnalysisSourceModuleReferenceResolveTestGenerated.java +++ b/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/references/FirStandaloneNormalAnalysisSourceModuleReferenceResolveTestGenerated.java @@ -2064,6 +2064,22 @@ public class FirStandaloneNormalAnalysisSourceModuleReferenceResolveTestGenerate } } + @Nested + @TestMetadata("analysis/analysis-api/testData/referenceResolve/kotlinPackage") + @TestDataPath("$PROJECT_ROOT") + public class KotlinPackage { + @Test + public void testAllFilesPresentInKotlinPackage() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/referenceResolve/kotlinPackage"), Pattern.compile("^([^.]+)\\.kt$"), null, true); + } + + @Test + @TestMetadata("kotlinxPackage.kt") + public void testKotlinxPackage() throws Exception { + runTest("analysis/analysis-api/testData/referenceResolve/kotlinPackage/kotlinxPackage.kt"); + } + } + @Nested @TestMetadata("analysis/analysis-api/testData/referenceResolve/nestedTypes") @TestDataPath("$PROJECT_ROOT") diff --git a/analysis/analysis-api/testData/referenceResolve/kotlinPackage/kotlinxPackage.kt b/analysis/analysis-api/testData/referenceResolve/kotlinPackage/kotlinxPackage.kt new file mode 100644 index 00000000000..d952397f172 --- /dev/null +++ b/analysis/analysis-api/testData/referenceResolve/kotlinPackage/kotlinxPackage.kt @@ -0,0 +1,12 @@ +// FILE: a.kt +package kotlinx.pckg + +fun foo() { + bar() +} + +// FILE: b.kt +package kotlinx.pckg + +fun bar() { +} diff --git a/analysis/analysis-api/testData/referenceResolve/kotlinPackage/kotlinxPackage.txt b/analysis/analysis-api/testData/referenceResolve/kotlinPackage/kotlinxPackage.txt new file mode 100644 index 00000000000..586eab540ba --- /dev/null +++ b/analysis/analysis-api/testData/referenceResolve/kotlinPackage/kotlinxPackage.txt @@ -0,0 +1,2 @@ +Resolved to: +0: (in kotlinx.pckg) fun bar() diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/util/LLFirKotlinSymbolNamesProvider.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/util/LLFirKotlinSymbolNamesProvider.kt index 50f11ba928f..9d3f4120c44 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/util/LLFirKotlinSymbolNamesProvider.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/util/LLFirKotlinSymbolNamesProvider.kt @@ -53,4 +53,7 @@ internal open class LLFirKotlinSymbolNamesProvider( } private fun FqName.isKotlinPackage(): Boolean = startsWith(StandardNames.BUILT_INS_PACKAGE_NAME) -private fun String.isKotlinPackage(): Boolean = startsWith(StandardNames.BUILT_INS_PACKAGE_NAME.asString()) +private fun String.isKotlinPackage(): Boolean = startsWith(KOTLIN_PACKAGE_PREFIX) + +private const val KOTLIN_PACKAGE_PREFIX = "kotlin." +