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

QualifierExpressionResolver: cleanup code

Browse Source
This commit is contained in:
Dmitry Gridin
2019-08-27 13:29:06 +07:00
parent 4224d109e2
commit 68d20dae66
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/QualifiedExpressionResolver.kt
+6 -6
View File
@@ -431,7 +431,7 @@ class QualifiedExpressionResolver {
position: QualifierPosition position: QualifierPosition
): DeclarationDescriptor? { ): DeclarationDescriptor? {
val (packageOrClassDescriptor, endIndex) = val (packageOrClassDescriptor, endIndex) =
resolveToPackageOrClassPrefix(path, moduleDescriptor, trace, shouldBeVisibleFrom, scopeForFirstPart, position) resolveToPackageOrClassPrefix(path, moduleDescriptor, trace, shouldBeVisibleFrom, scopeForFirstPart, position)
if (endIndex != path.size) { if (endIndex != path.size) {
return null return null
@@ -471,13 +471,13 @@ class QualifiedExpressionResolver {
} }
val (prefixDescriptor, nextIndexAfterPrefix) = val (prefixDescriptor, nextIndexAfterPrefix) =
if (classifierDescriptor != null) if (classifierDescriptor != null)
Pair(classifierDescriptor, 1) Pair(classifierDescriptor, 1)
else else
moduleDescriptor.quickResolveToPackage(path, trace, position) moduleDescriptor.quickResolveToPackage(path, trace, position)
var currentDescriptor: DeclarationDescriptor? = prefixDescriptor var currentDescriptor: DeclarationDescriptor? = prefixDescriptor
for (qualifierPartIndex in nextIndexAfterPrefix..path.size - 1) { for (qualifierPartIndex in nextIndexAfterPrefix until path.size) {
val qualifierPart = path[qualifierPartIndex] val qualifierPart = path[qualifierPartIndex]
val nextPackageOrClassDescriptor = val nextPackageOrClassDescriptor =