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

Renames

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-06-16 13:08:11 +03:00
parent 6679a6912e
commit 403549b924
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
j2k/src/org/jetbrains/kotlin/j2k/CodeBuilder.kt
+4 -4
View File
@@ -192,7 +192,7 @@ class CodeBuilder(private val topElement: PsiElement?) {
val firstSpace = before.lastOrNull() as? PsiWhiteSpace val firstSpace = before.lastOrNull() as? PsiWhiteSpace
var lineBreaks = 0 var lineBreaks = 0
if (firstSpace != null) { if (firstSpace != null) {
lineBreaks = firstSpace.newLinesCount() lineBreaks = firstSpace.lineBreakCount()
when (inheritance.spacesBefore) { when (inheritance.spacesBefore) {
SpacesInheritance.NONE -> lineBreaks = 0 SpacesInheritance.NONE -> lineBreaks = 0
@@ -268,7 +268,7 @@ class CodeBuilder(private val topElement: PsiElement?) {
val next = element.getNextSibling() val next = element.getNextSibling()
if (next != null) { if (next != null) {
if (next.isCommentOrSpace()) { if (next.isCommentOrSpace()) {
if (next is PsiWhiteSpace && next.hasNewLines()) return this // do not attach anything on next line after element if (next is PsiWhiteSpace && next.hasLineBreaks()) return this // do not attach anything on next line after element
if (next !in commentsAndSpacesUsed) { if (next !in commentsAndSpacesUsed) {
add(next) add(next)
collectCommentsAndSpacesAfter(next) collectCommentsAndSpacesAfter(next)
@@ -343,9 +343,9 @@ class CodeBuilder(private val topElement: PsiElement?) {
fun PsiElement.isEmptyElement() = getFirstChild() == null && getTextLength() == 0 fun PsiElement.isEmptyElement() = getFirstChild() == null && getTextLength() == 0
fun PsiWhiteSpace.newLinesCount() = StringUtil.getLineBreakCount(getText()!!) fun PsiWhiteSpace.lineBreakCount() = StringUtil.getLineBreakCount(getText()!!)
fun PsiWhiteSpace.hasNewLines() = 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 val index = ((length()-1 downTo 0).firstOrNull { val c = this[it]; c != '\n' && c != '\r' } ?: -1) + 1