From f885459a43fa7ed0e0bca5939d541809dcd45691 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Thu, 7 Jan 2016 18:16:40 +0100 Subject: [PATCH] fix compilation after cleanup --- .../org/jetbrains/kotlin/asJava/LightClassUtil.kt | 2 +- .../idea/inspections/IntentionBasedInspection.kt | 2 +- .../kotlin/js/inline/ExpressionDecomposer.kt | 4 ++-- .../jetbrains/kotlin/js/translate/utils/astUtils.kt | 12 ++++++------ 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassUtil.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassUtil.kt index b74c33376b7..3cd93f06865 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassUtil.kt +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassUtil.kt @@ -35,7 +35,7 @@ object LightClassUtil { fun findClass(fqn: FqName, stub: StubElement<*>): PsiClass? { if (stub is PsiClassStub<*> && Comparing.equal(fqn.asString(), stub.qualifiedName)) { - return stub.psi + return stub.getPsi() } if (stub is PsiClassStub<*> || stub is PsiFileStub<*>) { diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/inspections/IntentionBasedInspection.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/inspections/IntentionBasedInspection.kt index 54dc1b4fb17..7bed3a3c1b7 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/inspections/IntentionBasedInspection.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/inspections/IntentionBasedInspection.kt @@ -102,7 +102,7 @@ abstract class IntentionBasedInspection( override fun startInWriteAction() = true - override fun isAvailable(project: Project, editor: Editor?, file: PsiFile?) = isAvailable + override fun isAvailable(project: Project, editor: Editor?, file: PsiFile?) = isAvailable() override fun isAvailable(project: Project, file: PsiFile, startElement: PsiElement, endElement: PsiElement): Boolean { assert(startElement == endElement) diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/ExpressionDecomposer.kt b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/ExpressionDecomposer.kt index b83b509c3b6..b7b0bb28c8d 100644 --- a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/ExpressionDecomposer.kt +++ b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/ExpressionDecomposer.kt @@ -243,13 +243,13 @@ internal class ExpressionDecomposer private constructor( private class CallableInvocationAdapter(val invocation: JsInvocation) : Callable(invocation) { override var qualifier: JsExpression get() = invocation.qualifier - set(value) = invocation.qualifier = value + set(value) { invocation.qualifier = value } } private class CallableNewAdapter(val jsnew: JsNew) : Callable(jsnew) { override var qualifier: JsExpression get() = jsnew.constructorExpression - set(value) = jsnew.constructorExpression = value + set(value) { jsnew.constructorExpression = value } } private fun Callable.process() { diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/astUtils.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/astUtils.kt index 01aed2771e7..f2ac827d543 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/astUtils.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/astUtils.kt @@ -79,24 +79,24 @@ fun JsExpression.toInvocationWith(thisExpr: JsExpression): JsExpression { var JsWhile.test: JsExpression get() = condition - set(value) = condition = value + set(value) { condition = value } var JsArrayAccess.index: JsExpression get() = indexExpression - set(value) = indexExpression = value + set(value) { indexExpression = value } var JsArrayAccess.array: JsExpression get() = arrayExpression - set(value) = arrayExpression = value + set(value) { arrayExpression = value } var JsConditional.test: JsExpression get() = testExpression - set(value) = testExpression = value + set(value) { testExpression = value } var JsConditional.then: JsExpression get() = thenExpression - set(value) = thenExpression = value + set(value) { thenExpression = value } var JsConditional.otherwise: JsExpression get() = elseExpression - set(value) = elseExpression = value + set(value) { elseExpression = value }