KT-45553. Hide declaration from star import if imported with alias
This commit is contained in:
+5
@@ -41,6 +41,8 @@ abstract class FirAbstractImportingScope(
|
||||
fun getStaticsScope(classId: ClassId): FirContainingNamesAwareScope? =
|
||||
provider.getClassLikeSymbolByClassId(classId)?.fullyExpandedSymbol?.getStaticsScope()
|
||||
|
||||
protected abstract fun isExcluded(import: FirResolvedImport, name: Name): Boolean
|
||||
|
||||
protected fun processImportsByName(
|
||||
name: Name?,
|
||||
imports: List<FirResolvedImport>,
|
||||
@@ -48,6 +50,7 @@ abstract class FirAbstractImportingScope(
|
||||
) {
|
||||
for (import in imports) {
|
||||
val importedName = name ?: import.importedName ?: continue
|
||||
if (isExcluded(import, importedName)) continue
|
||||
val classId = import.resolvedParentClassId?.createNestedClassId(importedName)
|
||||
?: ClassId.topLevel(import.packageFqName.child(importedName))
|
||||
val symbol = provider.getClassLikeSymbolByClassId(classId) ?: continue
|
||||
@@ -58,6 +61,7 @@ abstract class FirAbstractImportingScope(
|
||||
protected fun processFunctionsByName(name: Name?, imports: List<FirResolvedImport>, processor: (FirNamedFunctionSymbol) -> Unit) {
|
||||
for (import in imports) {
|
||||
val importedName = name ?: import.importedName ?: continue
|
||||
if (isExcluded(import, importedName)) continue
|
||||
val staticsScope = import.resolvedParentClassId?.let(::getStaticsScope)
|
||||
if (staticsScope != null) {
|
||||
staticsScope.processFunctionsByName(importedName, processor)
|
||||
@@ -73,6 +77,7 @@ abstract class FirAbstractImportingScope(
|
||||
protected fun processPropertiesByName(name: Name?, imports: List<FirResolvedImport>, processor: (FirVariableSymbol<*>) -> Unit) {
|
||||
for (import in imports) {
|
||||
val importedName = name ?: import.importedName ?: continue
|
||||
if (isExcluded(import, importedName)) continue
|
||||
val staticsScope = import.resolvedParentClassId?.let(::getStaticsScope)
|
||||
if (staticsScope != null) {
|
||||
staticsScope.processPropertiesByName(importedName, processor)
|
||||
|
||||
+2
@@ -22,6 +22,8 @@ abstract class FirAbstractSimpleImportingScope(
|
||||
// TODO try to hide this
|
||||
abstract val simpleImports: Map<Name, List<FirResolvedImport>>
|
||||
|
||||
override fun isExcluded(import: FirResolvedImport, name: Name): Boolean = false
|
||||
|
||||
override fun processClassifiersByNameWithSubstitution(name: Name, processor: (FirClassifierSymbol<*>, ConeSubstitutor) -> Unit) {
|
||||
val imports = simpleImports[name] ?: return
|
||||
processImportsByName(name = null, imports) { symbol ->
|
||||
|
||||
+10
-1
@@ -12,17 +12,26 @@ import org.jetbrains.kotlin.fir.resolve.substitution.ConeSubstitutor
|
||||
import org.jetbrains.kotlin.fir.symbols.impl.FirClassifierSymbol
|
||||
import org.jetbrains.kotlin.fir.symbols.impl.FirNamedFunctionSymbol
|
||||
import org.jetbrains.kotlin.fir.symbols.impl.FirVariableSymbol
|
||||
import org.jetbrains.kotlin.name.FqName
|
||||
import org.jetbrains.kotlin.name.Name
|
||||
|
||||
abstract class FirAbstractStarImportingScope(
|
||||
session: FirSession,
|
||||
scopeSession: ScopeSession,
|
||||
lookupInFir: Boolean
|
||||
lookupInFir: Boolean,
|
||||
val excludedImportNames: Set<FqName>
|
||||
) : FirAbstractImportingScope(session, scopeSession, lookupInFir) {
|
||||
|
||||
// TODO try to hide this
|
||||
abstract val starImports: List<FirResolvedImport>
|
||||
|
||||
override fun isExcluded(import: FirResolvedImport, name: Name): Boolean {
|
||||
if (excludedImportNames.isNotEmpty()) {
|
||||
return import.importedFqName!!.child(name) in excludedImportNames
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
private val absentClassifierNames = mutableSetOf<Name>()
|
||||
|
||||
override fun processClassifiersByNameWithSubstitution(name: Name, processor: (FirClassifierSymbol<*>, ConeSubstitutor) -> Unit) {
|
||||
|
||||
+5
-2
@@ -15,15 +15,18 @@ import org.jetbrains.kotlin.fir.moduleData
|
||||
import org.jetbrains.kotlin.fir.resolve.ScopeSession
|
||||
import org.jetbrains.kotlin.fir.symbols.impl.FirNamedFunctionSymbol
|
||||
import org.jetbrains.kotlin.fir.symbols.impl.FirVariableSymbol
|
||||
import org.jetbrains.kotlin.name.FqName
|
||||
import org.jetbrains.kotlin.name.Name
|
||||
|
||||
class FirDefaultStarImportingScope(
|
||||
session: FirSession,
|
||||
scopeSession: ScopeSession,
|
||||
priority: DefaultImportPriority
|
||||
priority: DefaultImportPriority,
|
||||
excludedImportNames: Set<FqName>
|
||||
) : FirAbstractStarImportingScope(
|
||||
session, scopeSession,
|
||||
lookupInFir = session.languageVersionSettings.getFlag(AnalysisFlags.allowKotlinPackage)
|
||||
lookupInFir = session.languageVersionSettings.getFlag(AnalysisFlags.allowKotlinPackage),
|
||||
excludedImportNames
|
||||
) {
|
||||
// TODO: put languageVersionSettings into FirSession?
|
||||
override val starImports = run {
|
||||
|
||||
+4
-2
@@ -9,12 +9,14 @@ import org.jetbrains.kotlin.fir.FirSession
|
||||
import org.jetbrains.kotlin.fir.declarations.FirImport
|
||||
import org.jetbrains.kotlin.fir.declarations.FirResolvedImport
|
||||
import org.jetbrains.kotlin.fir.resolve.ScopeSession
|
||||
import org.jetbrains.kotlin.name.FqName
|
||||
|
||||
open class FirExplicitStarImportingScope(
|
||||
imports: List<FirImport>,
|
||||
session: FirSession,
|
||||
scopeSession: ScopeSession
|
||||
) : FirAbstractStarImportingScope(session, scopeSession, lookupInFir = true) {
|
||||
scopeSession: ScopeSession,
|
||||
excludedImportNames: Set<FqName>
|
||||
) : FirAbstractStarImportingScope(session, scopeSession, lookupInFir = true, excludedImportNames) {
|
||||
override val starImports = imports.filterIsInstance<FirResolvedImport>().filter { it.isAllUnder }
|
||||
|
||||
override val scopeOwnerLookupNames: List<String> by lazy(LazyThreadSafetyMode.PUBLICATION) {
|
||||
|
||||
+2
-1
@@ -23,7 +23,8 @@ class FirWhenSubjectImportingScope(
|
||||
classId: ClassId, session: FirSession, scopeSession: ScopeSession
|
||||
) : FirExplicitStarImportingScope(
|
||||
listOf(buildResolvedImportByClassId(classId)),
|
||||
session, scopeSession
|
||||
session, scopeSession,
|
||||
emptySet()
|
||||
) {
|
||||
override fun processPropertiesByName(name: Name, processor: (FirVariableSymbol<*>) -> Unit) {
|
||||
super.processPropertiesByName(name) {
|
||||
|
||||
Reference in New Issue
Block a user