From 0213d37d8273747bba7098d8d1570f465c935b8b Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Tue, 7 Oct 2014 22:18:09 +0400 Subject: [PATCH] More correct line breaks counting in converter --- j2k/src/org/jetbrains/jet/j2k/CodeBuilder.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/j2k/src/org/jetbrains/jet/j2k/CodeBuilder.kt b/j2k/src/org/jetbrains/jet/j2k/CodeBuilder.kt index c96f372028e..d98af7f5a68 100644 --- a/j2k/src/org/jetbrains/jet/j2k/CodeBuilder.kt +++ b/j2k/src/org/jetbrains/jet/j2k/CodeBuilder.kt @@ -23,7 +23,7 @@ import java.util.ArrayList import org.jetbrains.jet.j2k.ast.Element import kotlin.platform.platformName import org.jetbrains.jet.j2k.ast.CommentsAndSpacesInheritance -import com.intellij.psi.impl.light.LightElement +import com.intellij.openapi.util.text.StringUtil fun CodeBuilder.append(generators: Collection<() -> T>, separator: String, prefix: String = "", suffix: String = ""): CodeBuilder { if (generators.isNotEmpty()) { @@ -263,8 +263,8 @@ class CodeBuilder(private val topElement: PsiElement?) { private fun PsiElement.isEmptyElement() = getFirstChild() == null && getTextLength() == 0 - private fun PsiWhiteSpace.newLinesCount() = getText()!!.count { it == '\n' } //TODO: this is not correct!! + private fun PsiWhiteSpace.newLinesCount() = StringUtil.getLineBreakCount(getText()!!) - private fun PsiWhiteSpace.hasNewLines() = getText()!!.any { it == '\n' || it == '\r' } + private fun PsiWhiteSpace.hasNewLines() = StringUtil.containsLineBreak(getText()!!) }