From 80ffc5cd410dc3aac3ccb9d953a5d690fa6dbd03 Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <nikolay.krasko@jetbrains.com>
Date: Tue, 5 Sep 2017 12:34:30 +0300
Subject: [PATCH] Make local file indent feature work for Kotlin files

Revert "Add language to formatting blocks to fetch indent settings propertly"
This reverts commit d717da5
---
 .../src/org/jetbrains/kotlin/idea/KotlinLanguage.java    | 2 +-
 .../org/jetbrains/kotlin/idea/formatter/KotlinBlock.kt   | 9 +++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/kotlin/idea/KotlinLanguage.java b/compiler/frontend/src/org/jetbrains/kotlin/idea/KotlinLanguage.java
index ae2088312cb..771eda4b1bd 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/idea/KotlinLanguage.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/idea/KotlinLanguage.java
@@ -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() {
diff --git a/idea/src/org/jetbrains/kotlin/idea/formatter/KotlinBlock.kt b/idea/src/org/jetbrains/kotlin/idea/formatter/KotlinBlock.kt
index 300a0f61c8a..063119979a5 100644
--- a/idea/src/org/jetbrains/kotlin/idea/formatter/KotlinBlock.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/formatter/KotlinBlock.kt
@@ -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 {