[FIR] Use SpecialNames.NO_NAME_PROVIDED everywhere
This commit is contained in:
committed by
Space Team
parent
9e3ce9cf67
commit
47d0f3593a
+3
-4
@@ -33,12 +33,11 @@ import org.jetbrains.kotlin.fir.util.ListMultimap
|
|||||||
import org.jetbrains.kotlin.fir.visitors.FirVisitorVoid
|
import org.jetbrains.kotlin.fir.visitors.FirVisitorVoid
|
||||||
import org.jetbrains.kotlin.name.CallableId
|
import org.jetbrains.kotlin.name.CallableId
|
||||||
import org.jetbrains.kotlin.name.Name
|
import org.jetbrains.kotlin.name.Name
|
||||||
|
import org.jetbrains.kotlin.name.SpecialNames
|
||||||
import org.jetbrains.kotlin.utils.SmartSet
|
import org.jetbrains.kotlin.utils.SmartSet
|
||||||
|
|
||||||
internal class FirDefaultDeclarationPresenter : FirDeclarationPresenter
|
internal class FirDefaultDeclarationPresenter : FirDeclarationPresenter
|
||||||
|
|
||||||
private val NO_NAME_PROVIDED = Name.special("<no name provided>")
|
|
||||||
|
|
||||||
private val MAIN_FUNCTION_SHAPES = setOf(
|
private val MAIN_FUNCTION_SHAPES = setOf(
|
||||||
"<>[]():kotlin/Unit",
|
"<>[]():kotlin/Unit",
|
||||||
"<>[](kotlin/Array<kotlin/String,>,):kotlin/Unit",
|
"<>[](kotlin/Array<kotlin/String,>,):kotlin/Unit",
|
||||||
@@ -74,9 +73,9 @@ private val FirSimpleFunction.representsMainFunctionAllowingConflictingOverloads
|
|||||||
// - see tests with `fun () {}`.
|
// - see tests with `fun () {}`.
|
||||||
// you can't redeclare something that has no name.
|
// you can't redeclare something that has no name.
|
||||||
private fun FirDeclaration.isCollectable() = when (this) {
|
private fun FirDeclaration.isCollectable() = when (this) {
|
||||||
is FirSimpleFunction -> source?.kind !is KtFakeSourceElementKind && name != NO_NAME_PROVIDED
|
is FirSimpleFunction -> source?.kind !is KtFakeSourceElementKind && name != SpecialNames.NO_NAME_PROVIDED
|
||||||
is FirProperty -> source?.kind !is KtFakeSourceElementKind.EnumGeneratedDeclaration
|
is FirProperty -> source?.kind !is KtFakeSourceElementKind.EnumGeneratedDeclaration
|
||||||
is FirRegularClass -> name != NO_NAME_PROVIDED
|
is FirRegularClass -> name != SpecialNames.NO_NAME_PROVIDED
|
||||||
else -> true
|
else -> true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -527,7 +527,7 @@ class FirElementSerializer private constructor(
|
|||||||
function.name
|
function.name
|
||||||
}
|
}
|
||||||
is FirAnonymousFunction -> {
|
is FirAnonymousFunction -> {
|
||||||
if (function.isLambda) SpecialNames.ANONYMOUS else Name.special("<no name provided>")
|
if (function.isLambda) SpecialNames.ANONYMOUS else SpecialNames.NO_NAME_PROVIDED
|
||||||
}
|
}
|
||||||
else -> throw AssertionError("Unsupported function: ${function.render()}")
|
else -> throw AssertionError("Unsupported function: ${function.render()}")
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -35,6 +35,7 @@ import org.jetbrains.kotlin.ir.types.impl.IrSimpleTypeImpl
|
|||||||
import org.jetbrains.kotlin.ir.util.IdSignature
|
import org.jetbrains.kotlin.ir.util.IdSignature
|
||||||
import org.jetbrains.kotlin.name.FqName
|
import org.jetbrains.kotlin.name.FqName
|
||||||
import org.jetbrains.kotlin.name.Name
|
import org.jetbrains.kotlin.name.Name
|
||||||
|
import org.jetbrains.kotlin.name.SpecialNames
|
||||||
import org.jetbrains.kotlin.name.StandardClassIds
|
import org.jetbrains.kotlin.name.StandardClassIds
|
||||||
import org.jetbrains.kotlin.utils.addToStdlib.runIf
|
import org.jetbrains.kotlin.utils.addToStdlib.runIf
|
||||||
import org.jetbrains.kotlin.utils.addToStdlib.runUnless
|
import org.jetbrains.kotlin.utils.addToStdlib.runUnless
|
||||||
@@ -382,7 +383,7 @@ class Fir2IrClassifierStorage(
|
|||||||
fun registerIrAnonymousObject(
|
fun registerIrAnonymousObject(
|
||||||
anonymousObject: FirAnonymousObject,
|
anonymousObject: FirAnonymousObject,
|
||||||
visibility: Visibility = Visibilities.Local,
|
visibility: Visibility = Visibilities.Local,
|
||||||
name: Name = Name.special("<no name provided>"),
|
name: Name = SpecialNames.NO_NAME_PROVIDED,
|
||||||
irParent: IrDeclarationParent? = null
|
irParent: IrDeclarationParent? = null
|
||||||
): IrClass {
|
): IrClass {
|
||||||
val origin = IrDeclarationOrigin.DEFINED
|
val origin = IrDeclarationOrigin.DEFINED
|
||||||
|
|||||||
+1
-1
@@ -580,7 +580,7 @@ class Fir2IrDeclarationStorage(
|
|||||||
return createIrLazyFunction(function as FirSimpleFunction, signature, irParent, updatedOrigin)
|
return createIrLazyFunction(function as FirSimpleFunction, signature, irParent, updatedOrigin)
|
||||||
}
|
}
|
||||||
val name = simpleFunction?.name
|
val name = simpleFunction?.name
|
||||||
?: if (isLambda) SpecialNames.ANONYMOUS else Name.special("<no name provided>")
|
?: if (isLambda) SpecialNames.ANONYMOUS else SpecialNames.NO_NAME_PROVIDED
|
||||||
val visibility = simpleFunction?.visibility ?: Visibilities.Local
|
val visibility = simpleFunction?.visibility ?: Visibilities.Local
|
||||||
val isSuspend =
|
val isSuspend =
|
||||||
if (isLambda) ((function as FirAnonymousFunction).typeRef as? FirResolvedTypeRef)?.type?.isSuspendOrKSuspendFunctionType(session) == true
|
if (isLambda) ((function as FirAnonymousFunction).typeRef as? FirResolvedTypeRef)?.type?.isSuspendOrKSuspendFunctionType(session) == true
|
||||||
|
|||||||
Reference in New Issue
Block a user