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

Make local file indent feature work for Kotlin files

Browse Source 
Revert "Add language to formatting blocks to fetch indent settings propertly"
This reverts commit d717da5
This commit is contained in:
Nikolay Krasko
2017-09-05 12:34:30 +03:00
parent e01371b231
commit 80ffc5cd41
2 changed files with 4 additions and 7 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;
public class KotlinLanguage extends Language {
@NotNull public static final KotlinLanguage INSTANCE = new KotlinLanguage();
public static final KotlinLanguage INSTANCE = new KotlinLanguage();
public static final String NAME = "Kotlin";
private KotlinLanguage() {
idea/src/org/jetbrains/kotlin/idea/formatter/KotlinBlock.kt
+3 -6
View File
@@ -24,9 +24,8 @@ import com.intellij.psi.codeStyle.CodeStyleSettings
import com.intellij.psi.formatter.FormatterUtil
import com.intellij.psi.formatter.common.AbstractBlock
import com.intellij.psi.tree.IElementType
import org.jetbrains.kotlin.KtNodeTypes.WHEN_ENTRY
import org.jetbrains.kotlin.idea.KotlinLanguage
import org.jetbrains.kotlin.lexer.KtTokens.ARROW
import org.jetbrains.kotlin.KtNodeTypes.*
import org.jetbrains.kotlin.lexer.KtTokens.*
/**
* @see Block for good JavaDoc documentation
@@ -37,7 +36,7 @@ class KotlinBlock(
private val myIndent: Indent?,
wrap: Wrap?,
mySettings: CodeStyleSettings,
private val mySpacingBuilder: KotlinSpacingBuilder) : AbstractBlock(node, wrap, myAlignmentStrategy.getAlignment(node)), BlockEx {
private val mySpacingBuilder: KotlinSpacingBuilder) : AbstractBlock(node, wrap, myAlignmentStrategy.getAlignment(node)) {
private val kotlinDelegationBlock = object : KotlinCommonBlock(node, mySettings, mySpacingBuilder, myAlignmentStrategy) {
override fun getNullAlignmentStrategy(): CommonAlignmentStrategy = NodeAlignmentStrategy.getNullStrategy()
@@ -92,8 +91,6 @@ class KotlinBlock(
override fun getChildAttributes(newChildIndex: Int): ChildAttributes = kotlinDelegationBlock.getChildAttributes(newChildIndex)
override fun isLeaf(): Boolean = kotlinDelegationBlock.isLeaf()
override fun getLanguage() = KotlinLanguage.INSTANCE
}
object KotlinSpacingBuilderUtilImpl : KotlinSpacingBuilderUtil {