FIR: protect importing scopes from empty names
This commit is contained in:
+1
-1
@@ -49,7 +49,7 @@ abstract class FirAbstractImportingScope(session: FirSession, lookupInFir: Boole
|
||||
if (action.stop()) {
|
||||
return ProcessorAction.STOP
|
||||
}
|
||||
} else {
|
||||
} else if (name.isSpecial || name.identifier.isNotEmpty()) {
|
||||
val matchedClass = provider.getClassLikeSymbolByFqName(ClassId(import.packageFqName, name))
|
||||
if (processConstructors(
|
||||
matchedClass,
|
||||
|
||||
+4
-4
@@ -27,10 +27,10 @@ abstract class FirAbstractStarImportingScope(
|
||||
): Boolean {
|
||||
for (import in starImports) {
|
||||
val relativeClassName = import.relativeClassName
|
||||
val classId = if (relativeClassName == null) {
|
||||
ClassId(import.packageFqName, name)
|
||||
} else {
|
||||
ClassId(import.packageFqName, relativeClassName.child(name), false)
|
||||
val classId = when {
|
||||
!name.isSpecial && name.identifier.isEmpty() -> return true
|
||||
relativeClassName == null -> ClassId(import.packageFqName, name)
|
||||
else -> ClassId(import.packageFqName, relativeClassName.child(name), false)
|
||||
}
|
||||
val symbol = provider.getClassLikeSymbolByFqName(classId) ?: continue
|
||||
if (!processor(symbol)) {
|
||||
|
||||
Reference in New Issue
Block a user