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

FIR: Leave only one composite-like scope implementation

Browse Source
This commit is contained in:
Denis Zharkov
2020-06-26 11:53:18 +03:00
parent 09bb755088
commit 66e53305bf
9 changed files with 55 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/tree/src/org/jetbrains/kotlin/fir/scopes/FirIterableScope.kt → compiler/fir/tree/src/org/jetbrains/kotlin/fir/scopes/FirCompositeScope.kt
+1 -2
View File
@@ -11,8 +11,7 @@ import org.jetbrains.kotlin.fir.symbols.impl.FirFunctionSymbol
import org.jetbrains.kotlin.fir.symbols.impl.FirVariableSymbol
import org.jetbrains.kotlin.name.Name
abstract class FirIterableScope : FirScope() {
protected abstract val scopes: Iterable<FirScope>
class FirCompositeScope(private val scopes: Iterable<FirScope>) : FirScope() {
override fun processClassifiersByNameWithSubstitution(
name: Name,
compiler/fir/tree/src/org/jetbrains/kotlin/fir/scopes/FirScopeProvider.kt
+1 -3
View File
@@ -38,10 +38,8 @@ abstract class FirScopeProvider {
return when {
nestedClassifierScope != null && callableScope != null ->
FirReadOnlyCompositeScope(listOf(nestedClassifierScope, callableScope))
FirCompositeScope(listOf(nestedClassifierScope, callableScope))
else -> nestedClassifierScope ?: callableScope
}
}
}
private class FirReadOnlyCompositeScope(override val scopes: Iterable<FirScope>) : FirIterableScope()