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

More correct line breaks counting in converter

Browse Source
This commit is contained in:
Valentin Kipyatkov
2014-10-07 22:18:09 +04:00
parent c8da4d90e9
commit 0213d37d82
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
j2k/src/org/jetbrains/jet/j2k/CodeBuilder.kt
+3 -3
View File
@@ -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<T> 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()!!)
}