From 0ee0f0189cc102dbb7321e46809d3a4eb6eac6c4 Mon Sep 17 00:00:00 2001
From: Nicolay Mitropolsky <nicolay.mitropolsky@jetbrains.com>
Date: Mon, 22 Jan 2018 20:21:57 +0300
Subject: [PATCH] Uast-java: `getArgumentForParameter` reorganized

---
 .../jetbrains/uast/java/expressions/javaUCallExpressions.kt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/uast/uast-java/src/org/jetbrains/uast/java/expressions/javaUCallExpressions.kt b/uast/uast-java/src/org/jetbrains/uast/java/expressions/javaUCallExpressions.kt
index fa7becae7d1c..fa5da4999cc8 100644
--- a/uast/uast-java/src/org/jetbrains/uast/java/expressions/javaUCallExpressions.kt
+++ b/uast/uast-java/src/org/jetbrains/uast/java/expressions/javaUCallExpressions.kt
@@ -44,12 +44,12 @@ class JavaUCallExpression(
   override fun getArgumentForParameter(i: Int): UExpression? {
     val psiMethod = resolve() ?: return null
     val isVarArgs = psiMethod.parameterList.parameters.getOrNull(i)?.isVarArgs ?: return null
-    return when {
-      isVarArgs -> JavaUExpressionList(null, UastSpecialExpressionKind.VARARGS, this).apply {
+    if (isVarArgs) {
+      return JavaUExpressionList(null, UastSpecialExpressionKind.VARARGS, this).apply {
         expressions = valueArguments.drop(i)
       }
-      else -> valueArguments.getOrNull(i)
     }
+    return valueArguments.getOrNull(i)
   }
 
   override val typeArgumentCount by lz { psi.typeArguments.size }