KT-2725 No completion in properties initializers and accessors

#KT-2725 Fixed

compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodyResolver.java

@@ -425,7 +425,7 @@ public class BodyResolver {
         return accessorScope;
     }
 
-    private void resolvePropertyAccessors(JetProperty property, PropertyDescriptor propertyDescriptor) {
+    public void resolvePropertyAccessors(JetProperty property, PropertyDescriptor propertyDescriptor) {
         ObservableBindingTrace fieldAccessTrackingTrace = createFieldTrackingTrace(propertyDescriptor);
 
         JetPropertyAccessor getter = property.getGetter();
@@ -460,7 +460,7 @@ public class BodyResolver {
         });
     }
 
-    private void resolvePropertyInitializer(JetProperty property, PropertyDescriptor propertyDescriptor, JetExpression initializer, JetScope scope) {
+    public void resolvePropertyInitializer(JetProperty property, PropertyDescriptor propertyDescriptor, JetExpression initializer, JetScope scope) {
         //JetFlowInformationProvider flowInformationProvider = context.getDescriptorResolver().computeFlowData(property, initializer); // TODO : flow JET-15
         JetType expectedTypeForInitializer = property.getTypeRef() != null ? propertyDescriptor.getType() : NO_EXPECTED_TYPE;
         JetScope propertyDeclarationInnerScope = descriptorResolver.getPropertyDeclarationInnerScope(scope, propertyDescriptor.getTypeParameters(), ReceiverDescriptor.NO_RECEIVER, trace);

compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ResolveSessionUtils.java

@@ -17,6 +17,7 @@
 package org.jetbrains.jet.lang.resolve.lazy;
 
 import com.google.common.base.Predicates;
+import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
@@ -42,6 +43,9 @@ public class ResolveSessionUtils {
     }
 
     private static class EmptyBodyResolveContext implements BodiesResolveContext {
+
+        private Map<JetDeclaration, JetScope> declarationScopesMap = Collections.emptyMap();
+
         @Override
         public Map<JetClass, MutableClassDescriptor> getClasses() {
             return Collections.emptyMap();
@@ -64,7 +68,11 @@ public class ResolveSessionUtils {
 
         @Override
         public Map<JetDeclaration, JetScope> getDeclaringScopes() {
-            return Collections.emptyMap();
+            return declarationScopesMap;
+        }
+
+        public void setDeclaringScopes(Map<JetDeclaration, JetScope> declarationScopes) {
+            declarationScopesMap = declarationScopes;
         }
 
         @Override
@@ -87,17 +95,16 @@ public class ResolveSessionUtils {
         }
     }
 
-    public static
+    public static @NotNull BindingContext resolveToExpression(
-    @NotNull
-    BindingContext resolveToExpression(
             @NotNull final ResolveSession resolveSession,
             @NotNull JetExpression expression
     ) {
         final DelegatingBindingTrace trace = new DelegatingBindingTrace(resolveSession.getBindingContext());
         JetFile file = (JetFile) expression.getContainingFile();
 
-        @SuppressWarnings("unchecked") PsiElement topmostCandidateForAdditionalResolve = JetPsiUtil.getTopmostParentOfTypes(expression,
+        @SuppressWarnings("unchecked")
-                JetNamedFunction.class, JetClassInitializer.class);
+        PsiElement topmostCandidateForAdditionalResolve = JetPsiUtil.getTopmostParentOfTypes(expression,
+                JetNamedFunction.class, JetClassInitializer.class, JetProperty.class);
 
         if (topmostCandidateForAdditionalResolve != null) {
             if (topmostCandidateForAdditionalResolve instanceof JetNamedFunction) {
@@ -106,6 +113,9 @@ public class ResolveSessionUtils {
             else if (topmostCandidateForAdditionalResolve instanceof JetClassInitializer) {
                 initializerAdditionalResolve(resolveSession, (JetClassInitializer) topmostCandidateForAdditionalResolve, trace, file);
             }
+            else if (topmostCandidateForAdditionalResolve instanceof JetProperty) {
+                propertyAdditionalResolve(resolveSession, (JetProperty) topmostCandidateForAdditionalResolve, trace, file);
+            }
             else {
                 assert false : "Invalid type of the topmost parent";
             }
@@ -124,6 +134,27 @@ public class ResolveSessionUtils {
         return trace.getBindingContext();
     }
 
+    private static void propertyAdditionalResolve(final ResolveSession resolveSession, final JetProperty jetProperty, DelegatingBindingTrace trace, JetFile file) {
+        EmptyBodyResolveContext bodyResolveContext = new EmptyBodyResolveContext();
+        BodyResolver bodyResolver = createBodyResolver(trace, file, bodyResolveContext);
+        PropertyDescriptor descriptor = (PropertyDescriptor) resolveSession.resolveToDescriptor(jetProperty);
+
+        JetExpression propertyInitializer = jetProperty.getInitializer();
+
+        final JetScope propertyResolutionScope = resolveSession.getInjector().getScopeProvider().getResolutionScopeForDeclaration(
+                jetProperty);
+
+        if (propertyInitializer != null) {
+            bodyResolver.resolvePropertyInitializer(jetProperty, descriptor, propertyInitializer, propertyResolutionScope);
+        }
+
+        for (final JetPropertyAccessor propertyAccessor : jetProperty.getAccessors()) {
+            bodyResolveContext.setDeclaringScopes(
+                    ImmutableMap.<JetDeclaration, JetScope>builder().put(propertyAccessor, propertyResolutionScope).build());
+            bodyResolver.resolvePropertyAccessors(jetProperty, descriptor);
+        }
+    }
+
     private static void functionAdditionalResolve(
             ResolveSession resolveSession,
             JetNamedFunction namedFunction,

compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ScopeProvider.java

@@ -90,6 +90,9 @@ public class ScopeProvider {
         if (parentDeclaration instanceof JetClassOrObject) {
             JetClassOrObject classOrObject = (JetClassOrObject) parentDeclaration;
             LazyClassDescriptor classDescriptor = (LazyClassDescriptor) resolveSession.getClassDescriptor(classOrObject);
+            if (jetDeclaration instanceof JetClassInitializer || jetDeclaration instanceof JetProperty) {
+                return classDescriptor.getScopeForPropertyInitializerResolution();
+            }
             if (jetDeclaration instanceof JetEnumEntry) {
                 return ((LazyClassDescriptor) classDescriptor.getClassObjectDescriptor()).getScopeForMemberDeclarationResolution();
             }

idea/testData/completion/basic/InClassPropertyAccessor.kt

@@ -0,0 +1,9 @@
+class Test(val testParam : Int) {
+  val x : Int get() {
+      val test = 12
+      return te<caret>
+  }
+}
+
+// EXIST: test
+// EXIST: testParam

idea/testData/completion/basic/InGlobalPropertyInitializer.kt

@@ -0,0 +1,6 @@
+val testing = 12
+val test = "Hello"
+
+val more = test<caret>
+
+// EXIST: test, testing

idea/testData/completion/basic/InInitializerInPropertyAccessor.kt

@@ -0,0 +1,11 @@
+val testGlobal = 12
+
+val test : Int get() {
+    class SomeMore(testParam : Int) {
+        {
+            tes<caret>
+        }
+    }
+}
+
+// EXIST: testGlobal, test, testParam

idea/tests/org/jetbrains/jet/completion/JetBasicCompletionTest.java

@@ -92,6 +92,10 @@ public class JetBasicCompletionTest extends JetCompletionTestBase {
         doTest();
     }
 
+    public void testInClassPropertyAccessor() {
+        doTest();
+    }
+
     public void testInEmptyImport() {
         doTest();
     }
@@ -100,10 +104,18 @@ public class JetBasicCompletionTest extends JetCompletionTestBase {
         doTest();
     }
 
+    public void testInGlobalPropertyInitializer() {
+        doTest();
+    }
+
     public void testInImport() {
         doTest();
     }
 
+    public void testInInitializerInPropertyAccessor() {
+        doTest();
+    }
+
     public void testInLocalObjectDeclaration() {
         doTest();
     }