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

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
@@ -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()
}
}