Optimize scopes handling inside LexicalChainedScope

2020-06-02 23:12:20 +02:00
parent bf97323301
commit 3da6ff7ec3
4 changed files with 31 additions and 12 deletions
@@ -156,12 +156,12 @@ private fun getClassInnerScope(outerScope: LexicalScope, descriptor: ClassDescri
        descriptor.constructors.forEach { addFunctionDescriptor(it) }
    }

-    val scopeChain = listOfNotNull(
+    return LexicalChainedScope.create(
+        headerScope, descriptor, false, null, LexicalScopeKind.SYNTHETIC,
        descriptor.defaultType.memberScope,
        descriptor.staticScope,
        descriptor.companionObjectDescriptor?.defaultType?.memberScope
    )
-    return LexicalChainedScope(headerScope, descriptor, false, null, LexicalScopeKind.SYNTHETIC, scopeChain)
 }

 fun getKDocLinkResolutionScope(resolutionFacade: ResolutionFacade, contextDescriptor: DeclarationDescriptor): LexicalScope {