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

Introduce FirDeclarationOrigin.INTERSECTION_OVERRIDE

Browse Source
This commit is contained in:
Mikhail Glukhikh
2020-07-14 19:13:18 +03:00
parent 9107944b05
commit 031f03a903
3 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirTypeIntersectionScope.kt
+2
View File
@@ -8,6 +8,7 @@ package org.jetbrains.kotlin.fir.scopes.impl
import org.jetbrains.kotlin.descriptors.Visibilities import org.jetbrains.kotlin.descriptors.Visibilities
import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.FirSession
import org.jetbrains.kotlin.fir.declarations.FirCallableMemberDeclaration import org.jetbrains.kotlin.fir.declarations.FirCallableMemberDeclaration
import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin
import org.jetbrains.kotlin.fir.declarations.FirProperty import org.jetbrains.kotlin.fir.declarations.FirProperty
import org.jetbrains.kotlin.fir.declarations.FirSimpleFunction import org.jetbrains.kotlin.fir.declarations.FirSimpleFunction
import org.jetbrains.kotlin.fir.resolve.substitution.ConeSubstitutor import org.jetbrains.kotlin.fir.resolve.substitution.ConeSubstitutor
@@ -100,6 +101,7 @@ class FirTypeIntersectionScope private constructor(
val mostSpecificFunction = mostSpecific.fir val mostSpecificFunction = mostSpecific.fir
createFunctionCopy(mostSpecific.fir, newSymbol).apply { createFunctionCopy(mostSpecific.fir, newSymbol).apply {
resolvePhase = mostSpecificFunction.resolvePhase resolvePhase = mostSpecificFunction.resolvePhase
origin = FirDeclarationOrigin.IntersectionOverride
typeParameters += mostSpecificFunction.typeParameters typeParameters += mostSpecificFunction.typeParameters
valueParameters += mostSpecificFunction.valueParameters.mapIndexed { index, mostSpecificParameter -> valueParameters += mostSpecificFunction.valueParameters.mapIndexed { index, mostSpecificParameter ->
val overriddenWithDefault = val overriddenWithDefault =
compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirDeclarationOrigin.kt
+1
View File
@@ -14,6 +14,7 @@ sealed class FirDeclarationOrigin {
object FakeOverride : FirDeclarationOrigin() object FakeOverride : FirDeclarationOrigin()
object Enhancement : FirDeclarationOrigin() object Enhancement : FirDeclarationOrigin()
object ImportedFromObject : FirDeclarationOrigin() object ImportedFromObject : FirDeclarationOrigin()
object IntersectionOverride : FirDeclarationOrigin()
class Plugin(val key: FirPluginKey) : FirDeclarationOrigin() class Plugin(val key: FirPluginKey) : FirDeclarationOrigin()
} }
idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirSymbol.kt
+1
View File
@@ -25,6 +25,7 @@ private fun FirDeclarationOrigin.asKtSymbolOrigin() = when (this) {
FirDeclarationOrigin.Synthetic -> throw InvalidFirDeclarationOriginForSymbol(this) FirDeclarationOrigin.Synthetic -> throw InvalidFirDeclarationOriginForSymbol(this)
FirDeclarationOrigin.FakeOverride -> throw InvalidFirDeclarationOriginForSymbol(this) FirDeclarationOrigin.FakeOverride -> throw InvalidFirDeclarationOriginForSymbol(this)
FirDeclarationOrigin.ImportedFromObject -> throw InvalidFirDeclarationOriginForSymbol(this) FirDeclarationOrigin.ImportedFromObject -> throw InvalidFirDeclarationOriginForSymbol(this)
FirDeclarationOrigin.IntersectionOverride -> throw InvalidFirDeclarationOriginForSymbol(this)
FirDeclarationOrigin.Enhancement -> throw InvalidFirDeclarationOriginForSymbol(this) FirDeclarationOrigin.Enhancement -> throw InvalidFirDeclarationOriginForSymbol(this)
is FirDeclarationOrigin.Plugin -> throw InvalidFirDeclarationOriginForSymbol(this) is FirDeclarationOrigin.Plugin -> throw InvalidFirDeclarationOriginForSymbol(this)
} }