Created common supertype for HierarchicalScope and MemberScope-- ResolutionScope

compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/Scopes.kt

@@ -24,24 +24,9 @@ import org.jetbrains.kotlin.utils.Printer
 
 // see utils/ScopeUtils.kt
 
-interface HierarchicalScope {
+interface HierarchicalScope : ResolutionScope {
     val parent: HierarchicalScope?
 
-    /**
-     * All visible descriptors from current scope possibly filtered by the given name and kind filters
-     * (that means that the implementation is not obliged to use the filters but may do so when it gives any performance advantage).
-     */
-    fun getContributedDescriptors(
-            kindFilter: DescriptorKindFilter = DescriptorKindFilter.ALL,
-            nameFilter: (Name) -> Boolean = MemberScope.ALL_NAME_FILTER
-    ): Collection<DeclarationDescriptor>
-
-    fun getContributedClassifier(name: Name, location: LookupLocation): ClassifierDescriptor?
-
-    fun getContributedVariables(name: Name, location: LookupLocation): Collection<VariableDescriptor>
-
-    fun getContributedFunctions(name: Name, location: LookupLocation): Collection<FunctionDescriptor>
-
     fun printStructure(p: Printer)
 }
 

core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/MemberScope.kt

@@ -23,27 +23,14 @@ import org.jetbrains.kotlin.utils.Printer
 import org.jetbrains.kotlin.utils.toReadOnlyList
 import java.lang.reflect.Modifier
 
-public interface MemberScope {
-
-    public fun getContributedClassifier(name: Name, location: LookupLocation): ClassifierDescriptor?
-
-    @Deprecated("Should be removed soon")
-    public fun getPackage(name: Name): PackageViewDescriptor?
-
-    public fun getContributedVariables(name: Name, location: LookupLocation): Collection<PropertyDescriptor>
-
-    public fun getContributedFunctions(name: Name, location: LookupLocation): Collection<FunctionDescriptor>
+public interface MemberScope : ResolutionScope {
 
     val ownerDescriptor: DeclarationDescriptor
 
-    /**
-     * All visible descriptors from current scope possibly filtered by the given name and kind filters
-     * (that means that the implementation is not obliged to use the filters but may do so when it gives any performance advantage).
-     */
-    public fun getContributedDescriptors(
-            kindFilter: DescriptorKindFilter = DescriptorKindFilter.ALL,
-            nameFilter: (Name) -> Boolean = ALL_NAME_FILTER
-    ): Collection<DeclarationDescriptor>
+    public override fun getContributedVariables(name: Name, location: LookupLocation): Collection<PropertyDescriptor>
+
+    @Deprecated("Should be removed soon")
+    public fun getPackage(name: Name): PackageViewDescriptor?
 
     /**
      * Is supposed to be used in tests and debug only

core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/ResolutionScope.kt

@@ -0,0 +1,39 @@
+/*
+ * Copyright 2010-2015 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.kotlin.resolve.scopes
+
+import org.jetbrains.kotlin.descriptors.*
+import org.jetbrains.kotlin.incremental.components.LookupLocation
+import org.jetbrains.kotlin.name.Name
+
+public interface ResolutionScope {
+
+    public fun getContributedClassifier(name: Name, location: LookupLocation): ClassifierDescriptor?
+
+    public fun getContributedVariables(name: Name, location: LookupLocation): Collection<VariableDescriptor>
+
+    public fun getContributedFunctions(name: Name, location: LookupLocation): Collection<FunctionDescriptor>
+
+    /**
+     * All visible descriptors from current scope possibly filtered by the given name and kind filters
+     * (that means that the implementation is not obliged to use the filters but may do so when it gives any performance advantage).
+     */
+    public fun getContributedDescriptors(
+            kindFilter: DescriptorKindFilter = DescriptorKindFilter.ALL,
+            nameFilter: (Name) -> Boolean = MemberScope.ALL_NAME_FILTER
+    ): Collection<DeclarationDescriptor>
+}