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

[FIR] Do not expect builtin imports to be always resolved

Browse Source 
Merge-request: KT-MR-10886
Merged-by: Egor Kulikov <Egor.Kulikov@jetbrains.com>
This commit is contained in:
Egor Kulikov
2023-07-05 14:02:50 +00:00
committed by Space Team
parent 6bed02fed3
commit 27f4b53570
25 changed files with 63 additions and 11 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
+6
View File
@@ -2057,6 +2057,12 @@ public class Fe10IdeNormalAnalysisSourceModuleReferenceResolveTestGenerated exte
runTest("analysis/analysis-api/testData/referenceResolve/withErrors/AnnotationParameter.kt");
}
@Test
@TestMetadata("BuiltInImportsNoRuntime.kt")
public void testBuiltInImportsNoRuntime() throws Exception {
runTest("analysis/analysis-api/testData/referenceResolve/withErrors/BuiltInImportsNoRuntime.kt");
}
@Test
@TestMetadata("ByReturnExpression.kt")
public void testByReturnExpression() throws Exception {
analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/references/FirIdeDependentAnalysisSourceModuleReferenceResolveTestGenerated.java
Generated
+6
View File
@@ -2057,6 +2057,12 @@ public class FirIdeDependentAnalysisSourceModuleReferenceResolveTestGenerated ex
runTest("analysis/analysis-api/testData/referenceResolve/withErrors/AnnotationParameter.kt");
}
@Test
@TestMetadata("BuiltInImportsNoRuntime.kt")
public void testBuiltInImportsNoRuntime() throws Exception {
runTest("analysis/analysis-api/testData/referenceResolve/withErrors/BuiltInImportsNoRuntime.kt");
}
@Test
@TestMetadata("ByReturnExpression.kt")
public void testByReturnExpression() throws Exception {
analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/references/FirIdeNormalAnalysisSourceModuleReferenceResolveTestGenerated.java
Generated
+6
View File
@@ -2057,6 +2057,12 @@ public class FirIdeNormalAnalysisSourceModuleReferenceResolveTestGenerated exten
runTest("analysis/analysis-api/testData/referenceResolve/withErrors/AnnotationParameter.kt");
}
@Test
@TestMetadata("BuiltInImportsNoRuntime.kt")
public void testBuiltInImportsNoRuntime() throws Exception {
runTest("analysis/analysis-api/testData/referenceResolve/withErrors/BuiltInImportsNoRuntime.kt");
}
@Test
@TestMetadata("ByReturnExpression.kt")
public void testByReturnExpression() throws Exception {
analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/references/AbstractReferenceResolveTest.kt
+6 -3
View File
@@ -30,9 +30,6 @@ abstract class AbstractReferenceResolveTest : AbstractAnalysisApiBasedTest() {
override fun configureTest(builder: TestConfigurationBuilder) {
super.configureTest(builder)
with(builder) {
defaultDirectives {
+ConfigurationDirectives.WITH_STDLIB
}
useDirectives(Directives)
forTestsMatching("analysis/analysis-api/testData/referenceResolve/kDoc/*") {
defaultDirectives {
@@ -40,6 +37,12 @@ abstract class AbstractReferenceResolveTest : AbstractAnalysisApiBasedTest() {
+AnalysisApiTestDirectives.IGNORE_FE10
}
}
forTestsMatching("analysis/analysis-api/testData/referenceResolve/kDoc/qualified/stdlib/*") {
defaultDirectives {
+ConfigurationDirectives.WITH_STDLIB
}
}
}
}
analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/configurators/AnalysisApiBaseTestServiceRegistrar.kt
+4 -1
View File
@@ -27,7 +27,9 @@ import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisA
import org.jetbrains.kotlin.psi.KtClassOrObject
import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.psi.KtFileClassProvider
import org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirectives.NO_RUNTIME
import org.jetbrains.kotlin.test.services.TestServices
import org.jetbrains.kotlin.test.services.moduleStructure
object AnalysisApiBaseTestServiceRegistrar: AnalysisApiTestServiceRegistrar() {
override fun registerProjectExtensionPoints(project: MockProject, testServices: TestServices) {}
@@ -78,7 +80,8 @@ object AnalysisApiBaseTestServiceRegistrar: AnalysisApiTestServiceRegistrar() {
KotlinDeclarationProviderFactory::class.java, KotlinStaticDeclarationProviderFactory(
project,
allKtFiles,
additionalRoots = roots
additionalRoots = roots,
skipBuiltins = testServices.moduleStructure.allDirectives.contains(NO_RUNTIME),
)
)
} finally {
analysis/analysis-api-providers/src/org/jetbrains/kotlin/analysis/providers/impl/KotlinStaticDeclarationProvider.kt
+6 -3
View File
@@ -127,6 +127,7 @@ public class KotlinStaticDeclarationProviderFactory(
files: Collection<KtFile>,
private val jarFileSystem: CoreJarFileSystem = CoreJarFileSystem(),
additionalRoots: List<VirtualFile> = emptyList(),
skipBuiltins: Boolean = false,
) : KotlinDeclarationProviderFactory() {
private val index = KotlinStaticDeclarationIndex()
@@ -299,9 +300,11 @@ public class KotlinStaticDeclarationProviderFactory(
}
val builtins = mutableSetOf<String>()
loadBuiltIns().forEach { stub ->
processStub(stub)
builtins.add(stub.psi.virtualFile.name)
if (!skipBuiltins) {
loadBuiltIns().forEach { stub ->
processStub(stub)
builtins.add(stub.psi.virtualFile.name)
}
}
val binaryClassCache = ClsKotlinBinaryClassCache.getInstance()
analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/references/FirStandaloneNormalAnalysisSourceModuleReferenceResolveTestGenerated.java
Generated
+6
View File
@@ -2057,6 +2057,12 @@ public class FirStandaloneNormalAnalysisSourceModuleReferenceResolveTestGenerate
runTest("analysis/analysis-api/testData/referenceResolve/withErrors/AnnotationParameter.kt");
}
@Test
@TestMetadata("BuiltInImportsNoRuntime.kt")
public void testBuiltInImportsNoRuntime() throws Exception {
runTest("analysis/analysis-api/testData/referenceResolve/withErrors/BuiltInImportsNoRuntime.kt");
}
@Test
@TestMetadata("ByReturnExpression.kt")
public void testByReturnExpression() throws Exception {
analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/suspendFunctionValueParameterNoStdlib.txt
Vendored
+2 -2
View File
@@ -1,2 +1,2 @@
KtType: suspend (kotlin.Int) -> kotlin.Unit
PsiType: PsiType:Function2<? super Integer, ? super NonExistentClass<Unit>, ? extends Object>
KtType: suspend (Int) -> Unit
PsiType: null
analysis/analysis-api/testData/referenceResolve/PackageFromAnnotationOnFile.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// WITH_STDLIB
@file:kotlin.jv<caret>m.JvmName("Name")
package foo
analysis/analysis-api/testData/referenceResolve/PackageFromAnnotationOnFileWithUnresolvedReference.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// WITH_STDLIB
@file:kotlin.jv<caret>m.JvmName23("Name")
package foo
analysis/analysis-api/testData/referenceResolve/PackageFromAnnotationOnFunction.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// WITH_STDLIB
package foo
@kotlin.jv<caret>m.JvmName("Name")
analysis/analysis-api/testData/referenceResolve/PackageFromAnnotationOnFunctionWithUnresolvedReference.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// WITH_STDLIB
package foo
@kotlin.jv<caret>m.JvmName2("Name")
analysis/analysis-api/testData/referenceResolve/arrayAccess/get.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// WITH_STDLIB
fun a () {
val list = mutableListOf(1)
println(list<caret>[0])
analysis/analysis-api/testData/referenceResolve/arrayAccess/set.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// WITH_STDLIB
fun a () {
val list = mutableListOf(1)
list<caret>[0] = 1
analysis/analysis-api/testData/referenceResolve/danglingAnnotations/DanglingAnnotationsResolvedFile.kt
Vendored
+1
View File
@@ -1,2 +1,3 @@
// WITH_STDLIB
// COMPILATION_ERRORS
@kotlin.jvm.Jvm<caret>Name("")
analysis/analysis-api/testData/referenceResolve/danglingAnnotations/DanglingAnnotationsResolvedPackageFile.kt
Vendored
+1
View File
@@ -1,2 +1,3 @@
// WITH_STDLIB
// COMPILATION_ERRORS
@kotlin.j<caret>vm.JvmName("")
analysis/analysis-api/testData/referenceResolve/delegatedPropertyAccessors/inStandardLibrary/lazy.kt
Vendored
+1
View File
@@ -1 +1,2 @@
// WITH_STDLIB
val x: Int <caret>by lazy {1}
analysis/analysis-api/testData/referenceResolve/delegatedPropertyAccessors/inStandardLibrary/notNull.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// WITH_STDLIB
import kotlin.properties.Delegates
var x: Int <caret>by Delegates.notNull()
analysis/analysis-api/testData/referenceResolve/forLoopIn/inBuiltIns/extension.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// WITH_STDLIB
fun main(it: Iterator<Any>) {
for (i <caret>in it.iterator()) {}
}
analysis/analysis-api/testData/referenceResolve/forLoopIn/inLibrary/extension.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// WITH_STDLIB
fun main() {
for (i <caret>in "") {}
}
analysis/analysis-api/testData/referenceResolve/inImport/kotlinClass.kt
Vendored
+1
View File
@@ -1 +1,2 @@
// WITH_STDLIB
import kotlin.collections.Mutab<caret>leList
analysis/analysis-api/testData/referenceResolve/inImport/kotlinTopLevelFunction.kt
Vendored
+1
View File
@@ -1 +1,2 @@
// WITH_STDLIB
import kotlin.collections.mut<caret>ableListOf
analysis/analysis-api/testData/referenceResolve/kDoc/imports/TypeAliasedImport.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// WITH_STDLIB
import kotlin.collections.listOf as lst
/**
analysis/analysis-api/testData/referenceResolve/withErrors/BuiltInImportsNoRuntime.kt
Vendored
+4
View File
@@ -0,0 +1,4 @@
// NO_RUNTIME
// UNRESOLVED_REFERENCE
// IGNORE_FE10
val (<caret>x)
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirDefaultSimpleImportingScope.kt
+2 -2
View File
@@ -21,7 +21,7 @@ class FirDefaultSimpleImportingScope(
) : FirAbstractSimpleImportingScope(session, scopeSession) {
private fun FirImport.resolve(importResolveTransformer: FirImportResolveTransformer) =
importResolveTransformer.transformImport(this, null) as FirResolvedImport
importResolveTransformer.transformImport(this, null) as? FirResolvedImport
override val simpleImports = run {
val importResolveTransformer = FirImportResolveTransformer(session)
@@ -34,6 +34,6 @@ class FirDefaultSimpleImportingScope(
importedFqName = it.fqName
isAllUnder = false
}.resolve(importResolveTransformer)
}?.groupBy { it.importedName!! } ?: emptyMap()
}?.filterNotNull()?.groupBy { it.importedName!! } ?: emptyMap()
}
}