From 3e722887ab601e0933c8532d377037c46ed46c39 Mon Sep 17 00:00:00 2001
From: Dmitry Gridin <dmitry.gridin@jetbrains.com>
Date: Wed, 22 Jan 2020 18:35:42 +0700
Subject: [PATCH] RedundantSemicolonInspection: move `isLineBreak` to utils

---
 .../idea/inspections/RedundantSemicolonInspection.kt |  3 +--
 .../org/jetbrains/kotlin/idea/util/expressionExt.kt  | 12 ++++++------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/RedundantSemicolonInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/RedundantSemicolonInspection.kt
index 6c7f92fc0ba..ae4dd5d3a65 100644
--- a/idea/src/org/jetbrains/kotlin/idea/inspections/RedundantSemicolonInspection.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/inspections/RedundantSemicolonInspection.kt
@@ -13,6 +13,7 @@ import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiElementVisitor
 import com.intellij.psi.PsiWhiteSpace
 import org.jetbrains.kotlin.KtNodeTypes
+import org.jetbrains.kotlin.idea.util.isLineBreak
 import org.jetbrains.kotlin.kdoc.psi.api.KDoc
 import org.jetbrains.kotlin.lexer.KtModifierKeywordToken
 import org.jetbrains.kotlin.lexer.KtTokens
@@ -108,8 +109,6 @@ class RedundantSemicolonInspection : AbstractKotlinInspection(), CleanupLocalIns
             return true
         }
 
-        private fun PsiElement?.isLineBreak() = this is PsiWhiteSpace && textContains('\n')
-
         private object Fix : LocalQuickFix {
             override fun getName() = "Remove redundant semicolon"
             override fun getFamilyName() = name
diff --git a/idea/src/org/jetbrains/kotlin/idea/util/expressionExt.kt b/idea/src/org/jetbrains/kotlin/idea/util/expressionExt.kt
index 97ab8b1b593..9a79561c4aa 100644
--- a/idea/src/org/jetbrains/kotlin/idea/util/expressionExt.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/util/expressionExt.kt
@@ -7,10 +7,8 @@ package org.jetbrains.kotlin.idea.util
 
 import com.intellij.lang.jvm.JvmModifier
 import com.intellij.openapi.util.TextRange
-import com.intellij.psi.PsiComment
-import com.intellij.psi.PsiElement
-import com.intellij.psi.PsiMember
-import com.intellij.psi.PsiMethod
+import com.intellij.openapi.util.text.StringUtil
+import com.intellij.psi.*
 import org.jetbrains.kotlin.idea.caches.resolve.analyze
 import org.jetbrains.kotlin.idea.intentions.callExpression
 import org.jetbrains.kotlin.idea.references.mainReference
@@ -25,7 +23,7 @@ fun KtCallExpression.replaceOrCreateTypeArgumentList(newTypeArgumentList: KtType
     if (typeArgumentList != null) typeArgumentList?.replace(newTypeArgumentList)
     else addAfter(
         newTypeArgumentList,
-        calleeExpression
+        calleeExpression,
     )
 }
 
@@ -59,4 +57,6 @@ fun KtDotQualifiedExpression.hasNotReceiver(): Boolean {
             element is KtCallableDeclaration && element.receiverTypeReference == null && (element.containingClassOrObject is KtObjectDeclaration?) ||
             element is PsiMember && element.hasModifier(JvmModifier.STATIC) ||
             element is PsiMethod && element.isConstructor
-}
\ No newline at end of file
+}
+
+fun PsiElement?.isLineBreak() = this is PsiWhiteSpace && StringUtil.containsLineBreak(text)
\ No newline at end of file