From e424b89d82a6c9ed1214c461735b2260ceda71dd Mon Sep 17 00:00:00 2001
From: "Pavel V. Talanov" <talanov.pavel@gmail.com>
Date: Mon, 7 Apr 2014 20:20:32 +0400
Subject: [PATCH] Extract JetProperty#hasDelegateExpressionOrInitializer() and
 use it where appropriate

---
 .../backend/src/org/jetbrains/jet/codegen/MemberCodegen.java  | 3 +--
 .../frontend/src/org/jetbrains/jet/lang/psi/JetProperty.java  | 4 ++++
 .../org/jetbrains/jet/lang/resolve/DeclarationsChecker.java   | 2 +-
 .../org/jetbrains/jet/lang/resolve/DescriptorResolver.java    | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/MemberCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/MemberCodegen.java
index 72e81330396..323582a21de 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/MemberCodegen.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/MemberCodegen.java
@@ -248,8 +248,7 @@ public abstract class MemberCodegen<T extends JetElement/* TODO: & JetDeclaratio
     }
 
     private boolean shouldInitializeProperty(@NotNull JetProperty property) {
-        JetExpression initializer = property.getDelegateExpressionOrInitializer();
-        if (initializer == null) return false;
+        if (!property.hasDelegateExpressionOrInitializer()) return false;
 
         PropertyDescriptor propertyDescriptor = (PropertyDescriptor) bindingContext.get(VARIABLE, property);
         assert propertyDescriptor != null;
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetProperty.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetProperty.java
index 9eb972bc551..39adae90949 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetProperty.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetProperty.java
@@ -166,6 +166,10 @@ public class JetProperty extends JetTypeParameterListOwnerStub<PsiJetPropertyStu
         return PsiTreeUtil.getNextSiblingOfType(findChildByType(EQ), JetExpression.class);
     }
 
+    public boolean hasDelegateExpressionOrInitializer() {
+        return getDelegateExpressionOrInitializer() != null;
+    }
+
     @Nullable
     public JetExpression getDelegateExpressionOrInitializer() {
         JetExpression expression = getDelegateExpression();
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationsChecker.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationsChecker.java
index 8cbf57ccdf6..bcaf3f90984 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationsChecker.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationsChecker.java
@@ -417,7 +417,7 @@ public class DeclarationsChecker {
                                             (setter != null && setter.hasBody());
 
         if (propertyDescriptor.getModality() == Modality.ABSTRACT) {
-            if (property.getDelegateExpressionOrInitializer() == null && property.getTypeRef() == null) {
+            if (!property.hasDelegateExpressionOrInitializer() && property.getTypeRef() == null) {
                 trace.report(PROPERTY_WITH_NO_TYPE_NO_INITIALIZER.on(property));
             }
             return;
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java
index b4d50479154..34a04025e6b 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java
@@ -959,7 +959,7 @@ public class DescriptorResolver {
 
     /*package*/
     static boolean hasBody(JetProperty property) {
-        boolean hasBody = property.getDelegateExpressionOrInitializer() != null;
+        boolean hasBody = property.hasDelegateExpressionOrInitializer();
         if (!hasBody) {
             JetPropertyAccessor getter = property.getGetter();
             if (getter != null && getter.hasBody()) {