Add location parameter to JetScope::getFunctions

compiler/frontend/src/org/jetbrains/kotlin/resolve/AllUnderImportsScope.kt

@@ -50,7 +50,7 @@ class AllUnderImportsScope : JetScope {
         return scopes.flatMap { it.getProperties(name) }
     }
 
-    override fun getFunctions(name: Name): Collection<FunctionDescriptor> {
+    override fun getFunctions(name: Name, location: Location): Collection<FunctionDescriptor> {
         return scopes.flatMap { it.getFunctions(name) }
     }
 

compiler/frontend/src/org/jetbrains/kotlin/resolve/OverrideResolver.java

@@ -734,7 +734,7 @@ public class OverrideResolver {
     ) {
         for (JetType supertype : declaringClass.getTypeConstructor().getSupertypes()) {
             Set<CallableMemberDescriptor> all = Sets.newLinkedHashSet();
-            all.addAll(supertype.getMemberScope().getFunctions(declared.getName()));
+            all.addAll(supertype.getMemberScope().getFunctions(declared.getName(), Location.NOWHERE));
             //noinspection unchecked
             all.addAll((Collection) supertype.getMemberScope().getProperties(declared.getName(), Location.NOWHERE));
             for (CallableMemberDescriptor fromSuper : all) {

compiler/frontend/src/org/jetbrains/kotlin/resolve/QualifiedExpressionResolver.java

@@ -234,7 +234,7 @@ public class QualifiedExpressionResolver {
         }
 
         if (lookupMode == LookupMode.EVERYTHING) {
-            descriptors.addAll(outerScope.getFunctions(referencedName));
+            descriptors.addAll(outerScope.getFunctions(referencedName, Location.NOWHERE));
             descriptors.addAll(outerScope.getProperties(referencedName, Location.NOWHERE));
 
             VariableDescriptor localVariable = outerScope.getLocalVariable(referencedName);

compiler/frontend/src/org/jetbrains/kotlin/resolve/SingleImportScope.kt

@@ -33,7 +33,7 @@ class SingleImportScope(private val aliasName: Name, private val descriptors: Co
     override fun getProperties(name: Name, location: Location)
             = if (name == aliasName) descriptors.filterIsInstance<VariableDescriptor>() else emptyList()
 
-    override fun getFunctions(name: Name)
+    override fun getFunctions(name: Name, location: Location)
             = if (name == aliasName) descriptors.filterIsInstance<FunctionDescriptor>() else emptyList()
 
     override fun getContainingDeclaration(): DeclarationDescriptor = throw UnsupportedOperationException()

compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/dynamicCalls.kt

@@ -49,7 +49,7 @@ object DynamicCallableDescriptors {
             p.println(javaClass.getSimpleName(), ": dynamic candidates for " + call)
         }
 
-        override fun getFunctions(name: Name): Collection<FunctionDescriptor> {
+        override fun getFunctions(name: Name, location: Location): Collection<FunctionDescriptor> {
             if (isAugmentedAssignmentConvention(name)) return listOf()
             if (call.getCallType() == Call.CallType.INVOKE
                 && call.getValueArgumentList() == null && call.getFunctionLiteralArguments().isEmpty()) {

compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/LazyDeclarationResolver.java

@@ -134,7 +134,7 @@ public class LazyDeclarationResolver {
             @Override
             public DeclarationDescriptor visitNamedFunction(@NotNull JetNamedFunction function, Void data) {
                 JetScope scopeForDeclaration = resolutionScopeToResolveDeclaration(function);
-                scopeForDeclaration.getFunctions(function.getNameAsSafeName());
+                scopeForDeclaration.getFunctions(function.getNameAsSafeName(), Location.NOWHERE);
                 return getBindingContext().get(BindingContext.DECLARATION_TO_DESCRIPTOR, function);
             }
 

compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/LazyImportScope.kt

@@ -253,7 +253,7 @@ class LazyImportScope(
 
     override fun getLocalVariable(name: Name) = null
 
-    override fun getFunctions(name: Name): Collection<FunctionDescriptor> {
+    override fun getFunctions(name: Name, location: Location): Collection<FunctionDescriptor> {
         if (filteringKind == FilteringKind.INVISIBLE_CLASSES) return listOf()
         return importResolver.collectFromImports(name, LookupMode.EVERYTHING) { scope, name -> scope.getFunctions(name) }
     }

compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/AbstractLazyMemberScope.kt

@@ -64,7 +64,7 @@ protected constructor(
 
     override fun getClassifier(name: Name): ClassDescriptor? = classDescriptors(name).firstOrNull()
 
-    override fun getFunctions(name: Name): Collection<FunctionDescriptor> = functionDescriptors(name)
+    override fun getFunctions(name: Name, location: Location): Collection<FunctionDescriptor> = functionDescriptors(name)
 
     private fun doGetFunctions(name: Name): Collection<FunctionDescriptor> {
         val result = Sets.newLinkedHashSet<FunctionDescriptor>()

compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassMemberScope.kt

@@ -115,7 +115,7 @@ public open class LazyClassMemberScope(
         OverrideResolver.resolveUnknownVisibilities(result, trace)
     }
 
-    override fun getFunctions(name: Name): Collection<FunctionDescriptor> {
+    override fun getFunctions(name: Name, location: Location): Collection<FunctionDescriptor> {
         // TODO: this should be handled by lazy function descriptors
         val functions = super.getFunctions(name)
         resolveUnknownVisibilitiesForMembers(functions)

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

@@ -156,7 +156,7 @@ public class WritableScopeImpl @jvmOverloads constructor(
         functionsByName!![name] = functionsByName!![name] + descriptorIndex
     }
 
-    override fun getFunctions(name: Name): Collection<FunctionDescriptor> {
+    override fun getFunctions(name: Name, location: Location): Collection<FunctionDescriptor> {
         checkMayRead()
 
         return concatInOrder(functionsByName(name), workerScope.getFunctions(name))
@@ -270,7 +270,7 @@ public class WritableScopeImpl @jvmOverloads constructor(
             return workerScope.getLocalVariable(name)
         }
 
-        override fun getFunctions(name: Name): Collection<FunctionDescriptor> {
+        override fun getFunctions(name: Name, location: Location): Collection<FunctionDescriptor> {
             checkMayRead()
 
             return concatInOrder(functionsByName(name, descriptorLimit), workerScope.getFunctions(name))