From b9aaab12d45340fdacb905d4484217c77d207fdb Mon Sep 17 00:00:00 2001
From: "Pavel V. Talanov" <talanov.pavel@gmail.com>
Date: Wed, 9 Apr 2014 17:56:30 +0400
Subject: [PATCH] Introduce JetParameter#hasDefaultValue() and use it instead
 of getDefaultValue() where appropriate

---
 .../src/org/jetbrains/jet/lang/psi/JetParameter.java      | 8 ++++++++
 .../lang/psi/stubs/elements/JetParameterElementType.java  | 2 +-
 .../jetbrains/jet/lang/resolve/DescriptorResolver.java    | 7 +++----
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetParameter.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetParameter.java
index 5f72a2e5bc4..e7604b0d658 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetParameter.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetParameter.java
@@ -45,6 +45,14 @@ public class JetParameter extends JetNamedDeclarationStub<PsiJetParameterStub> {
         return getStubOrPsiChild(JetStubElementTypes.TYPE_REFERENCE);
     }
 
+    public boolean hasDefaultValue() {
+        PsiJetParameterStub stub = getStub();
+        if (stub != null) {
+            return stub.hasDefaultValue();
+        }
+        return getDefaultValue() != null;
+    }
+
     @Nullable
     public JetExpression getDefaultValue() {
         PsiJetParameterStub stub = getStub();
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetParameterElementType.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetParameterElementType.java
index f10fa3148ff..2792b2500f1 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetParameterElementType.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetParameterElementType.java
@@ -40,7 +40,7 @@ public class JetParameterElementType extends JetStubElementType<PsiJetParameterS
     public PsiJetParameterStub createStub(@NotNull JetParameter psi, StubElement parentStub) {
         return new PsiJetParameterStubImpl(parentStub, psi.getFqName(), StringRef.fromString(psi.getName()),
                                            psi.isMutable(), psi.isVarArg(), psi.hasValOrVarNode(),
-                                           psi.getDefaultValue() != null);
+                                           psi.hasDefaultValue());
     }
 
     @Override
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 8dd403212d1..b0984d0a35b 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java
@@ -556,7 +556,7 @@ public class DescriptorResolver {
                 annotations,
                 JetPsiUtil.safeName(valueParameter.getName()),
                 variableType,
-                valueParameter.getDefaultValue() != null,
+                valueParameter.hasDefaultValue(),
                 varargElementType
         );
 
@@ -1151,9 +1151,8 @@ public class DescriptorResolver {
             if (parameter != null) {
 
                 // This check is redundant: the parser does not allow a default value, but we'll keep it just in case
-                JetExpression defaultValue = parameter.getDefaultValue();
-                if (defaultValue != null) {
-                    trace.report(SETTER_PARAMETER_WITH_DEFAULT_VALUE.on(defaultValue));
+                if (parameter.hasDefaultValue()) {
+                    trace.report(SETTER_PARAMETER_WITH_DEFAULT_VALUE.on(parameter.getDefaultValue()));
                 }
 
                 JetType type;