azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Analysis API] fix resolution to declarations inside kotlin*. packages

Browse Source 
`kotlin*.` packages should be always allowed.
`kotlin.` packages should be allowed if `AnalysisFlags.allowKotlinPackage` is `true`

^KT-63223 fixed
This commit is contained in:
Ilya Kirillov
2023-11-06 21:32:54 +01:00
committed by Space Team
parent d22218e4e4
commit c54d83dcad
10 changed files with 118 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/references/Fe10IdeNormalAnalysisSourceModuleReferenceResolveTestGenerated.java
Generated
+16
View File
@@ -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")
analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/references/FirIdeDependentAnalysisScriptSourceModuleReferenceResolveTestGenerated.java
Generated
+10
View File
@@ -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")
analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/references/FirIdeDependentAnalysisSourceModuleReferenceResolveTestGenerated.java
Generated
+16
View File
@@ -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")
analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/references/FirIdeNormalAnalysisLibrarySourceModuleReferenceResolveTestGenerated.java
Generated
+16
View File
@@ -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")
analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/references/FirIdeNormalAnalysisScriptSourceModuleReferenceResolveTestGenerated.java
Generated
+10
View File
@@ -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")
analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/references/FirIdeNormalAnalysisSourceModuleReferenceResolveTestGenerated.java
Generated
+16
View File
@@ -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")
analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/references/FirStandaloneNormalAnalysisSourceModuleReferenceResolveTestGenerated.java
Generated
+16
View File
@@ -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")
analysis/analysis-api/testData/referenceResolve/kotlinPackage/kotlinxPackage.kt
Vendored
+12
View File
@@ -0,0 +1,12 @@
// FILE: a.kt
package kotlinx.pckg
fun foo() {
b<caret>ar()
}
// FILE: b.kt
package kotlinx.pckg
fun bar() {
}
analysis/analysis-api/testData/referenceResolve/kotlinPackage/kotlinxPackage.txt
Vendored
+2
View File
@@ -0,0 +1,2 @@
Resolved to:
0: (in kotlinx.pckg) fun bar()
analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/util/LLFirKotlinSymbolNamesProvider.kt
+4 -1
View File
@@ -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."