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

Optimization

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-06-16 13:18:16 +03:00
parent 403549b924
commit 1e988028a9
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
j2k/src/org/jetbrains/kotlin/j2k/CodeBuilder.kt
+10 -6
View File
@@ -83,8 +83,10 @@ class CodeBuilder(private val topElement: PsiElement?) {
return this return this
} }
assert(text.indexOf('\r') < 0, "No '\\r' allowed")
if (endOfLineCommentAtEnd) { if (endOfLineCommentAtEnd) {
if (text[0] != '\n' && text[0] != '\r') builder.append('\n') if (text[0] != '\n') builder.append('\n')
endOfLineCommentAtEnd = false endOfLineCommentAtEnd = false
} }
@@ -343,14 +345,16 @@ class CodeBuilder(private val topElement: PsiElement?) {
fun PsiElement.isEmptyElement() = getFirstChild() == null && getTextLength() == 0 fun PsiElement.isEmptyElement() = getFirstChild() == null && getTextLength() == 0
fun PsiWhiteSpace.lineBreakCount() = StringUtil.getLineBreakCount(getText()!!) fun PsiWhiteSpace.lineBreakCount() = StringUtil.getLineBreakCount(getText())
fun PsiWhiteSpace.hasLineBreaks() = StringUtil.containsLineBreak(getText()!!) fun PsiWhiteSpace.hasLineBreaks() = StringUtil.containsLineBreak(getText())
fun CharSequence.trailingLineBreakCount(): Int { fun CharSequence.trailingLineBreakCount(): Int {
val index = ((length()-1 downTo 0).firstOrNull { val c = this[it]; c != '\n' && c != '\r' } ?: -1) + 1 var i = length() - 1
if (index == length()) return 0 while (i >= 0 && this[i] == '\n') {
return StringUtil.getLineBreakCount(subSequence(index, length())) i--
}
return length() - i - 1
} }
} }
} }