From 254ff77977d77e14c5830aa8c96d73d991600fe5 Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Wed, 31 Mar 2021 15:12:11 +0300 Subject: [PATCH] [FIR] Fix creating source for return expressions in light tree fir builder --- .../kotlin/fir/lightTree/converter/ExpressionsConverter.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 4881cde62e2..8e03deba790 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 @@ -1170,7 +1170,11 @@ class ExpressionsConverter( } } - return firExpression.toReturn(labelName = labelName) + return firExpression.toReturn( + baseSource = returnExpression.toFirSourceElement(), + labelName = labelName, + fromKtReturnExpression = true + ) } /**