From feeeb163779bb81f95ae38c2cc4d5574d0263464 Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Mon, 13 Sep 2021 11:30:51 +0300 Subject: [PATCH] [FIR] Fix consistency tests --- .../kotlin/fir/builder/AbstractRawFirBuilderTestCase.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/compiler/fir/raw-fir/psi2fir/tests/org/jetbrains/kotlin/fir/builder/AbstractRawFirBuilderTestCase.kt b/compiler/fir/raw-fir/psi2fir/tests/org/jetbrains/kotlin/fir/builder/AbstractRawFirBuilderTestCase.kt index 7712a0a7400..9a09a2dec77 100644 --- a/compiler/fir/raw-fir/psi2fir/tests/org/jetbrains/kotlin/fir/builder/AbstractRawFirBuilderTestCase.kt +++ b/compiler/fir/raw-fir/psi2fir/tests/org/jetbrains/kotlin/fir/builder/AbstractRawFirBuilderTestCase.kt @@ -21,6 +21,7 @@ import org.jetbrains.kotlin.fir.declarations.FirTypeParameter import org.jetbrains.kotlin.fir.declarations.FirValueParameter import org.jetbrains.kotlin.fir.declarations.impl.FirResolvedDeclarationStatusImpl import org.jetbrains.kotlin.fir.expressions.FirAnnotation +import org.jetbrains.kotlin.fir.expressions.FirAnnotationArgumentMapping import org.jetbrains.kotlin.fir.expressions.FirEmptyArgumentList import org.jetbrains.kotlin.fir.expressions.impl.FirNoReceiverExpression import org.jetbrains.kotlin.fir.expressions.impl.FirStubStatement @@ -131,7 +132,7 @@ abstract class AbstractRawFirBuilderTestCase : KtParsingTestCase( val visitedChildren = visitChildren() children.removeAll(visitedChildren) if (children.isNotEmpty()) { - val element = children.first() + val element = children.firstOrNull { it !is FirAnnotationArgumentMapping } ?: return val elementDump = element.render() throw AssertionError("FirElement ${element.javaClass} is not visited: $elementDump") } @@ -142,7 +143,7 @@ abstract class AbstractRawFirBuilderTestCase : KtParsingTestCase( val transformedChildren = transformChildren() children.removeAll(transformedChildren) if (children.isNotEmpty()) { - val element = children.first() + val element = children.firstOrNull { it !is FirAnnotationArgumentMapping } ?: return val elementDump = element.render() throw AssertionError("FirElement ${element.javaClass} is not transformed: $elementDump") }