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

Minor. Remove name from Qualifier.

Browse Source
This commit is contained in:
Stanislav Erokhin
2016-02-22 18:05:03 +03:00
parent 5240233eda
commit 2f0ae6f176
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/receivers/Qualifier.kt
+3 -7
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2010-2015 JetBrains s.r.o. * Copyright 2010-2016 JetBrains s.r.o.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@
package org.jetbrains.kotlin.resolve.scopes.receivers package org.jetbrains.kotlin.resolve.scopes.receivers
import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.descriptors.*
import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.psi.KtExpression import org.jetbrains.kotlin.psi.KtExpression
import org.jetbrains.kotlin.psi.KtSimpleNameExpression import org.jetbrains.kotlin.psi.KtSimpleNameExpression
import org.jetbrains.kotlin.psi.psiUtil.getTopmostParentQualifiedExpressionForSelector import org.jetbrains.kotlin.psi.psiUtil.getTopmostParentQualifiedExpressionForSelector
@@ -36,9 +35,6 @@ interface Qualifier: Receiver {
val referenceExpression: KtSimpleNameExpression val referenceExpression: KtSimpleNameExpression
val name: Name
get() = descriptor.name
val descriptor: DeclarationDescriptor val descriptor: DeclarationDescriptor
val scope: MemberScope val scope: MemberScope
@@ -110,7 +106,7 @@ class ClassQualifier(
scopes.add(classifier.unsubstitutedInnerClassesScope) scopes.add(classifier.unsubstitutedInnerClassesScope)
} }
return ChainedMemberScope("Member scope for $name as class or object", scopes) return ChainedMemberScope("Member scope for ${classifier.name} as class or object", scopes)
} }
override fun getNestedClassesAndPackageMembersScope(): MemberScope { override fun getNestedClassesAndPackageMembersScope(): MemberScope {
@@ -126,7 +122,7 @@ class ClassQualifier(
scopes.add(ScopeUtils.getStaticNestedClassesScope(classifier)) scopes.add(ScopeUtils.getStaticNestedClassesScope(classifier))
} }
return ChainedMemberScope("Static scope for $name as class or object", scopes) return ChainedMemberScope("Static scope for ${classifier.name} as class or object", scopes)
} }
override fun toString() = "Class{$classifier}" override fun toString() = "Class{$classifier}"