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

Analysis API FIR: fix missing type aliases in KtFirFileScope

Browse Source
This commit is contained in:
Ilya Kirillov
2021-11-30 13:06:42 +01:00
parent aef52323a8
commit 68e3c72a64
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/scopes/KtFirFileScope.kt
+6 -4
View File
@@ -5,9 +5,6 @@
package org.jetbrains.kotlin.analysis.api.fir.scopes package org.jetbrains.kotlin.analysis.api.fir.scopes
import org.jetbrains.kotlin.fir.declarations.FirProperty
import org.jetbrains.kotlin.fir.declarations.FirRegularClass
import org.jetbrains.kotlin.fir.declarations.FirSimpleFunction
import org.jetbrains.kotlin.analysis.api.tokens.ValidityToken import org.jetbrains.kotlin.analysis.api.tokens.ValidityToken
import org.jetbrains.kotlin.analysis.api.fir.KtSymbolByFirBuilder import org.jetbrains.kotlin.analysis.api.fir.KtSymbolByFirBuilder
import org.jetbrains.kotlin.analysis.api.fir.symbols.KtFirFileSymbol import org.jetbrains.kotlin.analysis.api.fir.symbols.KtFirFileSymbol
@@ -19,6 +16,7 @@ import org.jetbrains.kotlin.analysis.api.symbols.KtClassifierSymbol
import org.jetbrains.kotlin.analysis.api.symbols.KtConstructorSymbol import org.jetbrains.kotlin.analysis.api.symbols.KtConstructorSymbol
import org.jetbrains.kotlin.analysis.api.symbols.KtPackageSymbol import org.jetbrains.kotlin.analysis.api.symbols.KtPackageSymbol
import org.jetbrains.kotlin.analysis.api.withValidityAssertion import org.jetbrains.kotlin.analysis.api.withValidityAssertion
import org.jetbrains.kotlin.fir.declarations.*
import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.name.Name
internal class KtFirFileScope( internal class KtFirFileScope(
@@ -83,7 +81,11 @@ internal class KtFirFileScope(
owner.firRef.withFir { owner.firRef.withFir {
sequence { sequence {
it.declarations.forEach { firDeclaration -> it.declarations.forEach { firDeclaration ->
val classLikeDeclaration = (firDeclaration as? FirRegularClass)?.takeIf { klass -> nameFilter(klass.name) } val classLikeDeclaration = when (firDeclaration) {
is FirTypeAlias -> if (nameFilter(firDeclaration.name)) firDeclaration else null
is FirRegularClass -> if (nameFilter(firDeclaration.name)) firDeclaration else null
else -> null
}
if (classLikeDeclaration != null) { if (classLikeDeclaration != null) {
yield(builder.classifierBuilder.buildClassLikeSymbol(classLikeDeclaration)) yield(builder.classifierBuilder.buildClassLikeSymbol(classLikeDeclaration))
} }