From ed1e1c6a2bc951e2278351dea3a4e268fde0702b Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Tue, 15 Mar 2016 19:58:52 +0300 Subject: [PATCH] Uast, Minor: make lateinit mutable propertiy setters internal --- .../expressions/KotlinStringTemplateUBinaryExpression.kt | 3 +++ .../kotlin/uast/expressions/KotlinUBinaryExpression.kt | 5 +++++ .../uast/expressions/KotlinUBinaryExpressionWithType.kt | 5 +++++ .../kotlin/uast/expressions/KotlinUDeclarationsExpression.kt | 2 ++ .../kotlin/uast/expressions/KotlinUQualifiedExpression.kt | 4 ++++ .../kotlin/uast/expressions/KotlinUSpecialExpressionList.kt | 1 + 6 files changed, 20 insertions(+) diff --git a/plugins/uast-kotlin/src/org/jetbrains/kotlin/uast/expressions/KotlinStringTemplateUBinaryExpression.kt b/plugins/uast-kotlin/src/org/jetbrains/kotlin/uast/expressions/KotlinStringTemplateUBinaryExpression.kt index 0489302058b..2b12f55e6db 100644 --- a/plugins/uast-kotlin/src/org/jetbrains/kotlin/uast/expressions/KotlinStringTemplateUBinaryExpression.kt +++ b/plugins/uast-kotlin/src/org/jetbrains/kotlin/uast/expressions/KotlinStringTemplateUBinaryExpression.kt @@ -28,7 +28,10 @@ class KotlinStringTemplateUBinaryExpression( override val parent: UElement ) : UBinaryExpression, PsiElementBacked, KotlinTypeHelper, KotlinEvaluateHelper { override lateinit var leftOperand: UExpression + internal set + override lateinit var rightOperand: UExpression + internal set override val operator = UastBinaryOperator.PLUS } \ No newline at end of file diff --git a/plugins/uast-kotlin/src/org/jetbrains/kotlin/uast/expressions/KotlinUBinaryExpression.kt b/plugins/uast-kotlin/src/org/jetbrains/kotlin/uast/expressions/KotlinUBinaryExpression.kt index cb12c2b5111..13c935f8a65 100644 --- a/plugins/uast-kotlin/src/org/jetbrains/kotlin/uast/expressions/KotlinUBinaryExpression.kt +++ b/plugins/uast-kotlin/src/org/jetbrains/kotlin/uast/expressions/KotlinUBinaryExpression.kt @@ -54,6 +54,11 @@ class KotlinCustomUBinaryExpression( override val parent: UElement ) : UBinaryExpression, PsiElementBacked, NoEvaluate { lateinit override var leftOperand: UExpression + internal set + lateinit override var operator: UastBinaryOperator + internal set + lateinit override var rightOperand: UExpression + internal set } \ No newline at end of file diff --git a/plugins/uast-kotlin/src/org/jetbrains/kotlin/uast/expressions/KotlinUBinaryExpressionWithType.kt b/plugins/uast-kotlin/src/org/jetbrains/kotlin/uast/expressions/KotlinUBinaryExpressionWithType.kt index 37f1d578317..15489d572fa 100644 --- a/plugins/uast-kotlin/src/org/jetbrains/kotlin/uast/expressions/KotlinUBinaryExpressionWithType.kt +++ b/plugins/uast-kotlin/src/org/jetbrains/kotlin/uast/expressions/KotlinUBinaryExpressionWithType.kt @@ -40,6 +40,11 @@ class KotlinCustomUBinaryExpressionWithType( override val parent: UElement ) : UBinaryExpressionWithType, PsiElementBacked, NoEvaluate { lateinit override var operand: UExpression + internal set + lateinit override var operationKind: UastBinaryExpressionWithTypeKind + internal set + lateinit override var type: UType + internal set } \ No newline at end of file diff --git a/plugins/uast-kotlin/src/org/jetbrains/kotlin/uast/expressions/KotlinUDeclarationsExpression.kt b/plugins/uast-kotlin/src/org/jetbrains/kotlin/uast/expressions/KotlinUDeclarationsExpression.kt index 121923bfcba..2e52683f4d0 100644 --- a/plugins/uast-kotlin/src/org/jetbrains/kotlin/uast/expressions/KotlinUDeclarationsExpression.kt +++ b/plugins/uast-kotlin/src/org/jetbrains/kotlin/uast/expressions/KotlinUDeclarationsExpression.kt @@ -17,5 +17,7 @@ package org.jetbrains.uast class KotlinUDeclarationsExpression(override val parent: UElement) : UDeclarationsExpression { override lateinit var declarations: List + internal set + override fun evaluate() = null } \ No newline at end of file diff --git a/plugins/uast-kotlin/src/org/jetbrains/kotlin/uast/expressions/KotlinUQualifiedExpression.kt b/plugins/uast-kotlin/src/org/jetbrains/kotlin/uast/expressions/KotlinUQualifiedExpression.kt index cb644636f09..297f8cba215 100644 --- a/plugins/uast-kotlin/src/org/jetbrains/kotlin/uast/expressions/KotlinUQualifiedExpression.kt +++ b/plugins/uast-kotlin/src/org/jetbrains/kotlin/uast/expressions/KotlinUQualifiedExpression.kt @@ -37,7 +37,11 @@ class KotlinUComponentQualifiedExpression( override val parent: UElement ) : UQualifiedExpression, PsiElementBacked, KotlinTypeHelper, KotlinEvaluateHelper { override lateinit var receiver: UExpression + internal set + override lateinit var selector: UExpression + internal set + override val accessType = UastQualifiedExpressionAccessType.SIMPLE override fun resolve(context: UastContext) = null } \ No newline at end of file diff --git a/plugins/uast-kotlin/src/org/jetbrains/kotlin/uast/expressions/KotlinUSpecialExpressionList.kt b/plugins/uast-kotlin/src/org/jetbrains/kotlin/uast/expressions/KotlinUSpecialExpressionList.kt index f8a7d3ce844..d19eb7f7c6f 100644 --- a/plugins/uast-kotlin/src/org/jetbrains/kotlin/uast/expressions/KotlinUSpecialExpressionList.kt +++ b/plugins/uast-kotlin/src/org/jetbrains/kotlin/uast/expressions/KotlinUSpecialExpressionList.kt @@ -39,6 +39,7 @@ open class KotlinUSpecialExpressionList( } override lateinit var expressions: List + internal set override fun evaluate(): Any? { val ktElement = psi as? KtExpression ?: return null