azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FormatterUtil: cleanup code

Browse Source
This commit is contained in:
Dmitry Gridin
2020-01-23 01:33:03 +07:00
parent 80194dd536
commit 5aa413014b
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/formatter/src/org/jetbrains/kotlin/idea/util/FormatterUtil.kt
+5 -5
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors. * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/ */
@@ -52,14 +52,14 @@ fun KtFunctionLiteral.needTrailingComma(settings: CodeStyleSettings, checkExisti
settings = settings, settings = settings,
trailingComma = { if (checkExistingTrailingComma) valueParameterList?.trailingComma else null }, trailingComma = { if (checkExistingTrailingComma) valueParameterList?.trailingComma else null },
globalStartOffset = { valueParameterList?.startOffset }, globalStartOffset = { valueParameterList?.startOffset },
globalEndOffset = { arrow?.endOffset } globalEndOffset = { arrow?.endOffset },
) )
fun KtWhenEntry.needTrailingComma(settings: CodeStyleSettings, checkExistingTrailingComma: Boolean = true): Boolean = needTrailingComma( fun KtWhenEntry.needTrailingComma(settings: CodeStyleSettings, checkExistingTrailingComma: Boolean = true): Boolean = needTrailingComma(
settings = settings, settings = settings,
trailingComma = { if (checkExistingTrailingComma) trailingComma else null }, trailingComma = { if (checkExistingTrailingComma) trailingComma else null },
additionalCheck = { !isElse }, additionalCheck = { !isElse },
globalEndOffset = { arrow?.endOffset } globalEndOffset = { arrow?.endOffset },
) )
fun KtDestructuringDeclaration.needTrailingComma(settings: CodeStyleSettings, checkExistingTrailingComma: Boolean = true): Boolean = fun KtDestructuringDeclaration.needTrailingComma(settings: CodeStyleSettings, checkExistingTrailingComma: Boolean = true): Boolean =
@@ -67,7 +67,7 @@ fun KtDestructuringDeclaration.needTrailingComma(settings: CodeStyleSettings, ch
settings = settings, settings = settings,
trailingComma = { if (checkExistingTrailingComma) trailingComma else null }, trailingComma = { if (checkExistingTrailingComma) trailingComma else null },
globalStartOffset = { lPar?.startOffset }, globalStartOffset = { lPar?.startOffset },
globalEndOffset = { rPar?.endOffset } globalEndOffset = { rPar?.endOffset },
) )
fun <T : PsiElement> T.needTrailingComma( fun <T : PsiElement> T.needTrailingComma(
@@ -75,7 +75,7 @@ fun <T : PsiElement> T.needTrailingComma(
trailingComma: T.() -> PsiElement?, trailingComma: T.() -> PsiElement?,
additionalCheck: () -> Boolean = { true }, additionalCheck: () -> Boolean = { true },
globalStartOffset: T.() -> Int? = PsiElement::startOffset, globalStartOffset: T.() -> Int? = PsiElement::startOffset,
globalEndOffset: T.() -> Int? = PsiElement::endOffset globalEndOffset: T.() -> Int? = PsiElement::endOffset,
): Boolean { ): Boolean {
if (trailingComma() == null && !settings.kotlinCustomSettings.ALLOW_TRAILING_COMMA || !additionalCheck()) return false if (trailingComma() == null && !settings.kotlinCustomSettings.ALLOW_TRAILING_COMMA || !additionalCheck()) return false
val startOffset = globalStartOffset() ?: return false val startOffset = globalStartOffset() ?: return false