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

Debugger: Fix indentation in code fragments

Browse Source
This commit is contained in:
Yan Zhulanow
2019-03-06 22:26:31 +03:00
parent a1e5ce2c8b
commit 5d156c2edb
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/formatter/src/org/jetbrains/kotlin/idea/formatter/KotlinCommonBlock.kt
+17 -5
View File
@@ -221,10 +221,8 @@ abstract class KotlinCommonBlock(
val childParent = child.treeParent
val childType = child.elementType
if (childParent?.treeParent != null) {
if (childParent.elementType === KtNodeTypes.BLOCK && childParent.treeParent.elementType === KtNodeTypes.SCRIPT) {
return Indent.getNoneIndent()
}
if (childParent != null && isInCodeChunk(childParent)) {
return Indent.getNoneIndent()
}
// do not indent child after heading comments inside declaration
@@ -266,10 +264,24 @@ abstract class KotlinCommonBlock(
return Indent.getNoneIndent()
}
private fun isInCodeChunk(node: ASTNode): Boolean {
val parent = node.treeParent ?: return false
if (node.elementType != KtNodeTypes.BLOCK) {
return false
}
val parentType = parent.elementType
return parentType == KtNodeTypes.SCRIPT
|| parentType == KtNodeTypes.BLOCK_CODE_FRAGMENT
|| parentType == KtNodeTypes.EXPRESSION_CODE_FRAGMENT
|| parentType == KtNodeTypes.TYPE_CODE_FRAGMENT
}
fun getChildAttributes(newChildIndex: Int): ChildAttributes {
val type = node.elementType
if (node.elementType == KtNodeTypes.BLOCK && node.treeParent.elementType == KtNodeTypes.SCRIPT) {
if (isInCodeChunk(node)) {
return ChildAttributes(Indent.getNoneIndent(), null)
}