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

FIR: protect importing scopes from empty names

Browse Source
This commit is contained in:
Mikhail Glukhikh
2019-04-22 10:00:27 +03:00
parent 8324ee7272
commit bb7dcd9945
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirAbstractImportingScope.kt
+1 -1
View File
@@ -49,7 +49,7 @@ abstract class FirAbstractImportingScope(session: FirSession, lookupInFir: Boole
if (action.stop()) { if (action.stop()) {
return ProcessorAction.STOP return ProcessorAction.STOP
} }
} else { } else if (name.isSpecial || name.identifier.isNotEmpty()) {
val matchedClass = provider.getClassLikeSymbolByFqName(ClassId(import.packageFqName, name)) val matchedClass = provider.getClassLikeSymbolByFqName(ClassId(import.packageFqName, name))
if (processConstructors( if (processConstructors(
matchedClass, matchedClass,
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirAbstractStarImportingScope.kt
+4 -4
View File
@@ -27,10 +27,10 @@ abstract class FirAbstractStarImportingScope(
): Boolean { ): Boolean {
for (import in starImports) { for (import in starImports) {
val relativeClassName = import.relativeClassName val relativeClassName = import.relativeClassName
val classId = if (relativeClassName == null) { val classId = when {
ClassId(import.packageFqName, name) !name.isSpecial && name.identifier.isEmpty() -> return true
} else { relativeClassName == null -> ClassId(import.packageFqName, name)
ClassId(import.packageFqName, relativeClassName.child(name), false) else -> ClassId(import.packageFqName, relativeClassName.child(name), false)
} }
val symbol = provider.getClassLikeSymbolByFqName(classId) ?: continue val symbol = provider.getClassLikeSymbolByFqName(classId) ?: continue
if (!processor(symbol)) { if (!processor(symbol)) {