From 58651d02c244c8071febd92a5d60b4326fb25b74 Mon Sep 17 00:00:00 2001
From: "Pavel V. Talanov" <talanov.pavel@gmail.com>
Date: Wed, 9 Apr 2014 15:23:11 +0400
Subject: [PATCH] Extract JetProperty#hasDelegate() and hasDelegateExpression()
 and use it where appropriate

---
 .../src/org/jetbrains/jet/codegen/MemberCodegen.java      | 2 +-
 .../src/org/jetbrains/jet/codegen/PropertyCodegen.java    | 6 +++---
 .../src/org/jetbrains/jet/lang/psi/JetProperty.java       | 8 ++++++++
 .../jetbrains/jet/lang/resolve/DescriptorResolver.java    | 6 +++---
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/MemberCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/MemberCodegen.java
index 323582a21de..5ab832562fe 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/MemberCodegen.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/MemberCodegen.java
@@ -317,7 +317,7 @@ public abstract class MemberCodegen<T extends JetElement/* TODO: & JetDeclaratio
         for (JetDeclaration declaration : ((JetDeclarationContainer) element).getDeclarations()) {
             if (declaration instanceof JetProperty) {
                 JetProperty property = (JetProperty) declaration;
-                if (property.getDelegate() != null) {
+                if (property.hasDelegate()) {
                     delegatedProperties.add(property);
                 }
             }
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/PropertyCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/PropertyCodegen.java
index 98a9291d312..18f022d423d 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/PropertyCodegen.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/PropertyCodegen.java
@@ -148,7 +148,7 @@ public class PropertyCodegen {
         if (Boolean.TRUE.equals(bindingContext.get(BindingContext.BACKING_FIELD_REQUIRED, descriptor))) {
             fv = generateBackingFieldAccess(p, descriptor);
         }
-        else if (p instanceof JetProperty && ((JetProperty) p).getDelegateExpression() != null) {
+        else if (p instanceof JetProperty && ((JetProperty) p).hasDelegate()) {
             fv = generatePropertyDelegateAccess((JetProperty) p, descriptor);
         }
         else {
@@ -288,7 +288,7 @@ public class PropertyCodegen {
 
         FunctionGenerationStrategy strategy;
         if (isDefaultAccessor) {
-            if (p instanceof JetProperty && ((JetProperty) p).getDelegate() != null) {
+            if (p instanceof JetProperty && ((JetProperty) p).hasDelegate()) {
                 strategy = new DelegatedPropertyAccessorStrategy(state, accessorDescriptor, indexOfDelegatedProperty((JetProperty) p));
             }
             else {
@@ -318,7 +318,7 @@ public class PropertyCodegen {
 
         int index = 0;
         for (JetDeclaration declaration : container.getDeclarations()) {
-            if (declaration instanceof JetProperty && ((JetProperty) declaration).getDelegate() != null) {
+            if (declaration instanceof JetProperty && ((JetProperty) declaration).hasDelegate()) {
                 if (declaration == property) {
                     return index;
                 }
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 39adae90949..443caae2880 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetProperty.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetProperty.java
@@ -146,11 +146,19 @@ public class JetProperty extends JetTypeParameterListOwnerStub<PsiJetPropertyStu
         return null;
     }
 
+    public boolean hasDelegate() {
+        return getDelegate() != null;
+    }
+
     @Nullable
     public JetPropertyDelegate getDelegate() {
         return (JetPropertyDelegate) findChildByType(PROPERTY_DELEGATE);
     }
 
+    public boolean hasDelegateExpression() {
+        return getDelegateExpression() != null;
+    }
+
     @Nullable
     public JetExpression getDelegateExpression() {
         JetPropertyDelegate delegate = getDelegate();
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 34a04025e6b..871a1319c43 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java
@@ -984,7 +984,7 @@ public class DescriptorResolver {
     ) {
         JetTypeReference propertyTypeRef = variable.getTypeRef();
 
-        boolean hasDelegate = variable instanceof JetProperty && ((JetProperty) variable).getDelegateExpression() != null;
+        boolean hasDelegate = variable instanceof JetProperty && ((JetProperty) variable).hasDelegateExpression();
         if (propertyTypeRef == null) {
             final JetExpression initializer = variable.getInitializer();
             if (initializer == null) {
@@ -1186,7 +1186,7 @@ public class DescriptorResolver {
             trace.record(BindingContext.PROPERTY_ACCESSOR, setter, setterDescriptor);
         }
         else if (property.isVar()) {
-            setterDescriptor = DescriptorFactory.createSetter(propertyDescriptor, property.getDelegateExpression() == null);
+            setterDescriptor = DescriptorFactory.createSetter(propertyDescriptor, !property.hasDelegate());
         }
 
         if (!property.isVar()) {
@@ -1230,7 +1230,7 @@ public class DescriptorResolver {
             trace.record(BindingContext.PROPERTY_ACCESSOR, getter, getterDescriptor);
         }
         else {
-            getterDescriptor = DescriptorFactory.createGetter(propertyDescriptor, property.getDelegateExpression() == null);
+            getterDescriptor = DescriptorFactory.createGetter(propertyDescriptor, !property.hasDelegate());
             getterDescriptor.initialize(propertyDescriptor.getType());
         }
         return getterDescriptor;