From 5e47b923b3de6429e3047fe09cd76f07b0f1734d Mon Sep 17 00:00:00 2001
From: Andrey Breslav <andrey.breslav@jetbrains.com>
Date: Wed, 13 Jun 2012 13:22:09 +0400
Subject: [PATCH] Support properties declared as primary constructor parameters

---
 .../resolve/lazy/AbstractLazyMemberScope.java | 12 ++++++++++-
 .../AbstractPsiBasedDeclarationProvider.java  |  8 ++++----
 .../resolve/lazy/LazyClassMemberScope.java    | 20 +++++++++++++++++--
 ...siBasedClassMemberDeclarationProvider.java | 13 +++++++++---
 4 files changed, 43 insertions(+), 10 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyMemberScope.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyMemberScope.java
index 1a5d456e6bc..a87db0a292a 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyMemberScope.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyMemberScope.java
@@ -186,7 +186,10 @@ public abstract class AbstractLazyMemberScope<D extends DeclarationDescriptor, D
         for (JetDeclaration declaration : declarationProvider.getAllDeclarations()) {
             if (declaration instanceof JetClassOrObject) {
                 JetClassOrObject classOrObject = (JetClassOrObject) declaration;
-                getClassifier(classOrObject.getNameAsName());
+                Name name = classOrObject.getNameAsName();
+                if (name != null) {
+                    getClassifier(name);
+                }
             }
             else if (declaration instanceof JetFunction) {
                 JetFunction function = (JetFunction) declaration;
@@ -196,6 +199,13 @@ public abstract class AbstractLazyMemberScope<D extends DeclarationDescriptor, D
                 JetProperty property = (JetProperty) declaration;
                 getProperties(property.getNameAsSafeName());
             }
+            else if (declaration instanceof JetParameter) {
+                JetParameter parameter = (JetParameter) declaration;
+                Name name = parameter.getNameAsName();
+                if (name != null) {
+                    getProperties(name);
+                }
+            }
             else {
                 throw new IllegalArgumentException("Unsupported declaration kind: " + declaration);
             }
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/AbstractPsiBasedDeclarationProvider.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/AbstractPsiBasedDeclarationProvider.java
index 69cffe086f7..5712681ad44 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/AbstractPsiBasedDeclarationProvider.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/AbstractPsiBasedDeclarationProvider.java
@@ -21,10 +21,7 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Multimap;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.lang.psi.JetClassOrObject;
-import org.jetbrains.jet.lang.psi.JetDeclaration;
-import org.jetbrains.jet.lang.psi.JetNamedFunction;
-import org.jetbrains.jet.lang.psi.JetProperty;
+import org.jetbrains.jet.lang.psi.*;
 import org.jetbrains.jet.lang.resolve.name.Name;
 
 import java.util.List;
@@ -64,6 +61,9 @@ public abstract class AbstractPsiBasedDeclarationProvider implements Declaration
             JetClassOrObject classOrObject = (JetClassOrObject) declaration;
             classesAndObjects.put(classOrObject.getNameAsName(), classOrObject);
         }
+        else if (declaration instanceof JetParameter) {
+            // Do nothing, just put it into allDeclarations is enough
+        }
         else {
             throw new IllegalArgumentException("Unknown declaration: " + declaration);
         }
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyClassMemberScope.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyClassMemberScope.java
index 9ef75eb6612..004393914e5 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyClassMemberScope.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyClassMemberScope.java
@@ -24,6 +24,7 @@ import org.jetbrains.jet.lang.diagnostics.Errors;
 import org.jetbrains.jet.lang.psi.JetClass;
 import org.jetbrains.jet.lang.psi.JetClassOrObject;
 import org.jetbrains.jet.lang.psi.JetDeclaration;
+import org.jetbrains.jet.lang.psi.JetParameter;
 import org.jetbrains.jet.lang.resolve.BindingContextUtils;
 import org.jetbrains.jet.lang.resolve.BindingTrace;
 import org.jetbrains.jet.lang.resolve.DescriptorResolver;
@@ -104,10 +105,25 @@ public class LazyClassMemberScope extends AbstractLazyMemberScope<LazyClassDescr
     }
 
     @Override
+    @SuppressWarnings("unchecked")
     protected void getNonDeclaredProperties(@NotNull Name name, @NotNull final Set<VariableDescriptor> result) {
-        System.err.println("Parameter of the primary constructor");
+        JetClassOrObject classOrObject = declarationProvider.getOwnerClassOrObject();
+        if (classOrObject instanceof JetClass) {
+            JetClass jetClass = (JetClass) classOrObject;
+
+            for (JetParameter parameter : jetClass.getPrimaryConstructorParameters()) {
+                if (parameter.getValOrVarNode() != null) {
+                    PropertyDescriptor propertyDescriptor =
+                            resolveSession.getInjector().getDescriptorResolver().resolvePrimaryConstructorParameterToAProperty(
+                                    thisDescriptor,
+                                    thisDescriptor.getScopeForClassHeaderResolution(),
+                                    parameter, resolveSession.getTrace()
+                            );
+                    result.add(propertyDescriptor);
+                }
+            }
+        }
 
-        // Inherited fake overrides
         Collection<PropertyDescriptor> fromSupertypes = Lists.newArrayList();
         for (JetType supertype : thisDescriptor.getTypeConstructor().getSupertypes()) {
             fromSupertypes.addAll((Set) supertype.getMemberScope().getProperties(name));
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/PsiBasedClassMemberDeclarationProvider.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/PsiBasedClassMemberDeclarationProvider.java
index e6b42cb1ef9..1f7863c6337 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/PsiBasedClassMemberDeclarationProvider.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/PsiBasedClassMemberDeclarationProvider.java
@@ -17,9 +17,7 @@
 package org.jetbrains.jet.lang.resolve.lazy;
 
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.lang.psi.JetClassObject;
-import org.jetbrains.jet.lang.psi.JetClassOrObject;
-import org.jetbrains.jet.lang.psi.JetDeclaration;
+import org.jetbrains.jet.lang.psi.*;
 
 /**
  * @author abreslav
@@ -49,6 +47,15 @@ public class PsiBasedClassMemberDeclarationProvider extends AbstractPsiBasedDecl
                 putToIndex(declaration);
             }
         }
+
+        if (classOrObject instanceof JetClass) {
+            JetClass jetClass = (JetClass) classOrObject;
+            for (JetParameter parameter : jetClass.getPrimaryConstructorParameters()) {
+                if (parameter.getValOrVarNode() != null) {
+                    putToIndex(parameter);
+                }
+            }
+        }
     }
 
     @Override