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

Better folding for mulitline strings (KT-21441)

Browse Source 
#KT-21441 Fixed
This commit is contained in:
Nikolay Krasko
2017-12-11 14:05:42 +03:00
parent ab7ba3ae46
commit 1ada284a03
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/KotlinFoldingBuilder.kt
+10 -6
View File
@@ -100,16 +100,20 @@ class KotlinFoldingBuilder : CustomFoldingBuilder(), DumbAware {
override fun getLanguagePlaceholderText(node: ASTNode, range: TextRange): String = when {
node.elementType == KtTokens.BLOCK_COMMENT -> "/${getFirstLineOfComment(node)}.../"
node.elementType == KDocTokens.KDOC -> "/**${getFirstLineOfComment(node)}...*/"
node.elementType == KtNodeTypes.STRING_TEMPLATE -> "\"\"\"${getFirstLineOfString(node)}...\"\"\""
node.elementType == KtNodeTypes.STRING_TEMPLATE -> "\"\"\"${getTrimmedFirstLineOfString(node).addSpaceIfNeeded()}...\"\"\""
node.psi is KtImportList -> "..."
else -> "{...}"
}
private fun getFirstLineOfString(node: ASTNode): String {
val targetStringLine = node.text.split("\n").asSequence().map {
it.replace("\"\"\"", "")
}.firstOrNull(String::isNotBlank) ?: return ""
return " ${targetStringLine.replace("\"\"\"", "").trim()} "
private fun getTrimmedFirstLineOfString(node: ASTNode): String {
val lines = node.text.split("\n")
val firstLine = lines.asSequence().map { it.replace("\"\"\"", "").trim() }.firstOrNull(String::isNotEmpty)
return firstLine ?: ""
}
private fun String.addSpaceIfNeeded(): String {
if (isEmpty() || endsWith(" ")) return this
return this + " "
}
private fun getFirstLineOfComment(node: ASTNode): String {
idea/testData/folding/checkCollapse/multilineStrings.kt
Vendored
+2 -2
View File
@@ -1,4 +1,4 @@
val result1 = <fold text='""" 14.55576559546314 - 0.25, 3.0, 0.25, 0.25, 1.0, 0.25, 1.0, 2.0, 1.0, 0.25, 1.0, 0.5, 2.0, 3.0, 3.0 ..."""' expand='true'>"""
val result1 = <fold text='"""14.55576559546314 - 0.25, 3.0, 0.25, 0.25, 1.0, 0.25, 1.0, 2.0, 1.0, 0.25, 1.0, 0.5, 2.0, 3.0, 3.0 ..."""' expand='true'>"""
14.55576559546314 - 0.25, 3.0, 0.25, 0.25, 1.0, 0.25, 1.0, 2.0, 1.0, 0.25, 1.0, 0.5, 2.0, 3.0, 3.0
14.55576559546314 - 0.25, 4.0, 1.0, 0.5, 1.0, 1.0, 3.0, 4.0, 3.0, 0.25, 3.0, 0.5, 3.0, 3.0, 2.0
14.55576559546314 - 0.25, 3.0, 0.25, 0.25, 1.0, 0.25, 2.0, 2.0, 1.0, 0.5, 1.0, 0.5, 2.0, 3.0, 3.0
@@ -22,7 +22,7 @@ val result1 = <fold text='""" 14.55576559546314 - 0.25, 3.0, 0.25, 0.25, 1.0,
14.55576559546314 - 0.25, 3.0, 0.25, 0.25, 1.0, 0.25, 1.0, 2.0, 3.0, 0.3333333333333333, 1.0, 0.5, 3.0, 3.0, 2.5
"""</fold>
val result2 = <fold text='""" other multiline string ..."""' expand='true'>"""other multiline string
val result2 = <fold text='"""other multiline string ..."""' expand='true'>"""other multiline string
without spaces
"""</fold>