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

Cleanup: apply all inspection quickfixes

Browse Source
This commit is contained in:
Dmitry Jemerov
2018-01-02 18:43:35 +01:00
parent 6f722d647f
commit 69c8da7403
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/formatter/src/org/jetbrains/kotlin/idea/formatter/KotlinCommonBlock.kt
+14 -14
View File
@@ -33,7 +33,7 @@ private val QUALIFIED_OPERATION = TokenSet.create(DOT, SAFE_ACCESS)
private val QUALIFIED_EXPRESSIONS = TokenSet.create(KtNodeTypes.DOT_QUALIFIED_EXPRESSION, KtNodeTypes.SAFE_ACCESS_EXPRESSION) private val QUALIFIED_EXPRESSIONS = TokenSet.create(KtNodeTypes.DOT_QUALIFIED_EXPRESSION, KtNodeTypes.SAFE_ACCESS_EXPRESSION)
private val ELVIS_SET = TokenSet.create(KtTokens.ELVIS) private val ELVIS_SET = TokenSet.create(KtTokens.ELVIS)
private val KDOC_COMMENT_INDENT = 1 private const val KDOC_COMMENT_INDENT = 1
private val BINARY_EXPRESSIONS = TokenSet.create(KtNodeTypes.BINARY_EXPRESSION, KtNodeTypes.BINARY_WITH_TYPE, KtNodeTypes.IS_EXPRESSION) private val BINARY_EXPRESSIONS = TokenSet.create(KtNodeTypes.BINARY_EXPRESSION, KtNodeTypes.BINARY_WITH_TYPE, KtNodeTypes.IS_EXPRESSION)
private val KDOC_CONTENT = TokenSet.create(KDocTokens.KDOC, KDocElementTypes.KDOC_SECTION, KDocElementTypes.KDOC_TAG) private val KDOC_CONTENT = TokenSet.create(KDocTokens.KDOC, KDocElementTypes.KDOC_SECTION, KDocElementTypes.KDOC_TAG)
@@ -55,10 +55,10 @@ abstract class KotlinCommonBlock(
private val spacingBuilder: KotlinSpacingBuilder, private val spacingBuilder: KotlinSpacingBuilder,
private val alignmentStrategy: CommonAlignmentStrategy private val alignmentStrategy: CommonAlignmentStrategy
) { ) {
private @Volatile @Volatile
var mySubBlocks: List<ASTBlock>? = null private var mySubBlocks: List<ASTBlock>? = null
abstract protected fun createBlock( protected abstract fun createBlock(
node: ASTNode, node: ASTNode,
alignmentStrategy: CommonAlignmentStrategy, alignmentStrategy: CommonAlignmentStrategy,
indent: Indent?, indent: Indent?,
@@ -67,21 +67,21 @@ abstract class KotlinCommonBlock(
spacingBuilder: KotlinSpacingBuilder spacingBuilder: KotlinSpacingBuilder
): ASTBlock ): ASTBlock
abstract protected fun createSyntheticSpacingNodeBlock(node: ASTNode): ASTBlock protected abstract fun createSyntheticSpacingNodeBlock(node: ASTNode): ASTBlock
abstract protected fun getSubBlocks(): List<Block> protected abstract fun getSubBlocks(): List<Block>
abstract protected fun getSuperChildAttributes(newChildIndex: Int): ChildAttributes protected abstract fun getSuperChildAttributes(newChildIndex: Int): ChildAttributes
abstract protected fun isIncompleteInSuper(): Boolean protected abstract fun isIncompleteInSuper(): Boolean
abstract protected fun getAlignmentForCaseBranch(shouldAlignInColumns: Boolean): CommonAlignmentStrategy protected abstract fun getAlignmentForCaseBranch(shouldAlignInColumns: Boolean): CommonAlignmentStrategy
abstract protected fun getAlignment(): Alignment? protected abstract fun getAlignment(): Alignment?
abstract protected fun createAlignmentStrategy(alignOption: Boolean, defaultAlignment: Alignment?): CommonAlignmentStrategy protected abstract fun createAlignmentStrategy(alignOption: Boolean, defaultAlignment: Alignment?): CommonAlignmentStrategy
abstract protected fun getNullAlignmentStrategy(): CommonAlignmentStrategy protected abstract fun getNullAlignmentStrategy(): CommonAlignmentStrategy
fun isLeaf(): Boolean = node.firstChildNode == null fun isLeaf(): Boolean = node.firstChildNode == null
@@ -169,7 +169,7 @@ abstract class KotlinCommonBlock(
return nodeSubBlocks return nodeSubBlocks
} }
fun createChildIndent(child: ASTNode): Indent? { private fun createChildIndent(child: ASTNode): Indent? {
val childParent = child.treeParent val childParent = child.treeParent
val childType = child.elementType val childType = child.elementType
@@ -595,7 +595,7 @@ fun NodeIndentStrategy.PositionStrategy.continuationIf(
} }
} }
private val INDENT_RULES = arrayOf<NodeIndentStrategy>( private val INDENT_RULES = arrayOf(
strategy("No indent for braces in blocks") strategy("No indent for braces in blocks")
.within(KtNodeTypes.BLOCK, KtNodeTypes.CLASS_BODY, KtNodeTypes.FUNCTION_LITERAL) .within(KtNodeTypes.BLOCK, KtNodeTypes.CLASS_BODY, KtNodeTypes.FUNCTION_LITERAL)
.forType(RBRACE, LBRACE) .forType(RBRACE, LBRACE)