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

Refactor: TopDownAnalysisParameters -> TopDownAnalysisMode

Browse Source 
No longer implements TypeLazinessToken (was unused)
This commit is contained in:
Pavel V. Talanov
2015-05-15 15:05:40 +03:00
parent d9c70b5927
commit 9d22a39924
16 changed files with 81 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/ide-common/src/org/jetbrains/kotlin/resolve/lazy/ElementResolver.kt
+4 -4
View File
@@ -305,7 +305,7 @@ public abstract class ElementResolver protected(
private fun propertyAdditionalResolve(resolveSession: ResolveSession, jetProperty: JetProperty, trace: BindingTrace, file: JetFile, statementFilter: StatementFilter) {
val propertyResolutionScope = resolveSession.getScopeProvider().getResolutionScopeForDeclaration(jetProperty)
val bodyResolveContext = BodyResolveContextForLazy(TopDownAnalysisParameters.createForLocalDeclarations(), object : Function<JetDeclaration, JetScope> {
val bodyResolveContext = BodyResolveContextForLazy(TopDownAnalysisMode.LocalDeclarations, object : Function<JetDeclaration, JetScope> {
override fun apply(declaration: JetDeclaration?): JetScope? {
assert(declaration!!.getParent() == jetProperty) { "Must be called only for property accessors, but called for " + declaration }
return resolveSession.getScopeProvider().getResolutionScopeForDeclaration(declaration)
@@ -379,7 +379,7 @@ public abstract class ElementResolver protected(
}
private fun createEmptyContext(): BodyResolveContextForLazy {
return BodyResolveContextForLazy(TopDownAnalysisParameters.createForLocalDeclarations(), Functions.constant<JetScope>(null))
return BodyResolveContextForLazy(TopDownAnalysisMode.LocalDeclarations, Functions.constant<JetScope>(null))
}
private fun getExpressionResolutionScope(resolveSession: ResolveSession, expression: JetExpression): JetScope {
@@ -451,7 +451,7 @@ public abstract class ElementResolver protected(
protected abstract fun getAdditionalCheckerProvider(jetFile: JetFile): AdditionalCheckerProvider
private class BodyResolveContextForLazy(
private val topDownAnalysisParameters: TopDownAnalysisParameters,
private val topDownAnalysisMode: TopDownAnalysisMode,
private val declaringScopes: Function<in JetDeclaration, JetScope>
) : BodiesResolveContext {
@@ -473,6 +473,6 @@ public abstract class ElementResolver protected(
override fun getOuterDataFlowInfo() = DataFlowInfo.EMPTY
override fun getTopDownAnalysisParameters() = topDownAnalysisParameters
override fun getTopDownAnalysisMode() = topDownAnalysisMode
}
}
idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinResolveCache.kt
+1 -1
View File
@@ -233,7 +233,7 @@ private object KotlinResolveDataProvider {
).getLazyTopDownAnalyzerForTopLevel()!!
lazyTopDownAnalyzer.analyzeDeclarations(
TopDownAnalysisParameters.create(false),
TopDownAnalysisMode.TopLevelDeclarations,
listOf(analyzableElement)
)
return AnalysisResult.success(