init line-indent-provider module

Part of #KT-22211

idea/build.gradle.kts

@@ -83,6 +83,7 @@ dependencies {
     compile(project(":idea:ide-common"))
     compile(project(":idea:idea-jps-common"))
     compile(project(":idea:kotlin-gradle-tooling"))
+    compile(project(":idea:line-indent-provider"))
     compile(project(":plugins:uast-kotlin"))
     compile(project(":plugins:uast-kotlin-idea"))
     compile(project(":kotlin-script-util")) { isTransitive = false }

idea/line-indent-provider/build.gradle.kts

@@ -0,0 +1,16 @@
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
+
+dependencies {
+    compile(project(":compiler:psi"))
+    compileOnly(intellijCoreDep()) { includeJars("intellij-core", rootProject = rootProject) }
+    compileOnly(intellijDep()) { includeJars("platform-api", "platform-impl", rootProject = rootProject) }
+}
+
+sourceSets {
+    "main" { projectDefault() }
+    "test" {}
+}
+

idea/line-indent-provider/src/org/jetbrains/kotlin/idea/formatter/lineIndent/KotlinIndentationAdjuster.kt

@@ -0,0 +1,8 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.idea.formatter.lineIndent
+
+interface KotlinIndentationAdjuster

idea/line-indent-provider/src/org/jetbrains/kotlin/idea/formatter/lineIndent/KotlinLikeLangLineIndentProvider.kt

@@ -0,0 +1,31 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.idea.formatter.lineIndent
+
+import com.intellij.lang.Language
+import com.intellij.openapi.editor.Editor
+import com.intellij.openapi.project.Project
+import com.intellij.psi.impl.source.codeStyle.SemanticEditorPosition
+import com.intellij.psi.impl.source.codeStyle.lineIndent.IndentCalculator
+import com.intellij.psi.impl.source.codeStyle.lineIndent.JavaLikeLangLineIndentProvider
+import com.intellij.psi.tree.IElementType
+import org.jetbrains.kotlin.idea.KotlinLanguage
+
+abstract class KotlinLikeLangLineIndentProvider : JavaLikeLangLineIndentProvider() {
+    abstract fun indentionSettings(project: Project): KotlinIndentationAdjuster
+
+    override fun mapType(tokenType: IElementType): SemanticEditorPosition.SyntaxElement? = SYNTAX_MAP[tokenType]
+
+    override fun isSuitableForLanguage(language: Language): Boolean = language.isKindOf(KotlinLanguage.INSTANCE)
+
+    override fun getIndent(project: Project, editor: Editor, language: Language?, offset: Int): IndentCalculator? = null
+
+    companion object {
+        private val SYNTAX_MAP = linkedMapOf<IElementType, SemanticEditorPosition.SyntaxElement>(
+
+        )
+    }
+}

idea/line-indent-provider/src/org/jetbrains/kotlin/idea/util/util.kt

@@ -0,0 +1,7 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.idea.util
+

idea/src/org/jetbrains/kotlin/idea/formatter/KotlinLineIndentProvider.kt

@@ -8,21 +8,21 @@ package org.jetbrains.kotlin.idea.formatter
 import com.intellij.lang.Language
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.project.Project
-import com.intellij.psi.codeStyle.lineIndent.LineIndentProvider
-import com.intellij.psi.impl.source.codeStyle.lineIndent.FormatterBasedLineIndentProvider
 import org.jetbrains.annotations.TestOnly
-import org.jetbrains.kotlin.idea.KotlinLanguage
+import org.jetbrains.kotlin.idea.formatter.lineIndent.KotlinIndentationAdjuster
+import org.jetbrains.kotlin.idea.formatter.lineIndent.KotlinLikeLangLineIndentProvider
 
-class KotlinLineIndentProvider : LineIndentProvider {
+class KotlinLineIndentProvider : KotlinLikeLangLineIndentProvider() {
-    private val formatterBasedProvider = FormatterBasedLineIndentProvider()
+    override fun getLineIndent(project: Project, editor: Editor, language: Language?, offset: Int): String? =
+        if (useFormatter)
+            null
+        else
+            super.getLineIndent(project, editor, language, offset)
+
+    override fun indentionSettings(project: Project): KotlinIndentationAdjuster = object : KotlinIndentationAdjuster {
 
-    override fun getLineIndent(project: Project, editor: Editor, language: Language?, offset: Int): String? {
-        val lineIndent = formatterBasedProvider.getLineIndent(project, editor, language, offset)
-        return if (useFormatter) lineIndent else lineIndent
     }
 
-    override fun isSuitableFor(language: Language?): Boolean = language?.isKindOf(KotlinLanguage.INSTANCE) == true
-
     companion object {
         @get:TestOnly
         @set:TestOnly

idea/testData/indentationOnNewline/AfterCatch.after.kt

@@ -4,4 +4,6 @@ fun some(): Int {
     catch () {
     }
     <caret>
-}
+}
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/AfterCatch.kt

@@ -3,4 +3,6 @@ fun some(): Int {
     }
     catch () {
     }<caret>
-}
+}
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/AfterClassNameBeforeFun.after.kt

@@ -1,4 +1,6 @@
 class A()
 <caret>
 
-fun
+fun
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/AfterClassNameBeforeFun.kt

@@ -1,3 +1,5 @@
 class A()<caret>
 
-fun
+fun
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/AfterFinally.after.kt

@@ -5,4 +5,6 @@ fun some(): Int {
     }
     finally {}
     <caret>
-}
+}
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/AfterFinally.kt

@@ -4,4 +4,6 @@ fun some(): Int {
     catch () {
     }
     finally {}<caret>
-}
+}
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/AfterImport.after.kt

@@ -1,2 +1,4 @@
 import java.util.ArrayList
-<caret>
+<caret>
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/AfterImport.kt

@@ -1 +1,3 @@
-import java.util.ArrayList<caret>
+import java.util.ArrayList<caret>
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/AfterTry.after.kt

@@ -2,4 +2,6 @@ fun some(): Int {
     try {
     }
     <caret>
-}
+}
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/AfterTry.kt

@@ -1,4 +1,6 @@
 fun some(): Int {
     try {
     }<caret>
-}
+}
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/Annotation.after.kt

@@ -1,2 +1,4 @@
 @Aaaa
 <caret>
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/Annotation.kt

@@ -1 +1,3 @@
 @Aaaa<caret>
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/AnnotationInDeclaration.after.kt

@@ -3,4 +3,6 @@ class Foo {
         @JvmStatic
         <caret>
     }
-}
+}
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/AnnotationInDeclaration.kt

@@ -2,4 +2,6 @@ class Foo {
     companion object {
         @JvmStatic<caret>
     }
-}
+}
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/ArgumentListNormalIndent.after.inv.kt

@@ -5,3 +5,4 @@ fun test(i: Int) {
 }
 
 // SET_FALSE: CONTINUATION_INDENT_IN_ARGUMENT_LISTS
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/ArgumentListNormalIndent.after.kt

@@ -5,3 +5,4 @@ fun test(i: Int) {
 }
 
 // SET_FALSE: CONTINUATION_INDENT_IN_ARGUMENT_LISTS
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/ArgumentListNormalIndent.kt

@@ -3,3 +3,4 @@ fun test(i: Int) {
 }
 
 // SET_FALSE: CONTINUATION_INDENT_IN_ARGUMENT_LISTS
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/AssignmentAfterEq.after.inv.kt

@@ -4,4 +4,5 @@ fun test() {
         <caret>
 }
 
-// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
+// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/AssignmentAfterEq.after.kt

@@ -4,4 +4,5 @@ fun test() {
         <caret>
 }
 
-// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
+// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/AssignmentAfterEq.kt

@@ -3,4 +3,5 @@ fun test() {
     a = <caret>
 }
 
-// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
+// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/BinaryWithTypeExpressions.after.inv.kt

@@ -4,4 +4,5 @@ fun test() {
             <caret>
 }
 
-// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
+// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/BinaryWithTypeExpressions.after.kt

@@ -4,4 +4,5 @@ fun test() {
             <caret>
 }
 
-// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
+// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/BinaryWithTypeExpressions.kt

@@ -3,4 +3,5 @@ fun test() {
     a as <caret>
 }
 
-// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
+// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/ConsecutiveCallsAfterDot.after.kt

@@ -1,4 +1,6 @@
 fun test() {
     some.test().
             <caret>
-}
+}
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/ConsecutiveCallsAfterDot.kt

@@ -1,3 +1,5 @@
 fun test() {
     some.test().<caret>
-}
+}
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/ConsecutiveCallsInSaeCallsMiddle.after.kt

@@ -6,3 +6,5 @@ public fun bar(): String? = Some()?.some()
         <caret>
         ?.some()
         ?.some()
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/ConsecutiveCallsInSaeCallsMiddle.kt

@@ -5,3 +5,5 @@ class Some {
 public fun bar(): String? = Some()?.some()<caret>
         ?.some()
         ?.some()
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/ConsecutiveCallsInSafeCallsEnd.after.kt

@@ -1,4 +1,6 @@
 fun test() {
     some.test()?.
             <caret>
-}
+}
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/ConsecutiveCallsInSafeCallsEnd.kt

@@ -1,3 +1,5 @@
 fun test() {
     some.test()?.<caret>
-}
+}
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/DoInFun.after.kt

@@ -1,4 +1,6 @@
 fun some() {
     do
         <caret>
-}
+}
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/DoInFun.kt

@@ -1,3 +1,5 @@
 fun some() {
     do<caret>
-}
+}
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/EmptyParameters.after.kt

@@ -1,4 +1,6 @@
 fun testParam(
     <caret>
 ) {
-}
+}
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/EmptyParameters.kt

@@ -1,2 +1,4 @@
 fun testParam(<caret>) {
-}
+}
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/For.after.kt

@@ -1,3 +1,5 @@
 fun some() {
     for (var i in 1..10)
-        <caret>
+        <caret>
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/For.kt

@@ -1,2 +1,4 @@
 fun some() {
-    for (var i in 1..10)<caret>
+    for (var i in 1..10)<caret>
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/FunctionBlock.after.kt

@@ -6,4 +6,6 @@ fun main(args: Array<String>) {
     times(3) {
         <caret>
     }
-}
+}
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/FunctionBlock.kt

@@ -4,4 +4,6 @@ private fun <T> times(times : Int, body : () -> T) {}
 
 fun main(args: Array<String>) {
     times(3) {<caret>}
-}
+}
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/FunctionWithInference.after.kt

@@ -1,2 +1,4 @@
 fun test() =
-    <caret>
+    <caret>
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/FunctionWithInference.kt

@@ -1 +1,3 @@
-fun test() =<caret>
+fun test() =<caret>
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/If.after.kt

@@ -1,4 +1,6 @@
 fun some() {
     if (3 > 5)
         <caret>
-}
+}
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/If.kt

@@ -1,3 +1,5 @@
 fun some() {
     if (3 > 5)<caret>
-}
+}
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/InBinaryExpressionInMiddle.after.inv.kt

@@ -3,4 +3,5 @@ fun some() {
             <caret>4
 }
 
-// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
+// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/InBinaryExpressionInMiddle.after.kt

@@ -3,4 +3,5 @@ fun some() {
                <caret>4
 }
 
-// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
+// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/InBinaryExpressionInMiddle.kt

@@ -2,4 +2,5 @@ fun some() {
     val test = 3 + <caret>4
 }
 
-// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
+// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/InBinaryExpressionUnfinished.after.inv.kt

@@ -3,4 +3,5 @@ fun some() {
             <caret>
 }
 
-// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
+// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/InBinaryExpressionUnfinished.after.kt

@@ -3,4 +3,5 @@ fun some() {
                <caret>
 }
 
-// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
+// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/InBinaryExpressionUnfinished.kt

@@ -2,4 +2,5 @@ fun some() {
     val test = 3 + <caret>
 }
 
-// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
+// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/InBinaryExpressionUnfinishedInIf.after.inv.kt

@@ -3,4 +3,5 @@ fun test() {
             <caret>)
 }
 
-// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
+// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/InBinaryExpressionUnfinishedInIf.after.kt

@@ -3,4 +3,5 @@ fun test() {
             <caret>)
 }
 
-// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
+// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/InBinaryExpressionUnfinishedInIf.kt

@@ -2,4 +2,5 @@ fun test() {
     if (true &&<caret>)
 }
 
-// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
+// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/InBinaryExpressionsBeforeCloseParenthesis.after.inv.kt

@@ -1,4 +1,5 @@
 val somelong = 3 + 4 - (3 +
         <caret>)
 
-// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
+// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/InBinaryExpressionsBeforeCloseParenthesis.after.kt

@@ -1,4 +1,5 @@
 val somelong = 3 + 4 - (3 +
                        <caret>)
 
-// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
+// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/InBinaryExpressionsBeforeCloseParenthesis.kt

@@ -1,3 +1,4 @@
 val somelong = 3 + 4 - (3 + <caret>)
 
-// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
+// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/InDelegationListAfterColon.after.inv.kt

@@ -1,4 +1,5 @@
 // SET_TRUE: ALIGN_MULTILINE_EXTENDS_LIST
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
 
 class Simpleclass() :
         <caret>

idea/testData/indentationOnNewline/InDelegationListAfterColon.after.kt

@@ -1,4 +1,5 @@
 // SET_TRUE: ALIGN_MULTILINE_EXTENDS_LIST
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
 
 class Simpleclass() :
         <caret>

idea/testData/indentationOnNewline/InDelegationListAfterColon.kt

@@ -1,4 +1,5 @@
 // SET_TRUE: ALIGN_MULTILINE_EXTENDS_LIST
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
 
 class Simpleclass() : <caret>
 

idea/testData/indentationOnNewline/InDelegationListAfterComma.after.inv.kt

@@ -6,3 +6,5 @@ class A {
     class Simpleclass() : A1,
             <caret>
 }
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/InDelegationListAfterComma.after.kt

@@ -6,3 +6,5 @@ class A {
     class Simpleclass() : A1,
                           <caret>
 }
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/InDelegationListAfterComma.kt

@@ -5,3 +5,5 @@ interface A1
 class A {
     class Simpleclass() : A1, <caret>
 }
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/InDelegationListNotEmpty.after.inv.kt

@@ -6,3 +6,5 @@ open class B1
 
 class Simpleclass() : B1(),
     <caret>A1
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/InDelegationListNotEmpty.after.kt

@@ -6,3 +6,5 @@ open class B1
 
 class Simpleclass() : B1(),
                       <caret>A1
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/InDelegationListNotEmpty.kt

@@ -5,3 +5,5 @@ interface A1
 open class B1
 
 class Simpleclass() : B1(), <caret>A1
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/InEnumAfterSemicolon.after.inv.kt

@@ -4,3 +4,5 @@ enum class EnumTest {
     ENTRY();
     <caret>
 }
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/InEnumAfterSemicolon.after.kt

@@ -4,3 +4,5 @@ enum class EnumTest {
     ENTRY();
     <caret>
 }
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/InEnumAfterSemicolon.kt

@@ -3,3 +3,5 @@
 enum class EnumTest {
     ENTRY(); <caret>
 }
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/InEnumInitializerListAfterComma.after.inv.kt

@@ -6,3 +6,5 @@ enum class EnumTest {
     ENTRY(),
     <caret>
 }
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/InEnumInitializerListAfterComma.after.kt

@@ -6,3 +6,5 @@ enum class EnumTest {
     ENTRY(),
     <caret>
 }
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/InEnumInitializerListAfterComma.kt

@@ -5,3 +5,5 @@ interface A1
 enum class EnumTest {
     ENTRY(), <caret>
 }
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/InEnumInitializerListNotEmpty.after.inv.kt

@@ -6,3 +6,5 @@ enum class EnumTest {
     ENTRY(),
     <caret>A1
 }
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/InEnumInitializerListNotEmpty.after.kt

@@ -6,3 +6,5 @@ enum class EnumTest {
     ENTRY(),
     <caret>A1
 }
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/InEnumInitializerListNotEmpty.kt

@@ -5,3 +5,5 @@ interface A1
 enum class EnumTest {
     ENTRY(), <caret>A1
 }
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/InExpressionsParentheses.after.inv.kt

@@ -2,4 +2,5 @@ val somelong = 3 + 4 - (
         <caret>
         )
 
-// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
+// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/InExpressionsParentheses.after.kt

@@ -2,4 +2,5 @@ val somelong = 3 + 4 - (
                        <caret>
                        )
 
-// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
+// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/InExpressionsParentheses.kt

@@ -1,3 +1,4 @@
 val somelong = 3 + 4 - (<caret>)
 
-// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
+// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/InExpressionsParenthesesBeforeOperand.after.inv.kt

@@ -1,4 +1,5 @@
 val somelong = 3 + (3 *
         <caret>3)
 
-// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
+// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/InExpressionsParenthesesBeforeOperand.after.kt

@@ -1,4 +1,5 @@
 val somelong = 3 + (3 *
                     <caret>3)
 
-// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
+// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/InExpressionsParenthesesBeforeOperand.kt

@@ -1,3 +1,4 @@
 val somelong = 3 + (3 * <caret>3)
 
-// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
+// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/InLabmdaAfterArrow.after.kt

@@ -1,3 +1,5 @@
 val a: (String) -> String = { some ->
     <caret>
-}
+}
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/InLabmdaAfterArrow.kt

@@ -1 +1,3 @@
-val a: (String) -> String = { some -><caret>}
+val a: (String) -> String = { some -><caret>}
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/InLambdaAfterArrowWithSpaces.after.kt

@@ -1,3 +1,5 @@
 val a: (String) -> String = { some ->
     <caret>
-}
+}
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/InLambdaAfterArrowWithSpaces.kt

@@ -1 +1,3 @@
-val a: (String) -> String = { some -> <caret> }
+val a: (String) -> String = { some -> <caret> }
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/InLambdaBeforeParams.after.kt

@@ -1,3 +1,5 @@
 val a: (String) -> String = {
         <caret>some ->
-}
+}
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/InLambdaBeforeParams.kt

@@ -1,2 +1,4 @@
 val a: (String) -> String = { <caret>some ->
-}
+}
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/InLambdaInsideChainCallSameLine.after.kt

@@ -8,3 +8,4 @@ fun test() {
     }
 }
 
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/InLambdaInsideChainCallSameLine.kt

@@ -6,3 +6,4 @@ fun test() {
     val abc = Test().foo()?.foo({ "str" }).foo {<caret>}
 }
 
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/InLambdaInsideChainCallSameLineWithSpaces.after.kt

@@ -6,4 +6,6 @@ fun test() {
     val abc = Test().foo()?.foo({ "str" }).foo {
         <caret>
     }
-}
+}
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/InLambdaInsideChainCallSameLineWithSpaces.kt

@@ -6,3 +6,4 @@ fun test() {
     val abc = Test().foo()?.foo({ "str" }).foo { <caret> }
 }
 
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/InLambdaInsideChainCallWithNewLine.after.kt

@@ -8,4 +8,6 @@ fun test() {
             .foo {
                 <caret>
             }
-}
+}
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/InLambdaInsideChainCallWithNewLine.kt

@@ -6,4 +6,6 @@ fun test() {
     val abc = Test()
             .foo { "Str" }
             .foo {<caret>}
-}
+}
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/InLambdaInsideChainCallWithNewLineWithSpaces.after.kt

@@ -8,4 +8,6 @@ fun test() {
             .foo {
                 <caret>
             }
-}
+}
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/InLambdaInsideChainCallWithNewLineWithSpaces.kt

@@ -6,4 +6,6 @@ fun test() {
     val abc = Test()
             .foo { "Str" }
             .foo { <caret> }
-}
+}
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/InMultilineLambdaAfterArrow.after.kt

@@ -1,4 +1,6 @@
 val a: (String) -> String = {
     some ->
     <caret>
-}
+}
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/InMultilineLambdaAfterArrow.kt

@@ -1,3 +1,5 @@
 val a: (String) -> String = {
     some -><caret>
-}
+}
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

idea/testData/indentationOnNewline/IsExpressionAfterIs.after.inv.kt

@@ -3,4 +3,5 @@ fun test() {
             <caret>
 }
 
-// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
+// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER