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

Minor. Renamed NewQualifiedExpressionResolver to QualifiedExpressionResolver

Browse Source
This commit is contained in:
Stanislav Erokhin
2015-09-10 01:53:59 +03:00
parent b1b556c0c9
commit ea991de21a
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/LazyTopDownAnalyzer.kt
+2 -2
View File
@@ -47,7 +47,7 @@ public class LazyTopDownAnalyzer(
private val topLevelDescriptorProvider: TopLevelDescriptorProvider, private val topLevelDescriptorProvider: TopLevelDescriptorProvider,
private val fileScopeProvider: FileScopeProvider, private val fileScopeProvider: FileScopeProvider,
private val declarationScopeProvider: DeclarationScopeProvider, private val declarationScopeProvider: DeclarationScopeProvider,
private val newQualifiedExpressionResolver: NewQualifiedExpressionResolver private val qualifiedExpressionResolver: QualifiedExpressionResolver
) { ) {
public fun analyzeDeclarations(topDownAnalysisMode: TopDownAnalysisMode, declarations: Collection<PsiElement>, outerDataFlowInfo: DataFlowInfo): TopDownAnalysisContext { public fun analyzeDeclarations(topDownAnalysisMode: TopDownAnalysisMode, declarations: Collection<PsiElement>, outerDataFlowInfo: DataFlowInfo): TopDownAnalysisContext {
val c = TopDownAnalysisContext(topDownAnalysisMode, outerDataFlowInfo, declarationScopeProvider) val c = TopDownAnalysisContext(topDownAnalysisMode, outerDataFlowInfo, declarationScopeProvider)
@@ -93,7 +93,7 @@ public class LazyTopDownAnalyzer(
} }
override fun visitPackageDirective(directive: JetPackageDirective) { override fun visitPackageDirective(directive: JetPackageDirective) {
newQualifiedExpressionResolver.resolvePackageHeader(directive, moduleDescriptor, trace) qualifiedExpressionResolver.resolvePackageHeader(directive, moduleDescriptor, trace)
} }
override fun visitImportDirective(importDirective: JetImportDirective) { override fun visitImportDirective(importDirective: JetImportDirective) {
compiler/frontend/src/org/jetbrains/kotlin/resolve/NewQualifiedExpressionResolver.kt → compiler/frontend/src/org/jetbrains/kotlin/resolve/QualifiedExpressionResolver.kt
+1 -1
View File
@@ -33,7 +33,7 @@ import org.jetbrains.kotlin.resolve.scopes.utils.getClassifier
import org.jetbrains.kotlin.resolve.validation.SymbolUsageValidator import org.jetbrains.kotlin.resolve.validation.SymbolUsageValidator
import org.jetbrains.kotlin.utils.addIfNotNull import org.jetbrains.kotlin.utils.addIfNotNull
public class NewQualifiedExpressionResolver(val symbolUsageValidator: SymbolUsageValidator) { public class QualifiedExpressionResolver(val symbolUsageValidator: SymbolUsageValidator) {
public fun resolvePackageHeader( public fun resolvePackageHeader(
compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeResolver.kt
+1 -1
View File
@@ -44,7 +44,7 @@ import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull
public class TypeResolver( public class TypeResolver(
private val annotationResolver: AnnotationResolver, private val annotationResolver: AnnotationResolver,
private val qualifiedExpressionResolver: NewQualifiedExpressionResolver, private val qualifiedExpressionResolver: QualifiedExpressionResolver,
private val moduleDescriptor: ModuleDescriptor, private val moduleDescriptor: ModuleDescriptor,
private val flexibleTypeCapabilitiesProvider: FlexibleTypeCapabilitiesProvider, private val flexibleTypeCapabilitiesProvider: FlexibleTypeCapabilitiesProvider,
private val storageManager: StorageManager, private val storageManager: StorageManager,
compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/FileScopeProviderImpl.kt
+1 -1
View File
@@ -33,7 +33,7 @@ public class FileScopeProviderImpl(
private val topLevelDescriptorProvider: TopLevelDescriptorProvider, private val topLevelDescriptorProvider: TopLevelDescriptorProvider,
private val storageManager: StorageManager, private val storageManager: StorageManager,
private val moduleDescriptor: ModuleDescriptor, private val moduleDescriptor: ModuleDescriptor,
private val qualifiedExpressionResolver: NewQualifiedExpressionResolver, private val qualifiedExpressionResolver: QualifiedExpressionResolver,
private val bindingTrace: BindingTrace, private val bindingTrace: BindingTrace,
private val jetImportsFactory: JetImportsFactory, private val jetImportsFactory: JetImportsFactory,
private val additionalScopes: Iterable<FileScopeProvider.AdditionalScopes> private val additionalScopes: Iterable<FileScopeProvider.AdditionalScopes>
compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/LazyImportScope.kt
+2 -2
View File
@@ -28,7 +28,7 @@ import org.jetbrains.kotlin.resolve.PlatformTypesMappedToKotlinChecker
import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter
import org.jetbrains.kotlin.resolve.scopes.JetScope import org.jetbrains.kotlin.resolve.scopes.JetScope
import org.jetbrains.kotlin.incremental.components.LookupLocation import org.jetbrains.kotlin.incremental.components.LookupLocation
import org.jetbrains.kotlin.resolve.NewQualifiedExpressionResolver import org.jetbrains.kotlin.resolve.QualifiedExpressionResolver
import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue
import org.jetbrains.kotlin.storage.StorageManager import org.jetbrains.kotlin.storage.StorageManager
import org.jetbrains.kotlin.types.JetType import org.jetbrains.kotlin.types.JetType
@@ -66,7 +66,7 @@ class AliasImportsIndexed(allImports: Collection<JetImportDirective>) : IndexedI
class LazyImportResolver( class LazyImportResolver(
val storageManager: StorageManager, val storageManager: StorageManager,
val qualifiedExpressionResolver: NewQualifiedExpressionResolver, val qualifiedExpressionResolver: QualifiedExpressionResolver,
val fileScopeProvider: FileScopeProvider, val fileScopeProvider: FileScopeProvider,
val moduleDescriptor: ModuleDescriptor, val moduleDescriptor: ModuleDescriptor,
val indexedImports: IndexedImports, val indexedImports: IndexedImports,
idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/resolutionApi.kt
+1 -1
View File
@@ -79,7 +79,7 @@ public fun ResolutionFacade.resolveImportReference(
fqName: FqName fqName: FqName
): Collection<DeclarationDescriptor> { ): Collection<DeclarationDescriptor> {
val importDirective = JetPsiFactory(project).createImportDirective(ImportPath(fqName, false)) val importDirective = JetPsiFactory(project).createImportDirective(ImportPath(fqName, false))
val qualifiedExpressionResolver = this.getFrontendService(moduleDescriptor, javaClass<NewQualifiedExpressionResolver>()) val qualifiedExpressionResolver = this.getFrontendService(moduleDescriptor, QualifiedExpressionResolver::class.java)
return qualifiedExpressionResolver.processImportReference( return qualifiedExpressionResolver.processImportReference(
importDirective, moduleDescriptor, BindingTraceContext(), moduleDescriptor).getAllDescriptors() importDirective, moduleDescriptor, BindingTraceContext(), moduleDescriptor).getAllDescriptors()
} }