From 07a691f4b77d6023d8dd063e04ba7ad6492ea6f9 Mon Sep 17 00:00:00 2001
From: Stanislav Erokhin <Stanislav.Erokhin@jetbrains.com>
Date: Mon, 2 Mar 2015 15:15:34 +0300
Subject: [PATCH] Merge methods resolveFunctionDescriptor &&
 resolveFunctionDescriptorWithAnnotationArguments

---
 .../kotlin/resolve/DescriptorResolver.java         | 14 +-------------
 .../lazy/descriptors/AbstractLazyMemberScope.kt    |  2 +-
 .../types/expressions/FunctionsTypingVisitor.kt    |  2 +-
 3 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java
index ac0e834279e..288f8fc46b5 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java
@@ -229,7 +229,7 @@ public class DescriptorResolver {
     }
 
     @NotNull
-    public SimpleFunctionDescriptor resolveFunctionDescriptorWithAnnotationArguments(
+    public SimpleFunctionDescriptor resolveFunctionDescriptor(
             @NotNull DeclarationDescriptor containingDescriptor,
             @NotNull JetScope scope,
             @NotNull JetNamedFunction function,
@@ -252,18 +252,6 @@ public class DescriptorResolver {
                                          annotationResolver.resolveAnnotationsWithArguments(scope, function.getModifierList(), trace), true);
     }
 
-    @NotNull
-    public SimpleFunctionDescriptor resolveFunctionDescriptor(
-            @NotNull DeclarationDescriptor containingDescriptor,
-            @NotNull JetScope scope,
-            @NotNull JetNamedFunction function,
-            @NotNull BindingTrace trace,
-            @NotNull DataFlowInfo dataFlowInfo
-    ) {
-       return resolveFunctionDescriptor(containingDescriptor, scope, function, trace, dataFlowInfo,
-                                        annotationResolver.resolveAnnotationsWithoutArguments(scope, function.getModifierList(), trace), false);
-    }
-
     @NotNull
     private SimpleFunctionDescriptor resolveFunctionDescriptor(
             @NotNull DeclarationDescriptor containingDescriptor,
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/AbstractLazyMemberScope.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/AbstractLazyMemberScope.kt
index 40cf5f30146..2e2e3f3416d 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/AbstractLazyMemberScope.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/AbstractLazyMemberScope.kt
@@ -69,7 +69,7 @@ public abstract class AbstractLazyMemberScope<D : DeclarationDescriptor, DP : De
         val declarations = declarationProvider.getFunctionDeclarations(name)
         for (functionDeclaration in declarations) {
             val resolutionScope = getScopeForMemberDeclarationResolution(functionDeclaration)
-            result.add(c.descriptorResolver.resolveFunctionDescriptorWithAnnotationArguments(
+            result.add(c.descriptorResolver.resolveFunctionDescriptor(
                     thisDescriptor,
                     resolutionScope,
                     functionDeclaration,
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/FunctionsTypingVisitor.kt b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/FunctionsTypingVisitor.kt
index 1d10bffea6d..fa0758f3e61 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/FunctionsTypingVisitor.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/FunctionsTypingVisitor.kt
@@ -74,7 +74,7 @@ public class FunctionsTypingVisitor(facade: ExpressionTypingInternals) : Express
 
         val functionDescriptor: SimpleFunctionDescriptor
         if (isStatement) {
-            functionDescriptor = services.getDescriptorResolver().resolveFunctionDescriptorWithAnnotationArguments(
+            functionDescriptor = services.getDescriptorResolver().resolveFunctionDescriptor(
                     context.scope.getContainingDeclaration(), context.scope, function, context.trace, context.dataFlowInfo)
             assert(statementScope != null) {
                 "statementScope must be not null for function: " + function.getName() + " at location " + DiagnosticUtils.atLocation(function)