From 2f0ae6f17618a559799dd15466203ad433094c52 Mon Sep 17 00:00:00 2001 From: Stanislav Erokhin Date: Mon, 22 Feb 2016 18:05:03 +0300 Subject: [PATCH] Minor. Remove name from Qualifier. --- .../kotlin/resolve/scopes/receivers/Qualifier.kt | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/receivers/Qualifier.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/receivers/Qualifier.kt index 503beee03e8..bc3e791f713 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/receivers/Qualifier.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/receivers/Qualifier.kt @@ -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"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.resolve.scopes.receivers import org.jetbrains.kotlin.descriptors.* -import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.psi.KtExpression import org.jetbrains.kotlin.psi.KtSimpleNameExpression import org.jetbrains.kotlin.psi.psiUtil.getTopmostParentQualifiedExpressionForSelector @@ -36,9 +35,6 @@ interface Qualifier: Receiver { val referenceExpression: KtSimpleNameExpression - val name: Name - get() = descriptor.name - val descriptor: DeclarationDescriptor val scope: MemberScope @@ -110,7 +106,7 @@ class ClassQualifier( 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 { @@ -126,7 +122,7 @@ class ClassQualifier( 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}"