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

---
 .../java/kotlinSignature/AlternativeFieldSignatureData.java | 2 +-
 .../src/org/jetbrains/jet/lang/psi/JetProperty.java         | 6 +++++-
 .../intentions/declarations/ConvertMemberToExtension.java   | 2 +-
 .../plugin/intentions/declarations/DeclarationUtils.java    | 4 ++--
 .../jet/plugin/quickfix/RemovePartsFromPropertyFix.java     | 2 +-
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/AlternativeFieldSignatureData.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/AlternativeFieldSignatureData.java
index a67f336e671..47bdd20fdc3 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/AlternativeFieldSignatureData.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/AlternativeFieldSignatureData.java
@@ -84,7 +84,7 @@ public class AlternativeFieldSignatureData extends ElementAlternativeSignatureDa
             throw new AlternativeSignatureMismatchException("Wrong mutability in annotation for field");
         }
 
-        if (altProperty.getInitializer() != null) {
+        if (altProperty.hasInitializer()) {
             throw new AlternativeSignatureMismatchException("Default value is not expected in annotation for field");
         }
     }
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 443caae2880..5ccc42d5d16 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetProperty.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetProperty.java
@@ -168,6 +168,10 @@ public class JetProperty extends JetTypeParameterListOwnerStub<PsiJetPropertyStu
         return null;
     }
 
+    public boolean hasInitializer() {
+        return getInitializer() != null;
+    }
+
     @Override
     @Nullable
     public JetExpression getInitializer() {
@@ -175,7 +179,7 @@ public class JetProperty extends JetTypeParameterListOwnerStub<PsiJetPropertyStu
     }
 
     public boolean hasDelegateExpressionOrInitializer() {
-        return getDelegateExpressionOrInitializer() != null;
+        return hasDelegateExpression() || hasInitializer();
     }
 
     @Nullable
diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/declarations/ConvertMemberToExtension.java b/idea/src/org/jetbrains/jet/plugin/intentions/declarations/ConvertMemberToExtension.java
index 56b03d36c27..aac7bf4317b 100644
--- a/idea/src/org/jetbrains/jet/plugin/intentions/declarations/ConvertMemberToExtension.java
+++ b/idea/src/org/jetbrains/jet/plugin/intentions/declarations/ConvertMemberToExtension.java
@@ -67,7 +67,7 @@ public class ConvertMemberToExtension extends BaseIntentionAction {
     ) {
         JetCallableDeclaration declaration = getTarget(editor, file);
         if (declaration instanceof JetProperty) {
-            if (((JetProperty) declaration).getInitializer() != null) return false;
+            if (((JetProperty) declaration).hasInitializer()) return false;
         }
         return declaration != null
                && declaration.getParent() instanceof JetClassBody
diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/declarations/DeclarationUtils.java b/idea/src/org/jetbrains/jet/plugin/intentions/declarations/DeclarationUtils.java
index 643c641d5cf..f87bae2a74a 100644
--- a/idea/src/org/jetbrains/jet/plugin/intentions/declarations/DeclarationUtils.java
+++ b/idea/src/org/jetbrains/jet/plugin/intentions/declarations/DeclarationUtils.java
@@ -42,7 +42,7 @@ public class DeclarationUtils {
     }
 
     public static boolean checkSplitProperty(@NotNull JetProperty property) {
-        return property.getInitializer() != null && property.isLocal();
+        return property.hasInitializer() && property.isLocal();
     }
 
     public static final Predicate<PsiElement> SKIP_DELIMITERS = new Predicate<PsiElement>() {
@@ -68,7 +68,7 @@ public class DeclarationUtils {
         }
 
         if (property == null) return null;
-        if (property.getInitializer() != null) return null;
+        if (property.hasInitializer()) return null;
         if (!JetPsiUtil.isOrdinaryAssignment(initializer)) return null;
 
         JetBinaryExpression assignment = (JetBinaryExpression) initializer;
diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/RemovePartsFromPropertyFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/RemovePartsFromPropertyFix.java
index 152b3898a23..acbb46748a9 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/RemovePartsFromPropertyFix.java
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/RemovePartsFromPropertyFix.java
@@ -42,7 +42,7 @@ public class RemovePartsFromPropertyFix extends JetIntentionAction<JetProperty>
     }
 
     private RemovePartsFromPropertyFix(@NotNull JetProperty element) {
-        this(element, element.getInitializer() != null,
+        this(element, element.hasInitializer(),
              element.getGetter() != null && element.getGetter().getBodyExpression() != null,
              element.getSetter() != null && element.getSetter().getBodyExpression() != null);
     }