From b9ed0706faa3e3adb1c64859d046d47a40b5afc8 Mon Sep 17 00:00:00 2001
From: Dmitry Gridin <dmitry.gridin@jetbrains.com>
Date: Wed, 15 Jan 2020 21:44:26 +0700
Subject: [PATCH] FormatterUtil: rename parameters in `needTrailingComma`
 functions

#KT-34744
---
 .../kotlin/idea/util/FormatterUtil.kt         | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/idea/formatter/src/org/jetbrains/kotlin/idea/util/FormatterUtil.kt b/idea/formatter/src/org/jetbrains/kotlin/idea/util/FormatterUtil.kt
index e4ff0b10416..e606cb1ab07 100644
--- a/idea/formatter/src/org/jetbrains/kotlin/idea/util/FormatterUtil.kt
+++ b/idea/formatter/src/org/jetbrains/kotlin/idea/util/FormatterUtil.kt
@@ -47,24 +47,25 @@ fun PsiElement.getLineCount(): Int {
 
 fun PsiElement.isMultiline() = getLineCount() > 1
 
-fun KtFunctionLiteral.needTrailingComma(settings: CodeStyleSettings, checkTrailingComma: Boolean = true): Boolean = needTrailingComma(
-    settings = settings,
-    trailingComma = { if (checkTrailingComma) valueParameterList?.trailingComma else null },
-    globalStartOffset = { valueParameterList?.startOffset },
-    globalEndOffset = { arrow?.endOffset }
-)
+fun KtFunctionLiteral.needTrailingComma(settings: CodeStyleSettings, checkExistingTrailingComma: Boolean = true): Boolean =
+    needTrailingComma(
+        settings = settings,
+        trailingComma = { if (checkExistingTrailingComma) valueParameterList?.trailingComma else null },
+        globalStartOffset = { valueParameterList?.startOffset },
+        globalEndOffset = { arrow?.endOffset }
+    )
 
-fun KtWhenEntry.needTrailingComma(settings: CodeStyleSettings, checkTrailingComma: Boolean = true): Boolean = needTrailingComma(
+fun KtWhenEntry.needTrailingComma(settings: CodeStyleSettings, checkExistingTrailingComma: Boolean = true): Boolean = needTrailingComma(
     settings = settings,
-    trailingComma = { if (checkTrailingComma) trailingComma else null },
+    trailingComma = { if (checkExistingTrailingComma) trailingComma else null },
     additionalCheck = { !isElse },
     globalEndOffset = { arrow?.endOffset }
 )
 
-fun KtDestructuringDeclaration.needTrailingComma(settings: CodeStyleSettings, checkTrailingComma: Boolean = true): Boolean =
+fun KtDestructuringDeclaration.needTrailingComma(settings: CodeStyleSettings, checkExistingTrailingComma: Boolean = true): Boolean =
     needTrailingComma(
         settings = settings,
-        trailingComma = { if (checkTrailingComma) trailingComma else null },
+        trailingComma = { if (checkExistingTrailingComma) trailingComma else null },
         globalStartOffset = { lPar?.startOffset },
         globalEndOffset = { rPar?.endOffset }
     )