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

Add language to formatting blocks to fetch indent settings propertly

Browse Source
This commit is contained in:
Nikolay Krasko
2017-05-22 14:05:12 +03:00
parent 8f964978da
commit d717da5413
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/idea/KotlinLanguage.java
+1 -1
View File
@@ -20,7 +20,7 @@ import com.intellij.lang.Language;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
public class KotlinLanguage extends Language { public class KotlinLanguage extends Language {
public static final KotlinLanguage INSTANCE = new KotlinLanguage(); @NotNull public static final KotlinLanguage INSTANCE = new KotlinLanguage();
public static final String NAME = "Kotlin"; public static final String NAME = "Kotlin";
private KotlinLanguage() { private KotlinLanguage() {
idea/src/org/jetbrains/kotlin/idea/formatter/KotlinBlock.kt
+6 -3
View File
@@ -24,8 +24,9 @@ import com.intellij.psi.codeStyle.CodeStyleSettings
import com.intellij.psi.formatter.FormatterUtil import com.intellij.psi.formatter.FormatterUtil
import com.intellij.psi.formatter.common.AbstractBlock import com.intellij.psi.formatter.common.AbstractBlock
import com.intellij.psi.tree.IElementType import com.intellij.psi.tree.IElementType
import org.jetbrains.kotlin.KtNodeTypes.* import org.jetbrains.kotlin.KtNodeTypes.WHEN_ENTRY
import org.jetbrains.kotlin.lexer.KtTokens.* import org.jetbrains.kotlin.idea.KotlinLanguage
import org.jetbrains.kotlin.lexer.KtTokens.ARROW
/** /**
* @see Block for good JavaDoc documentation * @see Block for good JavaDoc documentation
@@ -36,7 +37,7 @@ class KotlinBlock(
private val myIndent: Indent?, private val myIndent: Indent?,
wrap: Wrap?, wrap: Wrap?,
mySettings: CodeStyleSettings, mySettings: CodeStyleSettings,
private val mySpacingBuilder: KotlinSpacingBuilder) : AbstractBlock(node, wrap, myAlignmentStrategy.getAlignment(node)) { private val mySpacingBuilder: KotlinSpacingBuilder) : AbstractBlock(node, wrap, myAlignmentStrategy.getAlignment(node)), BlockEx {
private val kotlinDelegationBlock = object : KotlinCommonBlock(node, mySettings, mySpacingBuilder, myAlignmentStrategy) { private val kotlinDelegationBlock = object : KotlinCommonBlock(node, mySettings, mySpacingBuilder, myAlignmentStrategy) {
override fun getNullAlignmentStrategy(): CommonAlignmentStrategy = NodeAlignmentStrategy.getNullStrategy() override fun getNullAlignmentStrategy(): CommonAlignmentStrategy = NodeAlignmentStrategy.getNullStrategy()
@@ -91,6 +92,8 @@ class KotlinBlock(
override fun getChildAttributes(newChildIndex: Int): ChildAttributes = kotlinDelegationBlock.getChildAttributes(newChildIndex) override fun getChildAttributes(newChildIndex: Int): ChildAttributes = kotlinDelegationBlock.getChildAttributes(newChildIndex)
override fun isLeaf(): Boolean = kotlinDelegationBlock.isLeaf() override fun isLeaf(): Boolean = kotlinDelegationBlock.isLeaf()
override fun getLanguage() = KotlinLanguage.INSTANCE
} }
object KotlinSpacingBuilderUtilImpl : KotlinSpacingBuilderUtil { object KotlinSpacingBuilderUtilImpl : KotlinSpacingBuilderUtil {