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

[formatter] fix performance issue

Browse Source 
^KT-41314 Fixed
This commit is contained in:
Dmitry Gridin
2020-08-27 16:31:37 +07:00
parent 9818321b46
commit 0c0b394cc2
3 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/formatter/src/org/jetbrains/kotlin/idea/formatter/KotlinCommonBlock.kt
+2 -2
View File
@@ -22,7 +22,7 @@ import org.jetbrains.kotlin.idea.core.formatter.KotlinCodeStyleSettings
import org.jetbrains.kotlin.idea.formatter.NodeIndentStrategy.Companion.strategy
import org.jetbrains.kotlin.idea.formatter.trailingComma.TrailingCommaHelper.trailingCommaExistsOrCanExist
import org.jetbrains.kotlin.idea.formatter.trailingComma.addTrailingCommaIsAllowedFor
import org.jetbrains.kotlin.idea.util.containsLineBreakInThis
import org.jetbrains.kotlin.idea.util.containsLineBreakInChild
import org.jetbrains.kotlin.idea.util.isMultiline
import org.jetbrains.kotlin.idea.util.requireNode
import org.jetbrains.kotlin.kdoc.lexer.KDocTokens
@@ -757,7 +757,7 @@ abstract class KotlinCommonBlock(
?: psi.startOffset
val endOffset = childElement.notDelimiterSiblingNodeInSequence(true, delimiterType, typeOfLastElement)?.psi?.endOffset
?: psi.endOffset
return psi.parent.containsLineBreakInThis(startOffset, endOffset)
return psi.parent.containsLineBreakInChild(startOffset, endOffset)
}
private fun trailingCommaWrappingStrategyWithMultiLineCheck(
idea/formatter/src/org/jetbrains/kotlin/idea/formatter/trailingComma/TrailingCommaState.kt
+2 -2
View File
@@ -6,7 +6,7 @@
package org.jetbrains.kotlin.idea.formatter.trailingComma
import com.intellij.psi.PsiElement
import org.jetbrains.kotlin.idea.util.containsLineBreakInThis
import org.jetbrains.kotlin.idea.util.containsLineBreakInChild
import org.jetbrains.kotlin.idea.util.isMultiline
import org.jetbrains.kotlin.psi.KtDestructuringDeclaration
import org.jetbrains.kotlin.psi.KtElement
@@ -86,5 +86,5 @@ private fun <T : PsiElement> T.isMultiline(
): Boolean {
val startOffset = startOffsetGetter() ?: startOffset
val endOffset = endOffsetGetter() ?: endOffset
return containsLineBreakInThis(startOffset, endOffset)
return containsLineBreakInChild(startOffset, endOffset)
}
idea/formatter/src/org/jetbrains/kotlin/idea/util/FormatterUtil.kt
+17 -17
View File
@@ -15,9 +15,7 @@ import com.intellij.psi.PsiWhiteSpace
import com.intellij.psi.util.PsiUtil
import org.jetbrains.kotlin.idea.core.formatter.KotlinCodeStyleSettings
import org.jetbrains.kotlin.lexer.KtTokens
import org.jetbrains.kotlin.psi.psiUtil.nextLeaf
import org.jetbrains.kotlin.psi.psiUtil.prevLeaf
import org.jetbrains.kotlin.psi.psiUtil.startOffset
import org.jetbrains.kotlin.psi.psiUtil.*
/*
* ASTBlock.node is nullable, this extension was introduced to minimize changes
@@ -31,19 +29,19 @@ val isDefaultOfficialCodeStyle by lazy { !KotlinCodeStyleSettings.defaultSetting
// Copied from idea-core
fun PsiElement.getLineCount(): Int {
val doc = containingFile?.let { PsiDocumentManager.getInstance(project).getDocument(it) }
if (doc != null) {
val spaceRange = textRange ?: TextRange.EMPTY_RANGE
val spaceRange = textRange ?: TextRange.EMPTY_RANGE
return getLineCountByDocument(spaceRange.startOffset, spaceRange.endOffset)
?: StringUtil.getLineBreakCount(text ?: error("Cannot count number of lines")) + 1
}
if (spaceRange.endOffset <= doc.textLength && spaceRange.startOffset < spaceRange.endOffset) {
val startLine = doc.getLineNumber(spaceRange.startOffset)
val endLine = doc.getLineNumber(spaceRange.endOffset)
fun PsiElement.getLineCountByDocument(startOffset: Int, endOffset: Int): Int? {
val doc = containingFile?.let { PsiDocumentManager.getInstance(project).getDocument(it) } ?: return null
if (endOffset > doc.textLength || startOffset >= endOffset) return null
return endLine - startLine + 1
}
}
val startLine = doc.getLineNumber(startOffset)
val endLine = doc.getLineNumber(endOffset)
return StringUtil.getLineBreakCount(text ?: error("Cannot count number of lines")) + 1
return endLine - startLine + 1
}
fun PsiElement.isMultiline() = getLineCount() > 1
@@ -62,7 +60,9 @@ fun PsiElement.leaf(forward: Boolean = true, filter: (PsiElement) -> Boolean): P
val PsiElement.isComma: Boolean get() = PsiUtil.getElementType(this) == KtTokens.COMMA
fun PsiElement.containsLineBreakInThis(globalStartOffset: Int, globalEndOffset: Int): Boolean {
val textRange = TextRange.create(globalStartOffset, globalEndOffset).shiftLeft(startOffset)
return StringUtil.containsLineBreak(textRange.subSequence(text))
}
fun PsiElement.containsLineBreakInChild(globalStartOffset: Int, globalEndOffset: Int): Boolean =
getLineCountByDocument(globalStartOffset, globalEndOffset)?.let { it > 1 }
?: firstChild.siblings(forward = true, withItself = true)
.dropWhile { it.startOffset < globalStartOffset }
.takeWhile { it.endOffset <= globalEndOffset }
.any { it.textContains('\n') || it.textContains('\r') }