diff --git a/compiler/fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/ConversionUtils.kt b/compiler/fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/ConversionUtils.kt index 0c06a834cb9..32ced5eaba7 100644 --- a/compiler/fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/ConversionUtils.kt +++ b/compiler/fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/ConversionUtils.kt @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.fir.references.impl.FirDelegateFieldReferenceImpl import org.jetbrains.kotlin.fir.references.impl.FirExplicitThisReference import org.jetbrains.kotlin.fir.references.impl.FirResolvedNamedReferenceImpl import org.jetbrains.kotlin.fir.references.impl.FirSimpleNamedReference -import org.jetbrains.kotlin.fir.symbols.CallableId +import org.jetbrains.kotlin.fir.symbols.StandardClassIds import org.jetbrains.kotlin.fir.symbols.impl.FirPropertyAccessorSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirPropertySymbol import org.jetbrains.kotlin.fir.symbols.impl.FirVariableSymbol @@ -396,8 +396,8 @@ fun FirModifiableVariable<*>.generateAccessorsByDelegate(session: FirSession, me } } -fun FirTypeRef.convertToArrayType(): FirUserTypeRef = FirUserTypeRefImpl(source, isMarkedNullable = false).apply { - qualifier += FirQualifierPartImpl(ARRAY_TYPE_NAME).apply { +fun FirTypeRef.convertToArrayType(): FirUserTypeRef = FirUserTypeRefImpl(source, isMarkedNullable = false).apply { + qualifier += FirQualifierPartImpl(StandardClassIds.Array.shortClassName).apply { typeArguments += FirTypeProjectionWithVarianceImpl( source, this@convertToArrayType, Variance.OUT_VARIANCE ) diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/DefaultNames.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/DefaultNames.kt index 23fd36d48b0..8d694fbc145 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/DefaultNames.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/DefaultNames.kt @@ -10,5 +10,3 @@ import org.jetbrains.kotlin.name.Name val NAME_FOR_BACKING_FIELD = Name.identifier("field") val NAME_FOR_DEFAULT_VALUE_PARAMETER = Name.identifier("value") val CONSTRUCTOR_NAME = Name.special("") - -val ARRAY_TYPE_NAME = Name.identifier("Array") \ No newline at end of file