Rename: resolveToElement() -> analyze

idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/KotlinCacheService.kt

@@ -49,7 +49,7 @@ public class KotlinCacheService(val project: Project) {
     public fun getResolutionFacade(elements: List<JetElement>): ResolutionFacade {
         val cache = getCacheToAnalyzeFiles(elements.map { it.getContainingJetFile() })
         return object : ResolutionFacade {
-            override fun resolveToElement(element: JetElement): BindingContext {
+            override fun analyze(element: JetElement): BindingContext {
                 return cache.getLazyResolveSession(element).resolveToElement(element)
             }
 

idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/ResolutionFacade.kt

@@ -24,7 +24,7 @@ import org.jetbrains.jet.lang.psi.JetDeclaration
 
 public trait ResolutionFacade {
 
-    public fun resolveToElement(element: JetElement): BindingContext
+    public fun analyze(element: JetElement): BindingContext
 
     public fun resolveToDescriptor(declaration: JetDeclaration): DeclarationDescriptor
 

idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/resolutionApi.kt

@@ -32,8 +32,8 @@ public fun JetDeclaration.resolveToDescriptor(): DeclarationDescriptor {
     return getLazyResolveSession().resolveToDescriptor(this)
 }
 
-public fun JetElement.resolveToElement(): BindingContext {
-    return getLazyResolveSession().resolveToElement(this)
+public fun JetElement.analyze(): BindingContext {
+    return getLazyResolveSession().analyze(this)
 }
 
 public fun JetElement.getModuleDescriptorForElement(): ModuleDescriptor {

idea/idea-analysis/src/org/jetbrains/jet/plugin/codeInsight/JetFileReferencesResolver.kt

@@ -71,27 +71,27 @@ object JetFileReferencesResolver {
             if (resolveShortNames || userType.getQualifier() != null) {
                 val referenceExpression = userType.getReferenceExpression()
                 if (referenceExpression != null) {
-                    resolveMap[referenceExpression] = resolveSession.resolveToElement(referenceExpression)
+                    resolveMap[referenceExpression] = resolveSession.analyze(referenceExpression)
                 }
             }
         }
 
         override fun visitQualifiedExpression(expression: JetQualifiedExpression) {
             val receiverExpression = expression.getReceiverExpression()
-            if (resolveQualifiers || resolveSession.resolveToElement(expression)[BindingContext.QUALIFIER, receiverExpression] == null) {
+            if (resolveQualifiers || resolveSession.analyze(expression)[BindingContext.QUALIFIER, receiverExpression] == null) {
                 receiverExpression.accept(this)
             }
 
             val referenceExpression = expression.getSelectorExpression()?.referenceExpression()
             if (referenceExpression != null) {
-                resolveMap[referenceExpression] = resolveSession.resolveToElement(referenceExpression)
+                resolveMap[referenceExpression] = resolveSession.analyze(referenceExpression)
             }
             expression.getSelectorExpression()?.accept(this)
         }
 
         override fun visitSimpleNameExpression(expression: JetSimpleNameExpression) {
             if (resolveShortNames) {
-                resolveMap[expression] = resolveSession.resolveToElement(expression)
+                resolveMap[expression] = resolveSession.analyze(expression)
             }
         }
     }

idea/idea-analysis/src/org/jetbrains/jet/plugin/codeInsight/ShortenReferences.kt

@@ -159,7 +159,7 @@ public object ShortenReferences {
         protected val elementsToShorten: MutableSet<T> = LinkedHashSet()
 
         protected fun bindingContext(element: JetElement): BindingContext
-                = resolveMap[element] ?: resolveSession.resolveToElement(element)
+                = resolveMap[element] ?: resolveSession.analyze(element)
 
         protected abstract fun getShortenedElement(element: T): JetElement?
 
@@ -193,7 +193,7 @@ public object ShortenReferences {
             if (target == null) return false
 
             val typeReference = PsiTreeUtil.getParentOfType(userType, javaClass<JetTypeReference>())!!
-            val scope = resolveSession.resolveToElement(typeReference)[BindingContext.TYPE_RESOLUTION_SCOPE, typeReference]!!
+            val scope = resolveSession.analyze(typeReference)[BindingContext.TYPE_RESOLUTION_SCOPE, typeReference]!!
             val name = target.getName()
             val targetByName = scope.getClassifier(name)
             if (targetByName == null) {

idea/idea-analysis/src/org/jetbrains/jet/plugin/project/AnalyzerFacadeWithCache.java

@@ -28,6 +28,6 @@ public final class AnalyzerFacadeWithCache {
 
     @NotNull
     public static BindingContext getContextForElement(@NotNull JetElement jetElement) {
-        return ResolvePackage.resolveToElement(jetElement);
+        return ResolvePackage.analyze(jetElement);
     }
 }