From 9af108df774027909e4787627c4379293571d1bd Mon Sep 17 00:00:00 2001 From: Jinseong Jeon Date: Fri, 9 Apr 2021 11:43:20 -0700 Subject: [PATCH] FIR LT: set source for destructured value parameter of lambda --- .../testData/resolve/arguments/destructuring.kt | 4 ++-- .../kotlin/fir/lightTree/converter/ExpressionsConverter.kt | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/compiler/fir/analysis-tests/testData/resolve/arguments/destructuring.kt b/compiler/fir/analysis-tests/testData/resolve/arguments/destructuring.kt index 532923bb8ad..9bbfc169681 100644 --- a/compiler/fir/analysis-tests/testData/resolve/arguments/destructuring.kt +++ b/compiler/fir/analysis-tests/testData/resolve/arguments/destructuring.kt @@ -6,8 +6,8 @@ fun foo2(block: (C, C) -> Unit) = block(C(0, ""), C(0, "")) fun test() { foo1 { (x, y) -> C(x, y) } foo1 { (x: Int, y: String) -> C(x, y) } - foo1 { (x: String, y: Int) -> C(x, y) } + foo1 { (x: String, y: Int) -> C(x, y) } foo2 { (x, y), (z, w) -> C(x + z, y + w) } foo2 { (x: Int, y: String), (z: Int, w: String) -> C(x + z, y + w) } - foo2 { (x: String, y: Int), (z: String, w: Int) -> C(x + z, y + w) } + foo2 { (x: String, y: Int), (z: String, w: Int) -> C(x + z, y + w) } } diff --git a/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/ExpressionsConverter.kt b/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/ExpressionsConverter.kt index cbf8aedfb8b..a266522ceb4 100644 --- a/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/ExpressionsConverter.kt +++ b/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/ExpressionsConverter.kt @@ -153,6 +153,7 @@ class ExpressionsConverter( valueParameters += if (multiDeclaration != null) { val name = Name.special("") val multiParameter = buildValueParameter { + source = valueParameter.firValueParameter.source session = baseSession origin = FirDeclarationOrigin.Source returnTypeRef = valueParameter.firValueParameter.returnTypeRef