From f5fb3246ae37c4775a874a7c8abc79ef18b8d18b Mon Sep 17 00:00:00 2001
From: Svetlana Isakova <svetlana.isakova@jetbrains.com>
Date: Wed, 28 Jan 2015 17:23:24 +0300
Subject: [PATCH] Rename: deparenthesizeArgument ->
 getLastElementDeparenthesized

---
 .../kotlin/resolve/calls/ArgumentTypeResolver.java        | 8 ++++----
 .../org/jetbrains/kotlin/resolve/calls/CallCompleter.kt   | 2 +-
 .../jetbrains/kotlin/resolve/calls/CandidateResolver.java | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/ArgumentTypeResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/ArgumentTypeResolver.java
index 568ba6217a2..4e6d4e03e5d 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/ArgumentTypeResolver.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/ArgumentTypeResolver.java
@@ -148,7 +148,7 @@ public class ArgumentTypeResolver {
     private static JetFunctionLiteralExpression getFunctionLiteralArgumentIfAny(
             @NotNull JetExpression expression, @NotNull ResolutionContext context
     ) {
-        JetExpression deparenthesizedExpression = deparenthesizeArgument(expression, context);
+        JetExpression deparenthesizedExpression = getLastElementDeparenthesized(expression, context);
         if (deparenthesizedExpression instanceof JetFunctionLiteralExpression) {
             return (JetFunctionLiteralExpression) deparenthesizedExpression;
         }
@@ -156,7 +156,7 @@ public class ArgumentTypeResolver {
     }
 
     @Nullable
-    public static JetExpression deparenthesizeArgument(
+    public static JetExpression getLastElementDeparenthesized(
             @Nullable JetExpression expression,
             @NotNull ResolutionContext context
     ) {
@@ -169,7 +169,7 @@ public class ArgumentTypeResolver {
             // (no arguments and no receiver) and therefore analyze them straight away (not in the 'complete' phase).
             JetElement lastStatementInABlock = ResolvePackage.getLastStatementInABlock(context.partialBodyResolveProvider, blockExpression);
             if (lastStatementInABlock instanceof JetExpression) {
-                return deparenthesizeArgument((JetExpression) lastStatementInABlock, context);
+                return getLastElementDeparenthesized((JetExpression) lastStatementInABlock, context);
             }
         }
         return deparenthesizedExpression;
@@ -291,7 +291,7 @@ public class ArgumentTypeResolver {
         BindingContextUtils.updateRecordedType(numberType, expression, context.trace, false);
 
         if (!(expression instanceof JetConstantExpression)) {
-            JetExpression deparenthesized = deparenthesizeArgument(expression, context);
+            JetExpression deparenthesized = getLastElementDeparenthesized(expression, context);
             if (deparenthesized != expression) {
                 updateNumberType(numberType, deparenthesized, context);
             }
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallCompleter.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallCompleter.kt
index e6e74116fe1..5f80bfef583 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallCompleter.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallCompleter.kt
@@ -226,7 +226,7 @@ public class CallCompleter(
         if (valueArgument.isExternal()) return
 
         val expression = valueArgument.getArgumentExpression()
-        val deparenthesized = ArgumentTypeResolver.deparenthesizeArgument(expression, context as ResolutionContext<*>)
+        val deparenthesized = ArgumentTypeResolver.getLastElementDeparenthesized(expression, context as ResolutionContext<*>)
         if (deparenthesized == null) return
 
         val recordedType = context.trace[BindingContext.EXPRESSION_TYPE, expression]
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CandidateResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CandidateResolver.java
index 83654be44ac..d23c15b9213 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CandidateResolver.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CandidateResolver.java
@@ -51,7 +51,7 @@ import java.util.*;
 
 import static org.jetbrains.kotlin.diagnostics.Errors.PROJECTION_ON_NON_CLASS_TYPE_ARGUMENT;
 import static org.jetbrains.kotlin.diagnostics.Errors.SUPER_CANT_BE_EXTENSION_RECEIVER;
-import static org.jetbrains.kotlin.resolve.calls.ArgumentTypeResolver.deparenthesizeArgument;
+import static org.jetbrains.kotlin.resolve.calls.ArgumentTypeResolver.getLastElementDeparenthesized;
 import static org.jetbrains.kotlin.resolve.calls.CallResolverUtil.ResolveArgumentsMode.RESOLVE_FUNCTION_ARGUMENTS;
 import static org.jetbrains.kotlin.resolve.calls.CallResolverUtil.ResolveArgumentsMode.SHAPE_FUNCTION_ARGUMENTS;
 import static org.jetbrains.kotlin.resolve.calls.CallTransformer.CallForImplicitInvoke;
@@ -436,7 +436,7 @@ public class CandidateResolver {
             @Nullable JetExpression argumentExpression,
             @NotNull ResolutionContext context
     ) {
-        JetExpression deparenthesizedArgument = deparenthesizeArgument(argumentExpression, context);
+        JetExpression deparenthesizedArgument = getLastElementDeparenthesized(argumentExpression, context);
         if (deparenthesizedArgument == null || type == null) return type;
 
         DataFlowValue dataFlowValue = DataFlowValueFactory.createDataFlowValue(deparenthesizedArgument, type, context.trace.getBindingContext());