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

[FIR IDE] Extract implicit set parameter name to reuse it in Analysis API

Browse Source
This commit is contained in:
Yan Zhulanow
2021-10-05 19:03:43 +09:00
committed by teamcityserver
parent 2b8963455f
commit 44a1fe668e
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/raw-fir/raw-fir.common/src/org/jetbrains/kotlin/fir/builder/ConversionUtils.kt
+3 -4
View File
@@ -39,6 +39,7 @@ import org.jetbrains.kotlin.fir.types.builder.buildResolvedTypeRef
import org.jetbrains.kotlin.fir.types.impl.*
import org.jetbrains.kotlin.lexer.KtTokens
import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.name.SpecialNames
import org.jetbrains.kotlin.psi.KtAnnotated
import org.jetbrains.kotlin.types.ConstantValueKind
import org.jetbrains.kotlin.types.expressions.OperatorConventions
@@ -490,7 +491,7 @@ fun <T> FirPropertyBuilder.generateAccessorsByDelegate(
this.moduleData = moduleData
origin = FirDeclarationOrigin.Source
returnTypeRef = buildImplicitTypeRef()
name = DELEGATED_SETTER_PARAM
name = SpecialNames.IMPLICIT_SET_PARAMETER
symbol = FirValueParameterSymbol(this@generateAccessorsByDelegate.name)
isCrossinline = false
isNoinline = false
@@ -515,7 +516,7 @@ fun <T> FirPropertyBuilder.generateAccessorsByDelegate(
arguments += buildPropertyAccessExpression {
calleeReference = buildResolvedNamedReference {
source = fakeSource
name = DELEGATED_SETTER_PARAM
name = SpecialNames.IMPLICIT_SET_PARAMETER
resolvedSymbol = parameter.symbol
}
}
@@ -533,8 +534,6 @@ fun <T> FirPropertyBuilder.generateAccessorsByDelegate(
}
}
private val DELEGATED_SETTER_PARAM = Name.special("<set-?>")
fun FirBlock?.extractContractDescriptionIfPossible(): Pair<FirBlock?, FirContractDescription?> {
if (this == null) return null to null
if (!isContractPresentFirCheck()) return this to null
core/compiler.common/src/org/jetbrains/kotlin/name/SpecialNames.kt
+3
View File
@@ -58,6 +58,9 @@ object SpecialNames {
@JvmField
val UNDERSCORE_FOR_UNUSED_VAR = Name.special("<unused var>")
@JvmField
val IMPLICIT_SET_PARAMETER = Name.special("<set-?>")
@JvmStatic
fun safeIdentifier(name: Name?): Name {
return if (name != null && !name.isSpecial) name else SAFE_IDENTIFIER_FOR_NO_NAME
core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/PropertySetterDescriptorImpl.java
+2 -1
View File
@@ -21,6 +21,7 @@ import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.descriptors.*;
import org.jetbrains.kotlin.descriptors.annotations.Annotations;
import org.jetbrains.kotlin.name.Name;
import org.jetbrains.kotlin.name.SpecialNames;
import org.jetbrains.kotlin.types.KotlinType;
import java.util.Collection;
@@ -67,7 +68,7 @@ public class PropertySetterDescriptorImpl extends PropertyAccessorDescriptorImpl
@NotNull Annotations annotations
) {
return new ValueParameterDescriptorImpl(
setterDescriptor, null, 0, annotations, Name.special("<set-?>"), type,
setterDescriptor, null, 0, annotations, SpecialNames.IMPLICIT_SET_PARAMETER, type,
/* declaresDefaultValue = */ false,
/* isCrossinline = */ false,
/* isNoinline = */ false,