Refactoring code to be more Kotlin

idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/ResolveElementCache.java

@@ -58,7 +58,7 @@ public class ResolveElementCache extends ElementResolver {
                                         manager.createSoftlyRetainedMemoizedFunction(new Function1<JetElement, BindingContext>() {
                                             @Override
                                             public BindingContext invoke(JetElement jetElement) {
-                                                return elementAdditionalResolve(jetElement, jetElement, BodyResolveMode.FULL);
+                                                return performElementAdditionalResolve(jetElement, jetElement, BodyResolveMode.FULL);
                                             }
                                         });
 

idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/ResolveSessionForBodies.java

@@ -80,7 +80,7 @@ public class ResolveSessionForBodies implements KotlinCodeAnalyzer {
             return resolveSession.resolveToDescriptor(declaration);
         }
 
-        BindingContext context = resolveElementCache.resolveToElement(declaration);
+        BindingContext context = resolveElementCache.resolveToElement(declaration, BodyResolveMode.FULL);
         return BindingContextUtils.getNotNull(context, BindingContext.DECLARATION_TO_DESCRIPTOR, declaration,
                                               "Descriptor wasn't found for declaration " + declaration.toString() + "\n" +
                                               JetPsiUtil.getElementTextWithContext(declaration));