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

FIR: do not get statement text for every statement in raw FIR builder

Browse Source 
PsiElement.getText This is rather expensive operation
This commit is contained in:
Ilya Kirillov
2020-09-24 23:11:47 +03:00
parent b1768d805f
commit bbc641b390
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt
+4 -1
View File
@@ -201,6 +201,9 @@ class RawFirBuilder(
private fun KtExpression.toFirStatement(errorReason: String): FirStatement = private fun KtExpression.toFirStatement(errorReason: String): FirStatement =
convertSafe() ?: buildErrorExpression(this.toFirSourceElement(), ConeSimpleDiagnostic(errorReason, DiagnosticKind.Syntax)) convertSafe() ?: buildErrorExpression(this.toFirSourceElement(), ConeSimpleDiagnostic(errorReason, DiagnosticKind.Syntax))
private inline fun KtExpression.toFirStatement(errorReasonLazy: () -> String): FirStatement =
convertSafe() ?: buildErrorExpression(this.toFirSourceElement(), ConeSimpleDiagnostic(errorReasonLazy(), DiagnosticKind.Syntax))
private fun KtExpression.toFirStatement(): FirStatement = private fun KtExpression.toFirStatement(): FirStatement =
convert() convert()
@@ -1419,7 +1422,7 @@ class RawFirBuilder(
return FirBlockBuilder().apply { return FirBlockBuilder().apply {
source = expression.toFirSourceElement() source = expression.toFirSourceElement()
for (statement in expression.statements) { for (statement in expression.statements) {
val firStatement = statement.toFirStatement("Statement expected: ${statement.text}") val firStatement = statement.toFirStatement { "Statement expected: ${statement.text}" }
if (firStatement !is FirBlock || firStatement.annotations.isNotEmpty()) { if (firStatement !is FirBlock || firStatement.annotations.isNotEmpty()) {
statements += firStatement statements += firStatement
} else { } else {