azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename: getModuleDescriptorForElement -> findModuleDescriptor

Browse Source
This commit is contained in:
Pavel V. Talanov
2014-11-20 17:40:06 +03:00
parent 6ff647ca66
commit 407c2029da
12 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/KotlinCacheService.kt
+1 -1
View File
@@ -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()
}
idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/ResolutionFacade.kt
+1 -1
View File
@@ -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
}
idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/resolutionApi.kt
+2 -2
View File
@@ -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 {
idea/idea-analysis/src/org/jetbrains/jet/plugin/intentions/RemoveExplicitTypeArguments.kt
+2 -2
View File
@@ -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<JetTypeArgumentList>(
"remove.explicit.type.arguments", javaClass()) {
@@ -47,7 +47,7 @@ public class RemoveExplicitTypeArguments : JetSelfTargetingIntention<JetTypeArgu
val context = AnalyzerFacadeWithCache.getContextForElement(callExpression)
if (callExpression.getTypeArguments().isEmpty()) return false
val injector = InjectorForMacros(callExpression.getProject(), callExpression.getModuleDescriptorForElement())
val injector = InjectorForMacros(callExpression.getProject(), callExpression.findModuleDescriptor())
val scope = context[BindingContext.RESOLUTION_SCOPE, callExpression]
val originalCall = callExpression.getResolvedCall(context)