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

Implement resolution of desctructuring declarations in lambdas

Browse Source 
#KT-5828 In Progress
This commit is contained in:
Denis Zharkov
2016-09-15 17:56:59 +03:00
parent ace3655824
commit e975d32196
27 changed files with 640 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/ValueParameterDescriptorImpl.kt
+45 -1
View File
@@ -22,7 +22,7 @@ import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.types.KotlinType
import org.jetbrains.kotlin.types.TypeSubstitutor
class ValueParameterDescriptorImpl(
open class ValueParameterDescriptorImpl(
containingDeclaration: CallableDescriptor,
original: ValueParameterDescriptor?,
override val index: Int,
@@ -36,6 +36,50 @@ class ValueParameterDescriptorImpl(
override val varargElementType: KotlinType?,
source: SourceElement
) : VariableDescriptorImpl(containingDeclaration, annotations, name, outType, source), ValueParameterDescriptor {
companion object {
@JvmStatic
fun getDestructuringVariablesOrNull(valueParameterDescriptor: ValueParameterDescriptor) =
(valueParameterDescriptor as? ValueParameterDescriptorImpl.WithDestructuringDeclaration)?.destructuringVariables
@JvmStatic
fun createWithDestructuringDeclarations(containingDeclaration: CallableDescriptor,
original: ValueParameterDescriptor?,
index: Int,
annotations: Annotations,
name: Name,
outType: KotlinType,
declaresDefaultValue: Boolean,
isCrossinline: Boolean,
isNoinline: Boolean, isCoroutine: Boolean, varargElementType: KotlinType?,
source: SourceElement,
destructuringVariables: List<VariableDescriptor>?
): ValueParameterDescriptorImpl =
if (destructuringVariables == null)
ValueParameterDescriptorImpl(containingDeclaration, original, index, annotations, name, outType,
declaresDefaultValue, isCrossinline, isNoinline, isCoroutine, varargElementType, source)
else
WithDestructuringDeclaration(containingDeclaration, original, index, annotations, name, outType,
declaresDefaultValue, isCrossinline, isNoinline, isCoroutine, varargElementType, source,
destructuringVariables)
}
class WithDestructuringDeclaration internal constructor(
containingDeclaration: CallableDescriptor,
original: ValueParameterDescriptor?,
index: Int,
annotations: Annotations, name: Name,
outType: KotlinType,
declaresDefaultValue: Boolean,
isCrossinline: Boolean,
isNoinline: Boolean, isCoroutine: Boolean, varargElementType: KotlinType?,
source: SourceElement,
val destructuringVariables: List<VariableDescriptor>
) : ValueParameterDescriptorImpl(
containingDeclaration, original, index, annotations, name, outType, declaresDefaultValue,
isCrossinline, isNoinline, isCoroutine,
varargElementType, source)
private val original: ValueParameterDescriptor = original ?: this
override fun getContainingDeclaration() = super.getContainingDeclaration() as CallableDescriptor