Rename LexicalScope.Empty -> Base
"Empty" is slightly confusing because although the scope has no declared symbols, it is not empty: it has a parent scope which can contain symbols and can have parents as well
This commit is contained in:
@@ -161,10 +161,10 @@ private fun getClassInnerScope(outerScope: LexicalScope, descriptor: ClassDescri
|
||||
fun getKDocLinkResolutionScope(resolutionFacade: ResolutionFacade, descriptor: DeclarationDescriptor): LexicalScope {
|
||||
return when (descriptor) {
|
||||
is PackageFragmentDescriptor ->
|
||||
LexicalScope.Empty(getPackageInnerScope(descriptor).memberScopeAsImportingScope(), descriptor)
|
||||
LexicalScope.Base(getPackageInnerScope(descriptor).memberScopeAsImportingScope(), descriptor)
|
||||
|
||||
is PackageViewDescriptor ->
|
||||
LexicalScope.Empty(descriptor.memberScope.memberScopeAsImportingScope(), descriptor)
|
||||
LexicalScope.Base(descriptor.memberScope.memberScopeAsImportingScope(), descriptor)
|
||||
|
||||
is ClassDescriptor ->
|
||||
getClassInnerScope(getOuterScope(descriptor, resolutionFacade), descriptor)
|
||||
|
||||
+1
-1
@@ -134,7 +134,7 @@ class KDocNameCompletionSession(
|
||||
return (
|
||||
if (collectFormParentScopes)
|
||||
scope.collectDescriptorsFiltered(nameFilter = nameFilter).asSequence()
|
||||
else if (scope is LexicalScope.Empty)
|
||||
else if (scope is LexicalScope.Base)
|
||||
scope.parent.getContributedDescriptors(nameFilter = nameFilter).asSequence()
|
||||
else
|
||||
(scope.getContributedDescriptors(nameFilter = nameFilter).asSequence()
|
||||
|
||||
+4
-2
@@ -162,8 +162,10 @@ object ReplaceWithAnnotationAnalyzer {
|
||||
getResolutionScope(moduleDescriptor.getPackage(descriptor.fqName), ownerDescriptor, additionalScopes)
|
||||
}
|
||||
|
||||
is PackageViewDescriptor ->
|
||||
LexicalScope.Empty(chainImportingScopes(listOf(descriptor.memberScope.memberScopeAsImportingScope()) + additionalScopes)!!, ownerDescriptor)
|
||||
is PackageViewDescriptor -> LexicalScope.Base(
|
||||
chainImportingScopes(listOf(descriptor.memberScope.memberScopeAsImportingScope()) + additionalScopes)!!,
|
||||
ownerDescriptor
|
||||
)
|
||||
|
||||
is ClassDescriptor -> {
|
||||
val outerScope = getResolutionScope(descriptor.containingDeclaration, ownerDescriptor, additionalScopes) ?: return null
|
||||
|
||||
@@ -194,7 +194,7 @@ fun DeclarationDescriptor.getContainingScope(): LexicalScope? {
|
||||
val containingDescriptor = containingDeclaration ?: return null
|
||||
return when (containingDescriptor) {
|
||||
is ClassDescriptorWithResolutionScopes -> containingDescriptor.scopeForInitializerResolution
|
||||
is PackageFragmentDescriptor -> LexicalScope.Empty(containingDescriptor.getMemberScope().memberScopeAsImportingScope(), this)
|
||||
is PackageFragmentDescriptor -> LexicalScope.Base(containingDescriptor.getMemberScope().memberScopeAsImportingScope(), this)
|
||||
else -> null
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user