From 650f2dd7131a25f77d02cd1e732b85628e013093 Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Mon, 22 Jun 2020 15:40:55 +0300 Subject: [PATCH] FIR: consider source of FirSingleExpressionBlock as a fake one --- .../fir/expressions/impl/FirSingleExpressionBlock.kt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirSingleExpressionBlock.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirSingleExpressionBlock.kt index 785c86bff16..8ea855802f9 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirSingleExpressionBlock.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirSingleExpressionBlock.kt @@ -1,11 +1,12 @@ /* - * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.fir.FirAnnotationContainer +import org.jetbrains.kotlin.fir.FirFakeSourceElementKind import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.expressions.FirBlock @@ -16,11 +17,13 @@ import org.jetbrains.kotlin.fir.visitors.FirTransformer import org.jetbrains.kotlin.fir.visitors.FirVisitor import org.jetbrains.kotlin.fir.visitors.transformInplace import org.jetbrains.kotlin.fir.visitors.transformSingle +import org.jetbrains.kotlin.fir.withKind class FirSingleExpressionBlock( var statement: FirStatement ) : FirBlock(), FirAnnotationContainer { - override val source: FirSourceElement ? get() = statement.source + override val source: FirSourceElement? + get() = statement.source?.withKind(FirFakeSourceElementKind.SingleExpressionBlock) override val annotations: MutableList = mutableListOf() override val statements: List get() = listOf(statement) override var typeRef: FirTypeRef = FirImplicitTypeRefImpl(null)