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

[FIR] Fix consistency tests

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2021-09-13 11:30:51 +03:00
committed by teamcityserver
parent 765b389875
commit feeeb16377
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/raw-fir/psi2fir/tests/org/jetbrains/kotlin/fir/builder/AbstractRawFirBuilderTestCase.kt
+3 -2
View File
@@ -21,6 +21,7 @@ import org.jetbrains.kotlin.fir.declarations.FirTypeParameter
import org.jetbrains.kotlin.fir.declarations.FirValueParameter import org.jetbrains.kotlin.fir.declarations.FirValueParameter
import org.jetbrains.kotlin.fir.declarations.impl.FirResolvedDeclarationStatusImpl import org.jetbrains.kotlin.fir.declarations.impl.FirResolvedDeclarationStatusImpl
import org.jetbrains.kotlin.fir.expressions.FirAnnotation 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.FirEmptyArgumentList
import org.jetbrains.kotlin.fir.expressions.impl.FirNoReceiverExpression import org.jetbrains.kotlin.fir.expressions.impl.FirNoReceiverExpression
import org.jetbrains.kotlin.fir.expressions.impl.FirStubStatement import org.jetbrains.kotlin.fir.expressions.impl.FirStubStatement
@@ -131,7 +132,7 @@ abstract class AbstractRawFirBuilderTestCase : KtParsingTestCase(
val visitedChildren = visitChildren() val visitedChildren = visitChildren()
children.removeAll(visitedChildren) children.removeAll(visitedChildren)
if (children.isNotEmpty()) { if (children.isNotEmpty()) {
val element = children.first() val element = children.firstOrNull { it !is FirAnnotationArgumentMapping } ?: return
val elementDump = element.render() val elementDump = element.render()
throw AssertionError("FirElement ${element.javaClass} is not visited: $elementDump") throw AssertionError("FirElement ${element.javaClass} is not visited: $elementDump")
} }
@@ -142,7 +143,7 @@ abstract class AbstractRawFirBuilderTestCase : KtParsingTestCase(
val transformedChildren = transformChildren() val transformedChildren = transformChildren()
children.removeAll(transformedChildren) children.removeAll(transformedChildren)
if (children.isNotEmpty()) { if (children.isNotEmpty()) {
val element = children.first() val element = children.firstOrNull { it !is FirAnnotationArgumentMapping } ?: return
val elementDump = element.render() val elementDump = element.render()
throw AssertionError("FirElement ${element.javaClass} is not transformed: $elementDump") throw AssertionError("FirElement ${element.javaClass} is not transformed: $elementDump")
} }