From 407c2029da47ec5940f5403296275e3327a0bcad Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Thu, 20 Nov 2014 17:40:06 +0300 Subject: [PATCH] Rename: getModuleDescriptorForElement -> findModuleDescriptor --- .../jetbrains/jet/plugin/caches/resolve/KotlinCacheService.kt | 2 +- .../jetbrains/jet/plugin/caches/resolve/ResolutionFacade.kt | 2 +- .../org/jetbrains/jet/plugin/caches/resolve/resolutionApi.kt | 4 ++-- .../jet/plugin/intentions/RemoveExplicitTypeArguments.kt | 4 ++-- .../org/jetbrains/jet/plugin/completion/CompletionSession.kt | 2 +- idea/src/org/jetbrains/jet/plugin/completion/ExpectedInfos.kt | 2 +- .../org/jetbrains/jet/plugin/debugger/JetPositionManager.java | 2 +- .../jet/plugin/liveTemplates/macro/BaseJetVariableMacro.java | 2 +- idea/src/org/jetbrains/jet/plugin/quickfix/AutoImportFix.kt | 2 +- .../refactoring/extractFunction/extractableAnalysisUtil.kt | 4 ++-- .../introduceVariable/KotlinIntroduceVariableHandler.java | 2 +- .../jet/plugin/stubs/AbstractLazyResolveByStubTest.java | 2 +- 12 files changed, 15 insertions(+), 15 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 e786125e0c9..b7481fa1aad 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 @@ -53,7 +53,7 @@ public class KotlinCacheService(val project: Project) { return cache.getLazyResolveSession(element).resolveToElement(element) } - override fun getModuleDescriptorForElement(element: JetElement): ModuleDescriptor { + override fun findModuleDescriptor(element: JetElement): ModuleDescriptor { return cache.getLazyResolveSession(element).getModuleDescriptor() } 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 586082153ed..6b41f68362d 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 @@ -28,5 +28,5 @@ public trait ResolutionFacade { public fun resolveToDescriptor(declaration: JetDeclaration): DeclarationDescriptor - public fun getModuleDescriptorForElement(element: JetElement): ModuleDescriptor + public fun findModuleDescriptor(element: JetElement): ModuleDescriptor } 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 00846944bd2..87b89c88c1d 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 @@ -36,8 +36,8 @@ public fun JetElement.analyze(): BindingContext { return getLazyResolveSession().analyze(this) } -public fun JetElement.getModuleDescriptorForElement(): ModuleDescriptor { - return getLazyResolveSession().getModuleDescriptorForElement(this) +public fun JetElement.findModuleDescriptor(): ModuleDescriptor { + return getLazyResolveSession().findModuleDescriptor(this) } public fun JetElement.getAnalysisResults(vararg extraFiles: JetFile): AnalysisResult { diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/intentions/RemoveExplicitTypeArguments.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/intentions/RemoveExplicitTypeArguments.kt index f1a4690ff4b..4e3dc65442a 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/intentions/RemoveExplicitTypeArguments.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/intentions/RemoveExplicitTypeArguments.kt @@ -35,7 +35,7 @@ import org.jetbrains.jet.lang.resolve.calls.callUtil.getResolvedCall import org.jetbrains.jet.lang.psi.psiUtil.getTextWithLocation import org.jetbrains.jet.lang.resolve.bindingContextUtil.getDataFlowInfo import org.jetbrains.jet.plugin.util.approximateFlexibleTypes -import org.jetbrains.jet.plugin.caches.resolve.getModuleDescriptorForElement +import org.jetbrains.jet.plugin.caches.resolve.findModuleDescriptor public class RemoveExplicitTypeArguments : JetSelfTargetingIntention( "remove.explicit.type.arguments", javaClass()) { @@ -47,7 +47,7 @@ public class RemoveExplicitTypeArguments : JetSelfTargetingIntention())?.firstOrNull() private val file = position.getContainingFile() as JetFile protected val resolveSession: ResolutionFacade = file.getLazyResolveSession() - protected val moduleDescriptor: ModuleDescriptor = resolveSession.getModuleDescriptorForElement(file) + protected val moduleDescriptor: ModuleDescriptor = resolveSession.findModuleDescriptor(file) protected val bindingContext: BindingContext? = jetReference?.let { resolveSession.analyze(it.expression) } protected val inDescriptor: DeclarationDescriptor? = jetReference?.let { bindingContext!!.get(BindingContext.RESOLUTION_SCOPE, it.expression)?.getContainingDeclaration() } diff --git a/idea/src/org/jetbrains/jet/plugin/completion/ExpectedInfos.kt b/idea/src/org/jetbrains/jet/plugin/completion/ExpectedInfos.kt index 5e1460d288e..56c8e5aeec8 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/ExpectedInfos.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/ExpectedInfos.kt @@ -174,7 +174,7 @@ class ExpectedInfos(val bindingContext: BindingContext, val resolveSession: Reso false).replaceCollectAllCandidates(true) val callResolver = InjectorForMacros( callElement.getProject(), - resolveSession.getModuleDescriptorForElement(callElement) + resolveSession.findModuleDescriptor(callElement) ).getCallResolver() val results: OverloadResolutionResults = callResolver.resolveFunctionCall(callResolutionContext) diff --git a/idea/src/org/jetbrains/jet/plugin/debugger/JetPositionManager.java b/idea/src/org/jetbrains/jet/plugin/debugger/JetPositionManager.java index 42f3769c394..94715dea0fd 100644 --- a/idea/src/org/jetbrains/jet/plugin/debugger/JetPositionManager.java +++ b/idea/src/org/jetbrains/jet/plugin/debugger/JetPositionManager.java @@ -306,7 +306,7 @@ public class JetPositionManager implements PositionManager { ResolutionFacade resolveSession = ResolvePackage.getLazyResolveSession(element); GenerationState state = new GenerationState(file.getProject(), ClassBuilderFactories.THROW_EXCEPTION, - resolveSession.getModuleDescriptorForElement(element), + resolveSession.findModuleDescriptor(element), resolveSession.analyze(element), Collections.singletonList(file) ); diff --git a/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/BaseJetVariableMacro.java b/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/BaseJetVariableMacro.java index f5496c9291c..1d429d9600a 100644 --- a/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/BaseJetVariableMacro.java +++ b/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/BaseJetVariableMacro.java @@ -73,7 +73,7 @@ public abstract class BaseJetVariableMacro extends Macro { } ExpressionTypingComponents components = - new InjectorForMacros(project, resolveSession.getModuleDescriptorForElement(contextExpression)).getExpressionTypingComponents(); + new InjectorForMacros(project, resolveSession.findModuleDescriptor(contextExpression)).getExpressionTypingComponents(); DataFlowInfo dataFlowInfo = getDataFlowInfo(bindingContext, contextExpression); diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/AutoImportFix.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/AutoImportFix.kt index 69ab21d72db..04bb3fc4aaa 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/AutoImportFix.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/AutoImportFix.kt @@ -138,7 +138,7 @@ public class AutoImportFix(element: JetSimpleNameExpression) : JetHintAction() - val moduleDescriptor = resolveSession.getModuleDescriptorForElement(element) + val moduleDescriptor = resolveSession.findModuleDescriptor(element) val indicesHelper = KotlinIndicesHelper(file.getProject(), resolveSession, searchScope, moduleDescriptor, ::isVisible) if (!element.isImportDirectiveExpression() && !JetPsiUtil.isSelectorInQualified(element)) { diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/extractableAnalysisUtil.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/extractableAnalysisUtil.kt index a9c8892df02..0c698333458 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/extractableAnalysisUtil.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/extractableAnalysisUtil.kt @@ -66,7 +66,7 @@ import org.jetbrains.jet.lang.cfg.pseudocodeTraverser.traverseFollowingInstructi import org.jetbrains.jet.plugin.refactoring.extractFunction.OutputValueBoxer.AsList import org.jetbrains.jet.plugin.refactoring.getContextForContainingDeclarationBody import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers -import org.jetbrains.jet.plugin.caches.resolve.getModuleDescriptorForElement +import org.jetbrains.jet.plugin.caches.resolve.findModuleDescriptor private val DEFAULT_FUNCTION_NAME = "myFun" private val DEFAULT_RETURN_TYPE = KotlinBuiltIns.getInstance().getUnitType() @@ -701,7 +701,7 @@ fun ExtractionData.performAnalysis(): AnalysisResult { analyzeControlFlow( localInstructions, pseudocode, - originalFile.getModuleDescriptorForElement(), + originalFile.findModuleDescriptor(), bindingContext, modifiedVarDescriptorsForControlFlow, options, 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 3848f488e0b..1c5ccc1b941 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 @@ -126,7 +126,7 @@ public class KotlinIntroduceVariableHandler extends KotlinIntroduceHandlerBase { ResolutionFacade resolveSession = ResolvePackage.getLazyResolveSession(expression); final BindingContext bindingContext = resolveSession.analyze(expression); - ModuleDescriptor moduleDescriptorForElement = resolveSession.getModuleDescriptorForElement(expression); + ModuleDescriptor moduleDescriptorForElement = resolveSession.findModuleDescriptor(expression); final JetType expressionType = bindingContext.get(BindingContext.EXPRESSION_TYPE, expression); //can be null or error type JetScope scope = bindingContext.get(BindingContext.RESOLUTION_SCOPE, expression); if (scope != null) { diff --git a/idea/tests/org/jetbrains/jet/plugin/stubs/AbstractLazyResolveByStubTest.java b/idea/tests/org/jetbrains/jet/plugin/stubs/AbstractLazyResolveByStubTest.java index 09c9da12edd..8d3a989d8e4 100644 --- a/idea/tests/org/jetbrains/jet/plugin/stubs/AbstractLazyResolveByStubTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/stubs/AbstractLazyResolveByStubTest.java @@ -64,7 +64,7 @@ public abstract class AbstractLazyResolveByStubTest extends KotlinCodeInsightTes private void performTest(@NotNull String path, boolean checkPrimaryConstructors, boolean checkPropertyAccessors) { JetFile file = (JetFile) getFile(); - ModuleDescriptor module = ResolvePackage.getModuleDescriptorForElement(file); + ModuleDescriptor module = ResolvePackage.findModuleDescriptor(file); PackageViewDescriptor packageViewDescriptor = module.getPackage(new FqName("test")); Assert.assertNotNull(packageViewDescriptor);