From 6ff647ca669c8c7bd99f4cdfdb1c651a637a4544 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Thu, 20 Nov 2014 17:38:29 +0300 Subject: [PATCH] Rename: resolveToElement() -> analyze --- .../jet/plugin/caches/resolve/KotlinCacheService.kt | 2 +- .../jet/plugin/caches/resolve/ResolutionFacade.kt | 2 +- .../jetbrains/jet/plugin/caches/resolve/resolutionApi.kt | 4 ++-- .../jet/plugin/codeInsight/JetFileReferencesResolver.kt | 8 ++++---- .../jetbrains/jet/plugin/codeInsight/ShortenReferences.kt | 4 ++-- .../jet/plugin/project/AnalyzerFacadeWithCache.java | 2 +- .../jetbrains/jet/plugin/caches/KotlinIndicesHelper.kt | 6 +++--- .../jetbrains/jet/plugin/completion/CompletionSession.kt | 2 +- .../jet/plugin/completion/PackageDirectiveCompletion.kt | 2 +- .../jet/plugin/completion/handlers/GenerateLambda.kt | 2 +- .../jet/plugin/completion/smart/SmartCompletion.kt | 4 ++-- .../jetbrains/jet/plugin/debugger/JetPositionManager.java | 2 +- .../plugin/intentions/ConvertToForEachLoopIntention.kt | 4 ++-- idea/src/org/jetbrains/jet/plugin/intentions/Utils.kt | 6 +++--- .../plugin/liveTemplates/macro/BaseJetVariableMacro.java | 2 +- .../parameterInfo/JetFunctionParameterInfoHandler.java | 4 ++-- .../org/jetbrains/jet/plugin/quickfix/AutoImportFix.kt | 2 +- .../plugin/refactoring/inline/KotlinInlineValHandler.java | 4 ++-- .../introduceVariable/KotlinIntroduceVariableHandler.java | 2 +- .../jet/plugin/refactoring/jetRefactoringUtil.kt | 4 ++-- 20 files changed, 34 insertions(+), 34 deletions(-) diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/KotlinCacheService.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/KotlinCacheService.kt index f9c402cdd0c..e786125e0c9 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/KotlinCacheService.kt +++ b/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): 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) } diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/ResolutionFacade.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/ResolutionFacade.kt index faebfd327ba..586082153ed 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/ResolutionFacade.kt +++ b/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 diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/resolutionApi.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/resolutionApi.kt index 4e744b85ee9..00846944bd2 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/resolutionApi.kt +++ b/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 { diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/codeInsight/JetFileReferencesResolver.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/codeInsight/JetFileReferencesResolver.kt index 325e3144f65..afdf0c5118c 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/codeInsight/JetFileReferencesResolver.kt +++ b/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) } } } diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/codeInsight/ShortenReferences.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/codeInsight/ShortenReferences.kt index a0128307a14..91ab272a63e 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/codeInsight/ShortenReferences.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/codeInsight/ShortenReferences.kt @@ -159,7 +159,7 @@ public object ShortenReferences { protected val elementsToShorten: MutableSet = 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())!! - 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) { diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/AnalyzerFacadeWithCache.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/AnalyzerFacadeWithCache.java index 7768a188f5c..aebdaef6130 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/AnalyzerFacadeWithCache.java +++ b/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); } } diff --git a/idea/src/org/jetbrains/jet/plugin/caches/KotlinIndicesHelper.kt b/idea/src/org/jetbrains/jet/plugin/caches/KotlinIndicesHelper.kt index dc589abce8e..d2543ed81ca 100644 --- a/idea/src/org/jetbrains/jet/plugin/caches/KotlinIndicesHelper.kt +++ b/idea/src/org/jetbrains/jet/plugin/caches/KotlinIndicesHelper.kt @@ -73,7 +73,7 @@ public class KotlinIndicesHelper( } public fun getTopLevelCallablesByName(name: String, context: JetExpression /*TODO: to be dropped*/): Collection { - val jetScope = resolveSession.resolveToElement(context).get(BindingContext.RESOLUTION_SCOPE, context) ?: return listOf() + val jetScope = resolveSession.analyze(context).get(BindingContext.RESOLUTION_SCOPE, context) ?: return listOf() val result = HashSet() @@ -127,7 +127,7 @@ public class KotlinIndicesHelper( val sourceNames = JetTopLevelFunctionsFqnNameIndex.getInstance().getAllKeys(project).stream() + JetTopLevelPropertiesFqnNameIndex.getInstance().getAllKeys(project).stream() val allFqNames = sourceNames.map { FqName(it) } + JetFromJavaDescriptorHelper.getTopLevelCallableFqNames(project, scope, false).stream() - val jetScope = resolveSession.resolveToElement(context).get(BindingContext.RESOLUTION_SCOPE, context) ?: return listOf() + val jetScope = resolveSession.analyze(context).get(BindingContext.RESOLUTION_SCOPE, context) ?: return listOf() return allFqNames.filter { nameFilter(it.shortName().asString()) } .toSet() @@ -135,7 +135,7 @@ public class KotlinIndicesHelper( } public fun getCallableExtensions(nameFilter: (String) -> Boolean, expression: JetSimpleNameExpression): Collection { - val bindingContext = resolveSession.resolveToElement(expression) + val bindingContext = resolveSession.analyze(expression) val dataFlowInfo = bindingContext.getDataFlowInfo(expression) val functionsIndex = JetTopLevelFunctionsFqnNameIndex.getInstance() diff --git a/idea/src/org/jetbrains/jet/plugin/completion/CompletionSession.kt b/idea/src/org/jetbrains/jet/plugin/completion/CompletionSession.kt index c9b515df441..440a1aba9f3 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/CompletionSession.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/CompletionSession.kt @@ -53,7 +53,7 @@ abstract class CompletionSessionBase(protected val configuration: CompletionSess private val file = position.getContainingFile() as JetFile protected val resolveSession: ResolutionFacade = file.getLazyResolveSession() protected val moduleDescriptor: ModuleDescriptor = resolveSession.getModuleDescriptorForElement(file) - protected val bindingContext: BindingContext? = jetReference?.let { resolveSession.resolveToElement(it.expression) } + protected val bindingContext: BindingContext? = jetReference?.let { resolveSession.analyze(it.expression) } protected val inDescriptor: DeclarationDescriptor? = jetReference?.let { bindingContext!!.get(BindingContext.RESOLUTION_SCOPE, it.expression)?.getContainingDeclaration() } // set prefix matcher here to override default one which relies on CompletionUtil.findReferencePrefix() diff --git a/idea/src/org/jetbrains/jet/plugin/completion/PackageDirectiveCompletion.kt b/idea/src/org/jetbrains/jet/plugin/completion/PackageDirectiveCompletion.kt index a70ef51e1ae..aa6b56eba08 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/PackageDirectiveCompletion.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/PackageDirectiveCompletion.kt @@ -51,7 +51,7 @@ object PackageDirectiveCompletion { val result = result.withPrefixMatcher(prefixMatcher) val resolveSession = ref.expression.getLazyResolveSession() - val bindingContext = resolveSession.resolveToElement(ref.expression) + val bindingContext = resolveSession.analyze(ref.expression) val variants = ReferenceVariantsHelper(bindingContext, { true }).getPackageReferenceVariants(ref.expression, prefixMatcher.asNameFilter()) for (variant in variants) { diff --git a/idea/src/org/jetbrains/jet/plugin/completion/handlers/GenerateLambda.kt b/idea/src/org/jetbrains/jet/plugin/completion/handlers/GenerateLambda.kt index 991fc52b544..fba266b515d 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/handlers/GenerateLambda.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/handlers/GenerateLambda.kt @@ -86,7 +86,7 @@ private fun needExplicitParameterTypes(context: InsertionContext, placeholderRan if (expression == null) return false val resolveSession = file.getLazyResolveSession() - val bindingContext = resolveSession.resolveToElement(expression) + val bindingContext = resolveSession.analyze(expression) val expectedInfos = ExpectedInfos(bindingContext, resolveSession).calculate(expression) ?: return false val functionTypes = expectedInfos.map { it.type }.filter { KotlinBuiltIns.getInstance().isExactFunctionOrExtensionFunctionType(it) }.toSet() if (functionTypes.size <= 1) return false diff --git a/idea/src/org/jetbrains/jet/plugin/completion/smart/SmartCompletion.kt b/idea/src/org/jetbrains/jet/plugin/completion/smart/SmartCompletion.kt index f3a2c899a79..84366cdd7ea 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/smart/SmartCompletion.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/smart/SmartCompletion.kt @@ -40,7 +40,7 @@ class SmartCompletion(val expression: JetSimpleNameExpression, val visibilityFilter: (DeclarationDescriptor) -> Boolean, val originalFile: JetFile, val boldImmediateLookupElementFactory: LookupElementFactory) { - private val bindingContext = resolveSession.resolveToElement(expression) + private val bindingContext = resolveSession.analyze(expression) private val project = expression.getProject() public data class Result(val declarationFilter: ((DeclarationDescriptor) -> Collection)?, @@ -185,7 +185,7 @@ class SmartCompletion(val expression: JetSimpleNameExpression, if (operationToken == JetTokens.EQ || operationToken == JetTokens.EQEQ || operationToken == JetTokens.EXCLEQ) { val left = parent.getLeft() if (left is JetReferenceExpression) { - return resolveSession.resolveToElement(left)[BindingContext.REFERENCE_TARGET, left].toSet() + return resolveSession.analyze(left)[BindingContext.REFERENCE_TARGET, left].toSet() } } } diff --git a/idea/src/org/jetbrains/jet/plugin/debugger/JetPositionManager.java b/idea/src/org/jetbrains/jet/plugin/debugger/JetPositionManager.java index 9039633a156..42f3769c394 100644 --- a/idea/src/org/jetbrains/jet/plugin/debugger/JetPositionManager.java +++ b/idea/src/org/jetbrains/jet/plugin/debugger/JetPositionManager.java @@ -307,7 +307,7 @@ public class JetPositionManager implements PositionManager { GenerationState state = new GenerationState(file.getProject(), ClassBuilderFactories.THROW_EXCEPTION, resolveSession.getModuleDescriptorForElement(element), - resolveSession.resolveToElement(element), + resolveSession.analyze(element), Collections.singletonList(file) ); state.beforeCompile(); diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/ConvertToForEachLoopIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/ConvertToForEachLoopIntention.kt index 9763b4c6517..63ef518dd4c 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/ConvertToForEachLoopIntention.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/ConvertToForEachLoopIntention.kt @@ -26,7 +26,7 @@ import org.jetbrains.jet.lang.psi.JetBinaryExpression import org.jetbrains.jet.lang.resolve.DescriptorUtils import org.jetbrains.jet.lang.psi.JetParenthesizedExpression import org.jetbrains.jet.lang.resolve.calls.callUtil.getResolvedCall -import org.jetbrains.jet.plugin.caches.resolve.resolveToElement +import org.jetbrains.jet.plugin.caches.resolve.analyze public class ConvertToForEachLoopIntention : JetSelfTargetingIntention("convert.to.for.each.loop.intention", javaClass()) { private fun getFunctionLiteralArgument(element: JetExpression): JetFunctionLiteralExpression? { @@ -78,7 +78,7 @@ public class ConvertToForEachLoopIntention : JetSelfTargetingIntention factory = diagnostic.getFactory(); PsiElement element = diagnostic.getPsiElement(); @@ -324,7 +324,7 @@ public class KotlinInlineValHandler extends InlineActionHandler { ResolutionFacade resolveSessionForBodies = ResolvePackage.getLazyResolveSession(containingFile); for (JetExpression inlinedExpression : inlinedExpressions) { - BindingContext context = resolveSessionForBodies.resolveToElement(inlinedExpression); + BindingContext context = resolveSessionForBodies.analyze(inlinedExpression); Call call = CallUtilPackage.getCallWithAssert(inlinedExpression, context); JetElement callElement = call.getCallElement(); diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.java b/idea/src/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.java index c33060f35d4..3848f488e0b 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.java +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.java @@ -125,7 +125,7 @@ public class KotlinIntroduceVariableHandler extends KotlinIntroduceHandlerBase { } ResolutionFacade resolveSession = ResolvePackage.getLazyResolveSession(expression); - final BindingContext bindingContext = resolveSession.resolveToElement(expression); + final BindingContext bindingContext = resolveSession.analyze(expression); ModuleDescriptor moduleDescriptorForElement = resolveSession.getModuleDescriptorForElement(expression); final JetType expressionType = bindingContext.get(BindingContext.EXPRESSION_TYPE, expression); //can be null or error type JetScope scope = bindingContext.get(BindingContext.RESOLUTION_SCOPE, expression); diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/jetRefactoringUtil.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/jetRefactoringUtil.kt index 3b17ab37ffa..5bb5081593e 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/jetRefactoringUtil.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/jetRefactoringUtil.kt @@ -65,7 +65,7 @@ import org.jetbrains.jet.renderer.DescriptorRenderer import com.intellij.openapi.util.text.StringUtil import javax.swing.Icon import org.jetbrains.jet.plugin.util.string.collapseSpaces -import org.jetbrains.jet.plugin.caches.resolve.resolveToElement +import org.jetbrains.jet.plugin.caches.resolve.analyze fun PsiElement.getAndRemoveCopyableUserData(key: Key): T? { val data = getCopyableUserData(key) @@ -273,7 +273,7 @@ public fun JetElement.getContextForContainingDeclarationBody(): BindingContext? } else -> null } - return bodyElement?.let { it.resolveToElement() } + return bodyElement?.let { it.analyze() } } public fun chooseContainerElement(