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

[FIR] Drop ARRAY_CLASS_NAME and use name from StandardClassIds instead

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2020-01-24 12:06:52 +03:00
parent 7d8363d6aa
commit 985b61f925
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/ConversionUtils.kt
+3 -3
View File
@@ -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.FirExplicitThisReference
import org.jetbrains.kotlin.fir.references.impl.FirResolvedNamedReferenceImpl import org.jetbrains.kotlin.fir.references.impl.FirResolvedNamedReferenceImpl
import org.jetbrains.kotlin.fir.references.impl.FirSimpleNamedReference 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.FirPropertyAccessorSymbol
import org.jetbrains.kotlin.fir.symbols.impl.FirPropertySymbol import org.jetbrains.kotlin.fir.symbols.impl.FirPropertySymbol
import org.jetbrains.kotlin.fir.symbols.impl.FirVariableSymbol 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 { fun FirTypeRef.convertToArrayType(): FirUserTypeRef = FirUserTypeRefImpl(source, isMarkedNullable = false).apply {
qualifier += FirQualifierPartImpl(ARRAY_TYPE_NAME).apply { qualifier += FirQualifierPartImpl(StandardClassIds.Array.shortClassName).apply {
typeArguments += FirTypeProjectionWithVarianceImpl( typeArguments += FirTypeProjectionWithVarianceImpl(
source, this@convertToArrayType, Variance.OUT_VARIANCE source, this@convertToArrayType, Variance.OUT_VARIANCE
) )
compiler/fir/tree/src/org/jetbrains/kotlin/fir/DefaultNames.kt
-2
View File
@@ -10,5 +10,3 @@ import org.jetbrains.kotlin.name.Name
val NAME_FOR_BACKING_FIELD = Name.identifier("field") val NAME_FOR_BACKING_FIELD = Name.identifier("field")
val NAME_FOR_DEFAULT_VALUE_PARAMETER = Name.identifier("value") val NAME_FOR_DEFAULT_VALUE_PARAMETER = Name.identifier("value")
val CONSTRUCTOR_NAME = Name.special("<init>") val CONSTRUCTOR_NAME = Name.special("<init>")
val ARRAY_TYPE_NAME = Name.identifier("Array")