diff --git a/idea/build.gradle.kts b/idea/build.gradle.kts
index 65be58e3329..2690c48804b 100644
--- a/idea/build.gradle.kts
+++ b/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 }
diff --git a/idea/line-indent-provider/build.gradle.kts b/idea/line-indent-provider/build.gradle.kts
new file mode 100644
index 00000000000..4137ce7eb6a
--- /dev/null
+++ b/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" {}
+}
+
diff --git a/idea/line-indent-provider/src/org/jetbrains/kotlin/idea/formatter/lineIndent/KotlinIndentationAdjuster.kt b/idea/line-indent-provider/src/org/jetbrains/kotlin/idea/formatter/lineIndent/KotlinIndentationAdjuster.kt
new file mode 100644
index 00000000000..21e6b195601
--- /dev/null
+++ b/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
\ No newline at end of file
diff --git a/idea/line-indent-provider/src/org/jetbrains/kotlin/idea/formatter/lineIndent/KotlinLikeLangLineIndentProvider.kt b/idea/line-indent-provider/src/org/jetbrains/kotlin/idea/formatter/lineIndent/KotlinLikeLangLineIndentProvider.kt
new file mode 100644
index 00000000000..d3fd5c5974e
--- /dev/null
+++ b/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>(
+
+        )
+    }
+}
\ No newline at end of file
diff --git a/idea/line-indent-provider/src/org/jetbrains/kotlin/idea/util/util.kt b/idea/line-indent-provider/src/org/jetbrains/kotlin/idea/util/util.kt
new file mode 100644
index 00000000000..bb864fd8738
--- /dev/null
+++ b/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
+
diff --git a/idea/src/org/jetbrains/kotlin/idea/formatter/KotlinLineIndentProvider.kt b/idea/src/org/jetbrains/kotlin/idea/formatter/KotlinLineIndentProvider.kt
index 8cad6b6cb56..8b7b85b8068 100644
--- a/idea/src/org/jetbrains/kotlin/idea/formatter/KotlinLineIndentProvider.kt
+++ b/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 {
-    private val formatterBasedProvider = FormatterBasedLineIndentProvider()
+class KotlinLineIndentProvider : KotlinLikeLangLineIndentProvider() {
+    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
diff --git a/idea/testData/indentationOnNewline/AfterCatch.after.kt b/idea/testData/indentationOnNewline/AfterCatch.after.kt
index f9a939d1d8d..5bd0fc4b2db 100644
--- a/idea/testData/indentationOnNewline/AfterCatch.after.kt
+++ b/idea/testData/indentationOnNewline/AfterCatch.after.kt
@@ -4,4 +4,6 @@ fun some(): Int {
     catch () {
     }
     <caret>
-}
\ No newline at end of file
+}
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/AfterCatch.kt b/idea/testData/indentationOnNewline/AfterCatch.kt
index 4bf03b726b9..019841db85e 100644
--- a/idea/testData/indentationOnNewline/AfterCatch.kt
+++ b/idea/testData/indentationOnNewline/AfterCatch.kt
@@ -3,4 +3,6 @@ fun some(): Int {
     }
     catch () {
     }<caret>
-}
\ No newline at end of file
+}
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/AfterClassNameBeforeFun.after.kt b/idea/testData/indentationOnNewline/AfterClassNameBeforeFun.after.kt
index 8677ec04fe9..421f931c598 100644
--- a/idea/testData/indentationOnNewline/AfterClassNameBeforeFun.after.kt
+++ b/idea/testData/indentationOnNewline/AfterClassNameBeforeFun.after.kt
@@ -1,4 +1,6 @@
 class A()
 <caret>
 
-fun
\ No newline at end of file
+fun
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/AfterClassNameBeforeFun.kt b/idea/testData/indentationOnNewline/AfterClassNameBeforeFun.kt
index ee996f5dd70..a6af3dfe5d8 100644
--- a/idea/testData/indentationOnNewline/AfterClassNameBeforeFun.kt
+++ b/idea/testData/indentationOnNewline/AfterClassNameBeforeFun.kt
@@ -1,3 +1,5 @@
 class A()<caret>
 
-fun
\ No newline at end of file
+fun
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/AfterFinally.after.kt b/idea/testData/indentationOnNewline/AfterFinally.after.kt
index 4724476b5df..d0d5fc7984c 100644
--- a/idea/testData/indentationOnNewline/AfterFinally.after.kt
+++ b/idea/testData/indentationOnNewline/AfterFinally.after.kt
@@ -5,4 +5,6 @@ fun some(): Int {
     }
     finally {}
     <caret>
-}
\ No newline at end of file
+}
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/AfterFinally.kt b/idea/testData/indentationOnNewline/AfterFinally.kt
index e3115b06359..1a14a23c6f6 100644
--- a/idea/testData/indentationOnNewline/AfterFinally.kt
+++ b/idea/testData/indentationOnNewline/AfterFinally.kt
@@ -4,4 +4,6 @@ fun some(): Int {
     catch () {
     }
     finally {}<caret>
-}
\ No newline at end of file
+}
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/AfterImport.after.kt b/idea/testData/indentationOnNewline/AfterImport.after.kt
index 66d6d13c67f..1fcbb08ef6c 100644
--- a/idea/testData/indentationOnNewline/AfterImport.after.kt
+++ b/idea/testData/indentationOnNewline/AfterImport.after.kt
@@ -1,2 +1,4 @@
 import java.util.ArrayList
-<caret>
\ No newline at end of file
+<caret>
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/AfterImport.kt b/idea/testData/indentationOnNewline/AfterImport.kt
index 47b0a0a6f15..7c4b802f499 100644
--- a/idea/testData/indentationOnNewline/AfterImport.kt
+++ b/idea/testData/indentationOnNewline/AfterImport.kt
@@ -1 +1,3 @@
-import java.util.ArrayList<caret>
\ No newline at end of file
+import java.util.ArrayList<caret>
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/AfterTry.after.kt b/idea/testData/indentationOnNewline/AfterTry.after.kt
index 5568e88c70c..70f18a2e879 100644
--- a/idea/testData/indentationOnNewline/AfterTry.after.kt
+++ b/idea/testData/indentationOnNewline/AfterTry.after.kt
@@ -2,4 +2,6 @@ fun some(): Int {
     try {
     }
     <caret>
-}
\ No newline at end of file
+}
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/AfterTry.kt b/idea/testData/indentationOnNewline/AfterTry.kt
index 84ac26984f1..08530e9588b 100644
--- a/idea/testData/indentationOnNewline/AfterTry.kt
+++ b/idea/testData/indentationOnNewline/AfterTry.kt
@@ -1,4 +1,6 @@
 fun some(): Int {
     try {
     }<caret>
-}
\ No newline at end of file
+}
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/Annotation.after.kt b/idea/testData/indentationOnNewline/Annotation.after.kt
index 0a4c6db1a13..227e765251a 100644
--- a/idea/testData/indentationOnNewline/Annotation.after.kt
+++ b/idea/testData/indentationOnNewline/Annotation.after.kt
@@ -1,2 +1,4 @@
 @Aaaa
 <caret>
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/Annotation.kt b/idea/testData/indentationOnNewline/Annotation.kt
index 555e66c3b8d..4d9ad43e547 100644
--- a/idea/testData/indentationOnNewline/Annotation.kt
+++ b/idea/testData/indentationOnNewline/Annotation.kt
@@ -1 +1,3 @@
 @Aaaa<caret>
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/AnnotationInDeclaration.after.kt b/idea/testData/indentationOnNewline/AnnotationInDeclaration.after.kt
index aa92c80a58e..72c09183003 100644
--- a/idea/testData/indentationOnNewline/AnnotationInDeclaration.after.kt
+++ b/idea/testData/indentationOnNewline/AnnotationInDeclaration.after.kt
@@ -3,4 +3,6 @@ class Foo {
         @JvmStatic
         <caret>
     }
-}
\ No newline at end of file
+}
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/AnnotationInDeclaration.kt b/idea/testData/indentationOnNewline/AnnotationInDeclaration.kt
index 5e9b1ae481f..a3c84a51b8e 100644
--- a/idea/testData/indentationOnNewline/AnnotationInDeclaration.kt
+++ b/idea/testData/indentationOnNewline/AnnotationInDeclaration.kt
@@ -2,4 +2,6 @@ class Foo {
     companion object {
         @JvmStatic<caret>
     }
-}
\ No newline at end of file
+}
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/ArgumentListNormalIndent.after.inv.kt b/idea/testData/indentationOnNewline/ArgumentListNormalIndent.after.inv.kt
index 1675648e32a..6499c399229 100644
--- a/idea/testData/indentationOnNewline/ArgumentListNormalIndent.after.inv.kt
+++ b/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
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/ArgumentListNormalIndent.after.kt b/idea/testData/indentationOnNewline/ArgumentListNormalIndent.after.kt
index da79d7642b7..0a28f8a3c75 100644
--- a/idea/testData/indentationOnNewline/ArgumentListNormalIndent.after.kt
+++ b/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
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/ArgumentListNormalIndent.kt b/idea/testData/indentationOnNewline/ArgumentListNormalIndent.kt
index f52759dab3b..b1229d9e6af 100644
--- a/idea/testData/indentationOnNewline/ArgumentListNormalIndent.kt
+++ b/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
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/AssignmentAfterEq.after.inv.kt b/idea/testData/indentationOnNewline/AssignmentAfterEq.after.inv.kt
index ccd54ec83d5..ec485523a8a 100644
--- a/idea/testData/indentationOnNewline/AssignmentAfterEq.after.inv.kt
+++ b/idea/testData/indentationOnNewline/AssignmentAfterEq.after.inv.kt
@@ -4,4 +4,5 @@ fun test() {
         <caret>
 }
 
-// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
\ No newline at end of file
+// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/AssignmentAfterEq.after.kt b/idea/testData/indentationOnNewline/AssignmentAfterEq.after.kt
index ccd54ec83d5..ec485523a8a 100644
--- a/idea/testData/indentationOnNewline/AssignmentAfterEq.after.kt
+++ b/idea/testData/indentationOnNewline/AssignmentAfterEq.after.kt
@@ -4,4 +4,5 @@ fun test() {
         <caret>
 }
 
-// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
\ No newline at end of file
+// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/AssignmentAfterEq.kt b/idea/testData/indentationOnNewline/AssignmentAfterEq.kt
index 3fab3cebaef..c15438e2db9 100644
--- a/idea/testData/indentationOnNewline/AssignmentAfterEq.kt
+++ b/idea/testData/indentationOnNewline/AssignmentAfterEq.kt
@@ -3,4 +3,5 @@ fun test() {
     a = <caret>
 }
 
-// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
\ No newline at end of file
+// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/BinaryWithTypeExpressions.after.inv.kt b/idea/testData/indentationOnNewline/BinaryWithTypeExpressions.after.inv.kt
index 689f0b38de0..a0da6ea54bc 100644
--- a/idea/testData/indentationOnNewline/BinaryWithTypeExpressions.after.inv.kt
+++ b/idea/testData/indentationOnNewline/BinaryWithTypeExpressions.after.inv.kt
@@ -4,4 +4,5 @@ fun test() {
             <caret>
 }
 
-// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
\ No newline at end of file
+// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/BinaryWithTypeExpressions.after.kt b/idea/testData/indentationOnNewline/BinaryWithTypeExpressions.after.kt
index 689f0b38de0..a0da6ea54bc 100644
--- a/idea/testData/indentationOnNewline/BinaryWithTypeExpressions.after.kt
+++ b/idea/testData/indentationOnNewline/BinaryWithTypeExpressions.after.kt
@@ -4,4 +4,5 @@ fun test() {
             <caret>
 }
 
-// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
\ No newline at end of file
+// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/BinaryWithTypeExpressions.kt b/idea/testData/indentationOnNewline/BinaryWithTypeExpressions.kt
index 905dc43362e..8f2a4d7f62b 100644
--- a/idea/testData/indentationOnNewline/BinaryWithTypeExpressions.kt
+++ b/idea/testData/indentationOnNewline/BinaryWithTypeExpressions.kt
@@ -3,4 +3,5 @@ fun test() {
     a as <caret>
 }
 
-// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
\ No newline at end of file
+// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/ConsecutiveCallsAfterDot.after.kt b/idea/testData/indentationOnNewline/ConsecutiveCallsAfterDot.after.kt
index a1c54856e01..1507f44efcf 100644
--- a/idea/testData/indentationOnNewline/ConsecutiveCallsAfterDot.after.kt
+++ b/idea/testData/indentationOnNewline/ConsecutiveCallsAfterDot.after.kt
@@ -1,4 +1,6 @@
 fun test() {
     some.test().
             <caret>
-}
\ No newline at end of file
+}
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/ConsecutiveCallsAfterDot.kt b/idea/testData/indentationOnNewline/ConsecutiveCallsAfterDot.kt
index 134d519f127..b934a7f1b27 100644
--- a/idea/testData/indentationOnNewline/ConsecutiveCallsAfterDot.kt
+++ b/idea/testData/indentationOnNewline/ConsecutiveCallsAfterDot.kt
@@ -1,3 +1,5 @@
 fun test() {
     some.test().<caret>
-}
\ No newline at end of file
+}
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/ConsecutiveCallsInSaeCallsMiddle.after.kt b/idea/testData/indentationOnNewline/ConsecutiveCallsInSaeCallsMiddle.after.kt
index fd6eefb12a0..28c70871210 100644
--- a/idea/testData/indentationOnNewline/ConsecutiveCallsInSaeCallsMiddle.after.kt
+++ b/idea/testData/indentationOnNewline/ConsecutiveCallsInSaeCallsMiddle.after.kt
@@ -6,3 +6,5 @@ public fun bar(): String? = Some()?.some()
         <caret>
         ?.some()
         ?.some()
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/ConsecutiveCallsInSaeCallsMiddle.kt b/idea/testData/indentationOnNewline/ConsecutiveCallsInSaeCallsMiddle.kt
index e051c403daa..c428bad9136 100644
--- a/idea/testData/indentationOnNewline/ConsecutiveCallsInSaeCallsMiddle.kt
+++ b/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
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/ConsecutiveCallsInSafeCallsEnd.after.kt b/idea/testData/indentationOnNewline/ConsecutiveCallsInSafeCallsEnd.after.kt
index 4b59b36de92..ee526f244bc 100644
--- a/idea/testData/indentationOnNewline/ConsecutiveCallsInSafeCallsEnd.after.kt
+++ b/idea/testData/indentationOnNewline/ConsecutiveCallsInSafeCallsEnd.after.kt
@@ -1,4 +1,6 @@
 fun test() {
     some.test()?.
             <caret>
-}
\ No newline at end of file
+}
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/ConsecutiveCallsInSafeCallsEnd.kt b/idea/testData/indentationOnNewline/ConsecutiveCallsInSafeCallsEnd.kt
index 1f9c55d7c53..05de49af17c 100644
--- a/idea/testData/indentationOnNewline/ConsecutiveCallsInSafeCallsEnd.kt
+++ b/idea/testData/indentationOnNewline/ConsecutiveCallsInSafeCallsEnd.kt
@@ -1,3 +1,5 @@
 fun test() {
     some.test()?.<caret>
-}
\ No newline at end of file
+}
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/DoInFun.after.kt b/idea/testData/indentationOnNewline/DoInFun.after.kt
index e168ec583e2..fdef730523b 100644
--- a/idea/testData/indentationOnNewline/DoInFun.after.kt
+++ b/idea/testData/indentationOnNewline/DoInFun.after.kt
@@ -1,4 +1,6 @@
 fun some() {
     do
         <caret>
-}
\ No newline at end of file
+}
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/DoInFun.kt b/idea/testData/indentationOnNewline/DoInFun.kt
index 4c17791e4e2..bed9734f378 100644
--- a/idea/testData/indentationOnNewline/DoInFun.kt
+++ b/idea/testData/indentationOnNewline/DoInFun.kt
@@ -1,3 +1,5 @@
 fun some() {
     do<caret>
-}
\ No newline at end of file
+}
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/EmptyParameters.after.kt b/idea/testData/indentationOnNewline/EmptyParameters.after.kt
index 5d605899128..14699949048 100644
--- a/idea/testData/indentationOnNewline/EmptyParameters.after.kt
+++ b/idea/testData/indentationOnNewline/EmptyParameters.after.kt
@@ -1,4 +1,6 @@
 fun testParam(
     <caret>
 ) {
-}
\ No newline at end of file
+}
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/EmptyParameters.kt b/idea/testData/indentationOnNewline/EmptyParameters.kt
index 17427fa56a4..7a646ee3cdd 100644
--- a/idea/testData/indentationOnNewline/EmptyParameters.kt
+++ b/idea/testData/indentationOnNewline/EmptyParameters.kt
@@ -1,2 +1,4 @@
 fun testParam(<caret>) {
-}
\ No newline at end of file
+}
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/For.after.kt b/idea/testData/indentationOnNewline/For.after.kt
index 0fc22bb9341..9c83bb18a2a 100644
--- a/idea/testData/indentationOnNewline/For.after.kt
+++ b/idea/testData/indentationOnNewline/For.after.kt
@@ -1,3 +1,5 @@
 fun some() {
     for (var i in 1..10)
-        <caret>
\ No newline at end of file
+        <caret>
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/For.kt b/idea/testData/indentationOnNewline/For.kt
index e0306a79eb4..117356346d5 100644
--- a/idea/testData/indentationOnNewline/For.kt
+++ b/idea/testData/indentationOnNewline/For.kt
@@ -1,2 +1,4 @@
 fun some() {
-    for (var i in 1..10)<caret>
\ No newline at end of file
+    for (var i in 1..10)<caret>
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/FunctionBlock.after.kt b/idea/testData/indentationOnNewline/FunctionBlock.after.kt
index 0791f23c532..a78751ea52e 100644
--- a/idea/testData/indentationOnNewline/FunctionBlock.after.kt
+++ b/idea/testData/indentationOnNewline/FunctionBlock.after.kt
@@ -6,4 +6,6 @@ fun main(args: Array<String>) {
     times(3) {
         <caret>
     }
-}
\ No newline at end of file
+}
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/FunctionBlock.kt b/idea/testData/indentationOnNewline/FunctionBlock.kt
index d76f1935dae..da53d49ec12 100644
--- a/idea/testData/indentationOnNewline/FunctionBlock.kt
+++ b/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>}
-}
\ No newline at end of file
+}
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/FunctionWithInference.after.kt b/idea/testData/indentationOnNewline/FunctionWithInference.after.kt
index 1c4df3e5491..e05aff571e0 100644
--- a/idea/testData/indentationOnNewline/FunctionWithInference.after.kt
+++ b/idea/testData/indentationOnNewline/FunctionWithInference.after.kt
@@ -1,2 +1,4 @@
 fun test() =
-    <caret>
\ No newline at end of file
+    <caret>
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/FunctionWithInference.kt b/idea/testData/indentationOnNewline/FunctionWithInference.kt
index 14b2fe431e4..cf3cc2a2955 100644
--- a/idea/testData/indentationOnNewline/FunctionWithInference.kt
+++ b/idea/testData/indentationOnNewline/FunctionWithInference.kt
@@ -1 +1,3 @@
-fun test() =<caret>
\ No newline at end of file
+fun test() =<caret>
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/If.after.kt b/idea/testData/indentationOnNewline/If.after.kt
index ac818828a71..e53b8d3ce55 100644
--- a/idea/testData/indentationOnNewline/If.after.kt
+++ b/idea/testData/indentationOnNewline/If.after.kt
@@ -1,4 +1,6 @@
 fun some() {
     if (3 > 5)
         <caret>
-}
\ No newline at end of file
+}
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/If.kt b/idea/testData/indentationOnNewline/If.kt
index 8f5f367e3b4..8e6a5f2012b 100644
--- a/idea/testData/indentationOnNewline/If.kt
+++ b/idea/testData/indentationOnNewline/If.kt
@@ -1,3 +1,5 @@
 fun some() {
     if (3 > 5)<caret>
-}
\ No newline at end of file
+}
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/InBinaryExpressionInMiddle.after.inv.kt b/idea/testData/indentationOnNewline/InBinaryExpressionInMiddle.after.inv.kt
index 312ff0f41ca..f811b255ec3 100644
--- a/idea/testData/indentationOnNewline/InBinaryExpressionInMiddle.after.inv.kt
+++ b/idea/testData/indentationOnNewline/InBinaryExpressionInMiddle.after.inv.kt
@@ -3,4 +3,5 @@ fun some() {
             <caret>4
 }
 
-// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
\ No newline at end of file
+// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/InBinaryExpressionInMiddle.after.kt b/idea/testData/indentationOnNewline/InBinaryExpressionInMiddle.after.kt
index 075da5f2a33..04841e78a74 100644
--- a/idea/testData/indentationOnNewline/InBinaryExpressionInMiddle.after.kt
+++ b/idea/testData/indentationOnNewline/InBinaryExpressionInMiddle.after.kt
@@ -3,4 +3,5 @@ fun some() {
                <caret>4
 }
 
-// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
\ No newline at end of file
+// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/InBinaryExpressionInMiddle.kt b/idea/testData/indentationOnNewline/InBinaryExpressionInMiddle.kt
index b13efe4829f..a91a81f5551 100644
--- a/idea/testData/indentationOnNewline/InBinaryExpressionInMiddle.kt
+++ b/idea/testData/indentationOnNewline/InBinaryExpressionInMiddle.kt
@@ -2,4 +2,5 @@ fun some() {
     val test = 3 + <caret>4
 }
 
-// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
\ No newline at end of file
+// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/InBinaryExpressionUnfinished.after.inv.kt b/idea/testData/indentationOnNewline/InBinaryExpressionUnfinished.after.inv.kt
index b8295b6912c..628c013a796 100644
--- a/idea/testData/indentationOnNewline/InBinaryExpressionUnfinished.after.inv.kt
+++ b/idea/testData/indentationOnNewline/InBinaryExpressionUnfinished.after.inv.kt
@@ -3,4 +3,5 @@ fun some() {
             <caret>
 }
 
-// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
\ No newline at end of file
+// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/InBinaryExpressionUnfinished.after.kt b/idea/testData/indentationOnNewline/InBinaryExpressionUnfinished.after.kt
index 0553ece6bb5..de22f7f88cb 100644
--- a/idea/testData/indentationOnNewline/InBinaryExpressionUnfinished.after.kt
+++ b/idea/testData/indentationOnNewline/InBinaryExpressionUnfinished.after.kt
@@ -3,4 +3,5 @@ fun some() {
                <caret>
 }
 
-// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
\ No newline at end of file
+// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/InBinaryExpressionUnfinished.kt b/idea/testData/indentationOnNewline/InBinaryExpressionUnfinished.kt
index 77e1e2b12d3..e6995ec5a9f 100644
--- a/idea/testData/indentationOnNewline/InBinaryExpressionUnfinished.kt
+++ b/idea/testData/indentationOnNewline/InBinaryExpressionUnfinished.kt
@@ -2,4 +2,5 @@ fun some() {
     val test = 3 + <caret>
 }
 
-// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
\ No newline at end of file
+// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/InBinaryExpressionUnfinishedInIf.after.inv.kt b/idea/testData/indentationOnNewline/InBinaryExpressionUnfinishedInIf.after.inv.kt
index e51996dd936..7cb777ede69 100644
--- a/idea/testData/indentationOnNewline/InBinaryExpressionUnfinishedInIf.after.inv.kt
+++ b/idea/testData/indentationOnNewline/InBinaryExpressionUnfinishedInIf.after.inv.kt
@@ -3,4 +3,5 @@ fun test() {
             <caret>)
 }
 
-// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
\ No newline at end of file
+// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/InBinaryExpressionUnfinishedInIf.after.kt b/idea/testData/indentationOnNewline/InBinaryExpressionUnfinishedInIf.after.kt
index e51996dd936..7cb777ede69 100644
--- a/idea/testData/indentationOnNewline/InBinaryExpressionUnfinishedInIf.after.kt
+++ b/idea/testData/indentationOnNewline/InBinaryExpressionUnfinishedInIf.after.kt
@@ -3,4 +3,5 @@ fun test() {
             <caret>)
 }
 
-// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
\ No newline at end of file
+// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/InBinaryExpressionUnfinishedInIf.kt b/idea/testData/indentationOnNewline/InBinaryExpressionUnfinishedInIf.kt
index f061a239155..b7d5e0f1464 100644
--- a/idea/testData/indentationOnNewline/InBinaryExpressionUnfinishedInIf.kt
+++ b/idea/testData/indentationOnNewline/InBinaryExpressionUnfinishedInIf.kt
@@ -2,4 +2,5 @@ fun test() {
     if (true &&<caret>)
 }
 
-// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
\ No newline at end of file
+// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/InBinaryExpressionsBeforeCloseParenthesis.after.inv.kt b/idea/testData/indentationOnNewline/InBinaryExpressionsBeforeCloseParenthesis.after.inv.kt
index cfdfc44c85f..81cf85304f4 100644
--- a/idea/testData/indentationOnNewline/InBinaryExpressionsBeforeCloseParenthesis.after.inv.kt
+++ b/idea/testData/indentationOnNewline/InBinaryExpressionsBeforeCloseParenthesis.after.inv.kt
@@ -1,4 +1,5 @@
 val somelong = 3 + 4 - (3 +
         <caret>)
 
-// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
\ No newline at end of file
+// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/InBinaryExpressionsBeforeCloseParenthesis.after.kt b/idea/testData/indentationOnNewline/InBinaryExpressionsBeforeCloseParenthesis.after.kt
index 7b2c9b4d286..b552b3a85fb 100644
--- a/idea/testData/indentationOnNewline/InBinaryExpressionsBeforeCloseParenthesis.after.kt
+++ b/idea/testData/indentationOnNewline/InBinaryExpressionsBeforeCloseParenthesis.after.kt
@@ -1,4 +1,5 @@
 val somelong = 3 + 4 - (3 +
                        <caret>)
 
-// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
\ No newline at end of file
+// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/InBinaryExpressionsBeforeCloseParenthesis.kt b/idea/testData/indentationOnNewline/InBinaryExpressionsBeforeCloseParenthesis.kt
index fdc43870763..d5a3e96d0a8 100644
--- a/idea/testData/indentationOnNewline/InBinaryExpressionsBeforeCloseParenthesis.kt
+++ b/idea/testData/indentationOnNewline/InBinaryExpressionsBeforeCloseParenthesis.kt
@@ -1,3 +1,4 @@
 val somelong = 3 + 4 - (3 + <caret>)
 
-// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
\ No newline at end of file
+// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/InDelegationListAfterColon.after.inv.kt b/idea/testData/indentationOnNewline/InDelegationListAfterColon.after.inv.kt
index e6c0fb368f0..fa82521e0d3 100644
--- a/idea/testData/indentationOnNewline/InDelegationListAfterColon.after.inv.kt
+++ b/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>
diff --git a/idea/testData/indentationOnNewline/InDelegationListAfterColon.after.kt b/idea/testData/indentationOnNewline/InDelegationListAfterColon.after.kt
index e6c0fb368f0..fa82521e0d3 100644
--- a/idea/testData/indentationOnNewline/InDelegationListAfterColon.after.kt
+++ b/idea/testData/indentationOnNewline/InDelegationListAfterColon.after.kt
@@ -1,4 +1,5 @@
 // SET_TRUE: ALIGN_MULTILINE_EXTENDS_LIST
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
 
 class Simpleclass() :
         <caret>
diff --git a/idea/testData/indentationOnNewline/InDelegationListAfterColon.kt b/idea/testData/indentationOnNewline/InDelegationListAfterColon.kt
index 842234b3dc5..c8811d544dd 100644
--- a/idea/testData/indentationOnNewline/InDelegationListAfterColon.kt
+++ b/idea/testData/indentationOnNewline/InDelegationListAfterColon.kt
@@ -1,4 +1,5 @@
 // SET_TRUE: ALIGN_MULTILINE_EXTENDS_LIST
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
 
 class Simpleclass() : <caret>
 
diff --git a/idea/testData/indentationOnNewline/InDelegationListAfterComma.after.inv.kt b/idea/testData/indentationOnNewline/InDelegationListAfterComma.after.inv.kt
index 38667969a52..e96229c4613 100644
--- a/idea/testData/indentationOnNewline/InDelegationListAfterComma.after.inv.kt
+++ b/idea/testData/indentationOnNewline/InDelegationListAfterComma.after.inv.kt
@@ -6,3 +6,5 @@ class A {
     class Simpleclass() : A1,
             <caret>
 }
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/InDelegationListAfterComma.after.kt b/idea/testData/indentationOnNewline/InDelegationListAfterComma.after.kt
index a37ca143898..460f524f15b 100644
--- a/idea/testData/indentationOnNewline/InDelegationListAfterComma.after.kt
+++ b/idea/testData/indentationOnNewline/InDelegationListAfterComma.after.kt
@@ -6,3 +6,5 @@ class A {
     class Simpleclass() : A1,
                           <caret>
 }
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/InDelegationListAfterComma.kt b/idea/testData/indentationOnNewline/InDelegationListAfterComma.kt
index 48841427261..55dadebc268 100644
--- a/idea/testData/indentationOnNewline/InDelegationListAfterComma.kt
+++ b/idea/testData/indentationOnNewline/InDelegationListAfterComma.kt
@@ -5,3 +5,5 @@ interface A1
 class A {
     class Simpleclass() : A1, <caret>
 }
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/InDelegationListNotEmpty.after.inv.kt b/idea/testData/indentationOnNewline/InDelegationListNotEmpty.after.inv.kt
index 6d6542203bd..f37ce472dc7 100644
--- a/idea/testData/indentationOnNewline/InDelegationListNotEmpty.after.inv.kt
+++ b/idea/testData/indentationOnNewline/InDelegationListNotEmpty.after.inv.kt
@@ -6,3 +6,5 @@ open class B1
 
 class Simpleclass() : B1(),
     <caret>A1
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/InDelegationListNotEmpty.after.kt b/idea/testData/indentationOnNewline/InDelegationListNotEmpty.after.kt
index fa21aaed3ee..2d02741e2c6 100644
--- a/idea/testData/indentationOnNewline/InDelegationListNotEmpty.after.kt
+++ b/idea/testData/indentationOnNewline/InDelegationListNotEmpty.after.kt
@@ -6,3 +6,5 @@ open class B1
 
 class Simpleclass() : B1(),
                       <caret>A1
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/InDelegationListNotEmpty.kt b/idea/testData/indentationOnNewline/InDelegationListNotEmpty.kt
index 7025478c495..79e72e2b6aa 100644
--- a/idea/testData/indentationOnNewline/InDelegationListNotEmpty.kt
+++ b/idea/testData/indentationOnNewline/InDelegationListNotEmpty.kt
@@ -5,3 +5,5 @@ interface A1
 open class B1
 
 class Simpleclass() : B1(), <caret>A1
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/InEnumAfterSemicolon.after.inv.kt b/idea/testData/indentationOnNewline/InEnumAfterSemicolon.after.inv.kt
index 674aa185f1d..5cd4bae7ef6 100644
--- a/idea/testData/indentationOnNewline/InEnumAfterSemicolon.after.inv.kt
+++ b/idea/testData/indentationOnNewline/InEnumAfterSemicolon.after.inv.kt
@@ -4,3 +4,5 @@ enum class EnumTest {
     ENTRY();
     <caret>
 }
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/InEnumAfterSemicolon.after.kt b/idea/testData/indentationOnNewline/InEnumAfterSemicolon.after.kt
index 674aa185f1d..5cd4bae7ef6 100644
--- a/idea/testData/indentationOnNewline/InEnumAfterSemicolon.after.kt
+++ b/idea/testData/indentationOnNewline/InEnumAfterSemicolon.after.kt
@@ -4,3 +4,5 @@ enum class EnumTest {
     ENTRY();
     <caret>
 }
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/InEnumAfterSemicolon.kt b/idea/testData/indentationOnNewline/InEnumAfterSemicolon.kt
index 00501978848..196adb20ff7 100644
--- a/idea/testData/indentationOnNewline/InEnumAfterSemicolon.kt
+++ b/idea/testData/indentationOnNewline/InEnumAfterSemicolon.kt
@@ -3,3 +3,5 @@
 enum class EnumTest {
     ENTRY(); <caret>
 }
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/InEnumInitializerListAfterComma.after.inv.kt b/idea/testData/indentationOnNewline/InEnumInitializerListAfterComma.after.inv.kt
index ff72ce30d26..79a660a3718 100644
--- a/idea/testData/indentationOnNewline/InEnumInitializerListAfterComma.after.inv.kt
+++ b/idea/testData/indentationOnNewline/InEnumInitializerListAfterComma.after.inv.kt
@@ -6,3 +6,5 @@ enum class EnumTest {
     ENTRY(),
     <caret>
 }
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/InEnumInitializerListAfterComma.after.kt b/idea/testData/indentationOnNewline/InEnumInitializerListAfterComma.after.kt
index ff72ce30d26..79a660a3718 100644
--- a/idea/testData/indentationOnNewline/InEnumInitializerListAfterComma.after.kt
+++ b/idea/testData/indentationOnNewline/InEnumInitializerListAfterComma.after.kt
@@ -6,3 +6,5 @@ enum class EnumTest {
     ENTRY(),
     <caret>
 }
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/InEnumInitializerListAfterComma.kt b/idea/testData/indentationOnNewline/InEnumInitializerListAfterComma.kt
index 655a8666139..407eaf60ecd 100644
--- a/idea/testData/indentationOnNewline/InEnumInitializerListAfterComma.kt
+++ b/idea/testData/indentationOnNewline/InEnumInitializerListAfterComma.kt
@@ -5,3 +5,5 @@ interface A1
 enum class EnumTest {
     ENTRY(), <caret>
 }
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/InEnumInitializerListNotEmpty.after.inv.kt b/idea/testData/indentationOnNewline/InEnumInitializerListNotEmpty.after.inv.kt
index 4a2351847c2..e9b28c1cef2 100644
--- a/idea/testData/indentationOnNewline/InEnumInitializerListNotEmpty.after.inv.kt
+++ b/idea/testData/indentationOnNewline/InEnumInitializerListNotEmpty.after.inv.kt
@@ -6,3 +6,5 @@ enum class EnumTest {
     ENTRY(),
     <caret>A1
 }
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/InEnumInitializerListNotEmpty.after.kt b/idea/testData/indentationOnNewline/InEnumInitializerListNotEmpty.after.kt
index 4a2351847c2..e9b28c1cef2 100644
--- a/idea/testData/indentationOnNewline/InEnumInitializerListNotEmpty.after.kt
+++ b/idea/testData/indentationOnNewline/InEnumInitializerListNotEmpty.after.kt
@@ -6,3 +6,5 @@ enum class EnumTest {
     ENTRY(),
     <caret>A1
 }
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/InEnumInitializerListNotEmpty.kt b/idea/testData/indentationOnNewline/InEnumInitializerListNotEmpty.kt
index 12eb24df790..f42fcc9bbf6 100644
--- a/idea/testData/indentationOnNewline/InEnumInitializerListNotEmpty.kt
+++ b/idea/testData/indentationOnNewline/InEnumInitializerListNotEmpty.kt
@@ -5,3 +5,5 @@ interface A1
 enum class EnumTest {
     ENTRY(), <caret>A1
 }
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/InExpressionsParentheses.after.inv.kt b/idea/testData/indentationOnNewline/InExpressionsParentheses.after.inv.kt
index 0ea57e6e000..79f254ebab4 100644
--- a/idea/testData/indentationOnNewline/InExpressionsParentheses.after.inv.kt
+++ b/idea/testData/indentationOnNewline/InExpressionsParentheses.after.inv.kt
@@ -2,4 +2,5 @@ val somelong = 3 + 4 - (
         <caret>
         )
 
-// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
\ No newline at end of file
+// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/InExpressionsParentheses.after.kt b/idea/testData/indentationOnNewline/InExpressionsParentheses.after.kt
index 9cd51d61a6f..354756743ab 100644
--- a/idea/testData/indentationOnNewline/InExpressionsParentheses.after.kt
+++ b/idea/testData/indentationOnNewline/InExpressionsParentheses.after.kt
@@ -2,4 +2,5 @@ val somelong = 3 + 4 - (
                        <caret>
                        )
 
-// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
\ No newline at end of file
+// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/InExpressionsParentheses.kt b/idea/testData/indentationOnNewline/InExpressionsParentheses.kt
index 1d07622f010..6d3f4e2c2fc 100644
--- a/idea/testData/indentationOnNewline/InExpressionsParentheses.kt
+++ b/idea/testData/indentationOnNewline/InExpressionsParentheses.kt
@@ -1,3 +1,4 @@
 val somelong = 3 + 4 - (<caret>)
 
-// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
\ No newline at end of file
+// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/InExpressionsParenthesesBeforeOperand.after.inv.kt b/idea/testData/indentationOnNewline/InExpressionsParenthesesBeforeOperand.after.inv.kt
index b4e0714eb63..138b12a0cfe 100644
--- a/idea/testData/indentationOnNewline/InExpressionsParenthesesBeforeOperand.after.inv.kt
+++ b/idea/testData/indentationOnNewline/InExpressionsParenthesesBeforeOperand.after.inv.kt
@@ -1,4 +1,5 @@
 val somelong = 3 + (3 *
         <caret>3)
 
-// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
\ No newline at end of file
+// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/InExpressionsParenthesesBeforeOperand.after.kt b/idea/testData/indentationOnNewline/InExpressionsParenthesesBeforeOperand.after.kt
index 9bc20887717..e7c7e4ee8cc 100644
--- a/idea/testData/indentationOnNewline/InExpressionsParenthesesBeforeOperand.after.kt
+++ b/idea/testData/indentationOnNewline/InExpressionsParenthesesBeforeOperand.after.kt
@@ -1,4 +1,5 @@
 val somelong = 3 + (3 *
                     <caret>3)
 
-// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
\ No newline at end of file
+// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/InExpressionsParenthesesBeforeOperand.kt b/idea/testData/indentationOnNewline/InExpressionsParenthesesBeforeOperand.kt
index ec7128bc809..82ff38940ef 100644
--- a/idea/testData/indentationOnNewline/InExpressionsParenthesesBeforeOperand.kt
+++ b/idea/testData/indentationOnNewline/InExpressionsParenthesesBeforeOperand.kt
@@ -1,3 +1,4 @@
 val somelong = 3 + (3 * <caret>3)
 
-// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
\ No newline at end of file
+// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/InLabmdaAfterArrow.after.kt b/idea/testData/indentationOnNewline/InLabmdaAfterArrow.after.kt
index 6afa2cee7ce..0bdeb1f59e9 100644
--- a/idea/testData/indentationOnNewline/InLabmdaAfterArrow.after.kt
+++ b/idea/testData/indentationOnNewline/InLabmdaAfterArrow.after.kt
@@ -1,3 +1,5 @@
 val a: (String) -> String = { some ->
     <caret>
-}
\ No newline at end of file
+}
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/InLabmdaAfterArrow.kt b/idea/testData/indentationOnNewline/InLabmdaAfterArrow.kt
index 164542935f8..f157dc0258e 100644
--- a/idea/testData/indentationOnNewline/InLabmdaAfterArrow.kt
+++ b/idea/testData/indentationOnNewline/InLabmdaAfterArrow.kt
@@ -1 +1,3 @@
-val a: (String) -> String = { some -><caret>}
\ No newline at end of file
+val a: (String) -> String = { some -><caret>}
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/InLambdaAfterArrowWithSpaces.after.kt b/idea/testData/indentationOnNewline/InLambdaAfterArrowWithSpaces.after.kt
index 6afa2cee7ce..0bdeb1f59e9 100644
--- a/idea/testData/indentationOnNewline/InLambdaAfterArrowWithSpaces.after.kt
+++ b/idea/testData/indentationOnNewline/InLambdaAfterArrowWithSpaces.after.kt
@@ -1,3 +1,5 @@
 val a: (String) -> String = { some ->
     <caret>
-}
\ No newline at end of file
+}
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/InLambdaAfterArrowWithSpaces.kt b/idea/testData/indentationOnNewline/InLambdaAfterArrowWithSpaces.kt
index 5ef728c5c59..590cac0296f 100644
--- a/idea/testData/indentationOnNewline/InLambdaAfterArrowWithSpaces.kt
+++ b/idea/testData/indentationOnNewline/InLambdaAfterArrowWithSpaces.kt
@@ -1 +1,3 @@
-val a: (String) -> String = { some -> <caret> }
\ No newline at end of file
+val a: (String) -> String = { some -> <caret> }
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/InLambdaBeforeParams.after.kt b/idea/testData/indentationOnNewline/InLambdaBeforeParams.after.kt
index d64ed2ddcfa..fcdc3152547 100644
--- a/idea/testData/indentationOnNewline/InLambdaBeforeParams.after.kt
+++ b/idea/testData/indentationOnNewline/InLambdaBeforeParams.after.kt
@@ -1,3 +1,5 @@
 val a: (String) -> String = {
         <caret>some ->
-}
\ No newline at end of file
+}
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/InLambdaBeforeParams.kt b/idea/testData/indentationOnNewline/InLambdaBeforeParams.kt
index 8d3791b2b04..330791a04e1 100644
--- a/idea/testData/indentationOnNewline/InLambdaBeforeParams.kt
+++ b/idea/testData/indentationOnNewline/InLambdaBeforeParams.kt
@@ -1,2 +1,4 @@
 val a: (String) -> String = { <caret>some ->
-}
\ No newline at end of file
+}
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/InLambdaInsideChainCallSameLine.after.kt b/idea/testData/indentationOnNewline/InLambdaInsideChainCallSameLine.after.kt
index c960c0abe96..4cfb95b0031 100644
--- a/idea/testData/indentationOnNewline/InLambdaInsideChainCallSameLine.after.kt
+++ b/idea/testData/indentationOnNewline/InLambdaInsideChainCallSameLine.after.kt
@@ -8,3 +8,4 @@ fun test() {
     }
 }
 
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/InLambdaInsideChainCallSameLine.kt b/idea/testData/indentationOnNewline/InLambdaInsideChainCallSameLine.kt
index 2a40ece4201..8a8e0330e32 100644
--- a/idea/testData/indentationOnNewline/InLambdaInsideChainCallSameLine.kt
+++ b/idea/testData/indentationOnNewline/InLambdaInsideChainCallSameLine.kt
@@ -6,3 +6,4 @@ fun test() {
     val abc = Test().foo()?.foo({ "str" }).foo {<caret>}
 }
 
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/InLambdaInsideChainCallSameLineWithSpaces.after.kt b/idea/testData/indentationOnNewline/InLambdaInsideChainCallSameLineWithSpaces.after.kt
index 5a815c87f78..4cfb95b0031 100644
--- a/idea/testData/indentationOnNewline/InLambdaInsideChainCallSameLineWithSpaces.after.kt
+++ b/idea/testData/indentationOnNewline/InLambdaInsideChainCallSameLineWithSpaces.after.kt
@@ -6,4 +6,6 @@ fun test() {
     val abc = Test().foo()?.foo({ "str" }).foo {
         <caret>
     }
-}
\ No newline at end of file
+}
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/InLambdaInsideChainCallSameLineWithSpaces.kt b/idea/testData/indentationOnNewline/InLambdaInsideChainCallSameLineWithSpaces.kt
index 74260e2a4a7..fc48c148a68 100644
--- a/idea/testData/indentationOnNewline/InLambdaInsideChainCallSameLineWithSpaces.kt
+++ b/idea/testData/indentationOnNewline/InLambdaInsideChainCallSameLineWithSpaces.kt
@@ -6,3 +6,4 @@ fun test() {
     val abc = Test().foo()?.foo({ "str" }).foo { <caret> }
 }
 
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/InLambdaInsideChainCallWithNewLine.after.kt b/idea/testData/indentationOnNewline/InLambdaInsideChainCallWithNewLine.after.kt
index 5906bf8206d..c083eb9e5c7 100644
--- a/idea/testData/indentationOnNewline/InLambdaInsideChainCallWithNewLine.after.kt
+++ b/idea/testData/indentationOnNewline/InLambdaInsideChainCallWithNewLine.after.kt
@@ -8,4 +8,6 @@ fun test() {
             .foo {
                 <caret>
             }
-}
\ No newline at end of file
+}
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/InLambdaInsideChainCallWithNewLine.kt b/idea/testData/indentationOnNewline/InLambdaInsideChainCallWithNewLine.kt
index 60c5386e244..90e5bd42b2d 100644
--- a/idea/testData/indentationOnNewline/InLambdaInsideChainCallWithNewLine.kt
+++ b/idea/testData/indentationOnNewline/InLambdaInsideChainCallWithNewLine.kt
@@ -6,4 +6,6 @@ fun test() {
     val abc = Test()
             .foo { "Str" }
             .foo {<caret>}
-}
\ No newline at end of file
+}
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/InLambdaInsideChainCallWithNewLineWithSpaces.after.kt b/idea/testData/indentationOnNewline/InLambdaInsideChainCallWithNewLineWithSpaces.after.kt
index 5906bf8206d..c083eb9e5c7 100644
--- a/idea/testData/indentationOnNewline/InLambdaInsideChainCallWithNewLineWithSpaces.after.kt
+++ b/idea/testData/indentationOnNewline/InLambdaInsideChainCallWithNewLineWithSpaces.after.kt
@@ -8,4 +8,6 @@ fun test() {
             .foo {
                 <caret>
             }
-}
\ No newline at end of file
+}
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/InLambdaInsideChainCallWithNewLineWithSpaces.kt b/idea/testData/indentationOnNewline/InLambdaInsideChainCallWithNewLineWithSpaces.kt
index 423bcbc9a93..174cd06e695 100644
--- a/idea/testData/indentationOnNewline/InLambdaInsideChainCallWithNewLineWithSpaces.kt
+++ b/idea/testData/indentationOnNewline/InLambdaInsideChainCallWithNewLineWithSpaces.kt
@@ -6,4 +6,6 @@ fun test() {
     val abc = Test()
             .foo { "Str" }
             .foo { <caret> }
-}
\ No newline at end of file
+}
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/InMultilineLambdaAfterArrow.after.kt b/idea/testData/indentationOnNewline/InMultilineLambdaAfterArrow.after.kt
index c1453e9eee1..f0f7f49a8e7 100644
--- a/idea/testData/indentationOnNewline/InMultilineLambdaAfterArrow.after.kt
+++ b/idea/testData/indentationOnNewline/InMultilineLambdaAfterArrow.after.kt
@@ -1,4 +1,6 @@
 val a: (String) -> String = {
     some ->
     <caret>
-}
\ No newline at end of file
+}
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/InMultilineLambdaAfterArrow.kt b/idea/testData/indentationOnNewline/InMultilineLambdaAfterArrow.kt
index ce92c7d239e..9ffcfb6ed79 100644
--- a/idea/testData/indentationOnNewline/InMultilineLambdaAfterArrow.kt
+++ b/idea/testData/indentationOnNewline/InMultilineLambdaAfterArrow.kt
@@ -1,3 +1,5 @@
 val a: (String) -> String = {
     some -><caret>
-}
\ No newline at end of file
+}
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/IsExpressionAfterIs.after.inv.kt b/idea/testData/indentationOnNewline/IsExpressionAfterIs.after.inv.kt
index 11889cf023e..7d499eb9d7d 100644
--- a/idea/testData/indentationOnNewline/IsExpressionAfterIs.after.inv.kt
+++ b/idea/testData/indentationOnNewline/IsExpressionAfterIs.after.inv.kt
@@ -3,4 +3,5 @@ fun test() {
             <caret>
 }
 
-// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
\ No newline at end of file
+// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/IsExpressionAfterIs.after.kt b/idea/testData/indentationOnNewline/IsExpressionAfterIs.after.kt
index 11889cf023e..7d499eb9d7d 100644
--- a/idea/testData/indentationOnNewline/IsExpressionAfterIs.after.kt
+++ b/idea/testData/indentationOnNewline/IsExpressionAfterIs.after.kt
@@ -3,4 +3,5 @@ fun test() {
             <caret>
 }
 
-// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
\ No newline at end of file
+// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/IsExpressionAfterIs.kt b/idea/testData/indentationOnNewline/IsExpressionAfterIs.kt
index 3db4a1ee59b..87676e1e549 100644
--- a/idea/testData/indentationOnNewline/IsExpressionAfterIs.kt
+++ b/idea/testData/indentationOnNewline/IsExpressionAfterIs.kt
@@ -2,4 +2,5 @@ fun test() {
     1 is <caret>
 }
 
-// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
\ No newline at end of file
+// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/KT20783.after.kt b/idea/testData/indentationOnNewline/KT20783.after.kt
index b68c5600886..033d6324f77 100644
--- a/idea/testData/indentationOnNewline/KT20783.after.kt
+++ b/idea/testData/indentationOnNewline/KT20783.after.kt
@@ -3,4 +3,6 @@ object Test {   // TODO restore correct behavior
     fun test() {
     <caret>
     }
-}
\ No newline at end of file
+}
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/KT20783.kt b/idea/testData/indentationOnNewline/KT20783.kt
index 78b322dbdd6..3bd9ba14ccf 100644
--- a/idea/testData/indentationOnNewline/KT20783.kt
+++ b/idea/testData/indentationOnNewline/KT20783.kt
@@ -2,4 +2,6 @@ object Test {   // TODO restore correct behavior
 //    some
     fun test() {<caret>
     }
-}
\ No newline at end of file
+}
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/LargeFile.after.kt b/idea/testData/indentationOnNewline/LargeFile.after.kt
index ec7d53e3829..46f0a15355e 100644
--- a/idea/testData/indentationOnNewline/LargeFile.after.kt
+++ b/idea/testData/indentationOnNewline/LargeFile.after.kt
@@ -2320,4 +2320,6 @@ private fun ASTNode.suppressBinaryExpressionIndent(): Boolean {
         psi = psi.parent as KtBinaryExpression
     }
     return psi.parent?.node?.elementType == CONDITION || psi.operationToken == ELVIS
-}
\ No newline at end of file
+}
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/LargeFile.kt b/idea/testData/indentationOnNewline/LargeFile.kt
index 25a7786c758..e8660710533 100644
--- a/idea/testData/indentationOnNewline/LargeFile.kt
+++ b/idea/testData/indentationOnNewline/LargeFile.kt
@@ -2319,4 +2319,6 @@ private fun ASTNode.suppressBinaryExpressionIndent(): Boolean {
         psi = psi.parent as KtBinaryExpression
     }
     return psi.parent?.node?.elementType == CONDITION || psi.operationToken == ELVIS
-}
\ No newline at end of file
+}
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/ModifierListInUnfinishedDeclaration.after.kt b/idea/testData/indentationOnNewline/ModifierListInUnfinishedDeclaration.after.kt
index 9489bb04e5d..04f390c176d 100644
--- a/idea/testData/indentationOnNewline/ModifierListInUnfinishedDeclaration.after.kt
+++ b/idea/testData/indentationOnNewline/ModifierListInUnfinishedDeclaration.after.kt
@@ -1,4 +1,6 @@
 object A {
     private
     <caret>
-}
\ No newline at end of file
+}
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/ModifierListInUnfinishedDeclaration.kt b/idea/testData/indentationOnNewline/ModifierListInUnfinishedDeclaration.kt
index 31800deccf1..db1b73e41e5 100644
--- a/idea/testData/indentationOnNewline/ModifierListInUnfinishedDeclaration.kt
+++ b/idea/testData/indentationOnNewline/ModifierListInUnfinishedDeclaration.kt
@@ -1,3 +1,5 @@
 object A {
     private<caret>
-}
\ No newline at end of file
+}
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/MultideclarationAfterEq.after.kt b/idea/testData/indentationOnNewline/MultideclarationAfterEq.after.kt
index 30c4063a9b1..d68c0f1cf68 100644
--- a/idea/testData/indentationOnNewline/MultideclarationAfterEq.after.kt
+++ b/idea/testData/indentationOnNewline/MultideclarationAfterEq.after.kt
@@ -1,4 +1,6 @@
 fun test() {
     val (a, b) =
         <caret>
-}
\ No newline at end of file
+}
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/MultideclarationAfterEq.kt b/idea/testData/indentationOnNewline/MultideclarationAfterEq.kt
index 34cdfc34337..e807cecc5db 100644
--- a/idea/testData/indentationOnNewline/MultideclarationAfterEq.kt
+++ b/idea/testData/indentationOnNewline/MultideclarationAfterEq.kt
@@ -1,3 +1,5 @@
 fun test() {
     val (a, b) = <caret>
-}
\ No newline at end of file
+}
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/MultideclarationBeforeEq.after.kt b/idea/testData/indentationOnNewline/MultideclarationBeforeEq.after.kt
index d65551f8e16..12176431e56 100644
--- a/idea/testData/indentationOnNewline/MultideclarationBeforeEq.after.kt
+++ b/idea/testData/indentationOnNewline/MultideclarationBeforeEq.after.kt
@@ -1,4 +1,6 @@
 fun test() {
     val (a, b)
     <caret>
-}
\ No newline at end of file
+}
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/MultideclarationBeforeEq.kt b/idea/testData/indentationOnNewline/MultideclarationBeforeEq.kt
index 51d3345be08..053edcc8664 100644
--- a/idea/testData/indentationOnNewline/MultideclarationBeforeEq.kt
+++ b/idea/testData/indentationOnNewline/MultideclarationBeforeEq.kt
@@ -1,3 +1,5 @@
 fun test() {
     val (a, b) <caret>
-}
\ No newline at end of file
+}
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/NotFirstParameter.after.kt b/idea/testData/indentationOnNewline/NotFirstParameter.after.kt
index ca3281b5838..cf038a4890f 100644
--- a/idea/testData/indentationOnNewline/NotFirstParameter.after.kt
+++ b/idea/testData/indentationOnNewline/NotFirstParameter.after.kt
@@ -1,3 +1,5 @@
 fun testParam(a : String, b : Int,
 <caret>) {
-}
\ No newline at end of file
+}
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/NotFirstParameter.kt b/idea/testData/indentationOnNewline/NotFirstParameter.kt
index 4a3649b5f91..832be355ad7 100644
--- a/idea/testData/indentationOnNewline/NotFirstParameter.kt
+++ b/idea/testData/indentationOnNewline/NotFirstParameter.kt
@@ -1,2 +1,4 @@
 fun testParam(a : String, b : Int,<caret>) {
-}
\ No newline at end of file
+}
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/PropertyWithInference.after.kt b/idea/testData/indentationOnNewline/PropertyWithInference.after.kt
index 713442135d2..b75f59e985a 100644
--- a/idea/testData/indentationOnNewline/PropertyWithInference.after.kt
+++ b/idea/testData/indentationOnNewline/PropertyWithInference.after.kt
@@ -1,2 +1,4 @@
 val a =
-    <caret>
\ No newline at end of file
+    <caret>
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/PropertyWithInference.kt b/idea/testData/indentationOnNewline/PropertyWithInference.kt
index 771f562e866..bbbd4fb3fe8 100644
--- a/idea/testData/indentationOnNewline/PropertyWithInference.kt
+++ b/idea/testData/indentationOnNewline/PropertyWithInference.kt
@@ -1 +1,3 @@
-val a =<caret>
\ No newline at end of file
+val a =<caret>
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/ReturnContinue.after.kt b/idea/testData/indentationOnNewline/ReturnContinue.after.kt
index 3bd794a6231..3adbc5d36af 100644
--- a/idea/testData/indentationOnNewline/ReturnContinue.after.kt
+++ b/idea/testData/indentationOnNewline/ReturnContinue.after.kt
@@ -1,4 +1,6 @@
 fun test(): Int {
     return
     <caret>
-}
\ No newline at end of file
+}
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/ReturnContinue.kt b/idea/testData/indentationOnNewline/ReturnContinue.kt
index 5d4c7e1044a..25497f79da2 100644
--- a/idea/testData/indentationOnNewline/ReturnContinue.kt
+++ b/idea/testData/indentationOnNewline/ReturnContinue.kt
@@ -1,3 +1,5 @@
 fun test(): Int {
     return <caret>
-}
\ No newline at end of file
+}
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/Semicolon.after.kt b/idea/testData/indentationOnNewline/Semicolon.after.kt
index 852f609c908..027a1aed5dc 100644
--- a/idea/testData/indentationOnNewline/Semicolon.after.kt
+++ b/idea/testData/indentationOnNewline/Semicolon.after.kt
@@ -2,3 +2,5 @@ fun test() {
     val a = 44;
     <caret>
 }
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/Semicolon.kt b/idea/testData/indentationOnNewline/Semicolon.kt
index 50a033d7c1e..6c986e7f269 100644
--- a/idea/testData/indentationOnNewline/Semicolon.kt
+++ b/idea/testData/indentationOnNewline/Semicolon.kt
@@ -1,3 +1,5 @@
 fun test() {
     val a = 44;<caret>
 }
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/Semicolon2.after.kt b/idea/testData/indentationOnNewline/Semicolon2.after.kt
index 7eeae566db9..5be1a2cbf50 100644
--- a/idea/testData/indentationOnNewline/Semicolon2.after.kt
+++ b/idea/testData/indentationOnNewline/Semicolon2.after.kt
@@ -2,3 +2,5 @@ fun test() {
     val a = 44;
     <caret>val b = 42;
 }
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/Semicolon2.kt b/idea/testData/indentationOnNewline/Semicolon2.kt
index 6b13f087b93..9ba9ca84faa 100644
--- a/idea/testData/indentationOnNewline/Semicolon2.kt
+++ b/idea/testData/indentationOnNewline/Semicolon2.kt
@@ -1,3 +1,5 @@
 fun test() {
     val a = 44;<caret> val b = 42;
 }
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/SettingAlignMultilineParametersInCalls.after.inv.kt b/idea/testData/indentationOnNewline/SettingAlignMultilineParametersInCalls.after.inv.kt
index be3008b621d..71157fb44bf 100644
--- a/idea/testData/indentationOnNewline/SettingAlignMultilineParametersInCalls.after.inv.kt
+++ b/idea/testData/indentationOnNewline/SettingAlignMultilineParametersInCalls.after.inv.kt
@@ -3,4 +3,5 @@ fun test() {
     <caret>)
 }
 
-// SET_TRUE: ALIGN_MULTILINE_PARAMETERS_IN_CALLS
\ No newline at end of file
+// SET_TRUE: ALIGN_MULTILINE_PARAMETERS_IN_CALLS
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/SettingAlignMultilineParametersInCalls.after.kt b/idea/testData/indentationOnNewline/SettingAlignMultilineParametersInCalls.after.kt
index be3008b621d..71157fb44bf 100644
--- a/idea/testData/indentationOnNewline/SettingAlignMultilineParametersInCalls.after.kt
+++ b/idea/testData/indentationOnNewline/SettingAlignMultilineParametersInCalls.after.kt
@@ -3,4 +3,5 @@ fun test() {
     <caret>)
 }
 
-// SET_TRUE: ALIGN_MULTILINE_PARAMETERS_IN_CALLS
\ No newline at end of file
+// SET_TRUE: ALIGN_MULTILINE_PARAMETERS_IN_CALLS
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/SettingAlignMultilineParametersInCalls.kt b/idea/testData/indentationOnNewline/SettingAlignMultilineParametersInCalls.kt
index 9e4d90e43cf..0b2ff2650c6 100644
--- a/idea/testData/indentationOnNewline/SettingAlignMultilineParametersInCalls.kt
+++ b/idea/testData/indentationOnNewline/SettingAlignMultilineParametersInCalls.kt
@@ -2,4 +2,5 @@ fun test() {
     testVeryLong(12,<caret>)
 }
 
-// SET_TRUE: ALIGN_MULTILINE_PARAMETERS_IN_CALLS
\ No newline at end of file
+// SET_TRUE: ALIGN_MULTILINE_PARAMETERS_IN_CALLS
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/While.after.kt b/idea/testData/indentationOnNewline/While.after.kt
index 568a7d9a336..c025c774430 100644
--- a/idea/testData/indentationOnNewline/While.after.kt
+++ b/idea/testData/indentationOnNewline/While.after.kt
@@ -1,4 +1,6 @@
 fun some() {
     var t = 12
     while (t > 0)
-        <caret>
\ No newline at end of file
+        <caret>
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/While.kt b/idea/testData/indentationOnNewline/While.kt
index 93cb6c3c351..fe722c59d79 100644
--- a/idea/testData/indentationOnNewline/While.kt
+++ b/idea/testData/indentationOnNewline/While.kt
@@ -1,3 +1,5 @@
 fun some() {
     var t = 12
-    while (t > 0)<caret>
\ No newline at end of file
+    while (t > 0)<caret>
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/script/ScriptAfterClosingBrace.after.kts b/idea/testData/indentationOnNewline/script/ScriptAfterClosingBrace.after.kts
index 622c0d60c05..ea539ee10f5 100644
--- a/idea/testData/indentationOnNewline/script/ScriptAfterClosingBrace.after.kts
+++ b/idea/testData/indentationOnNewline/script/ScriptAfterClosingBrace.after.kts
@@ -3,4 +3,6 @@ foo() {
 }
 <caret>
 
-val c = 4
\ No newline at end of file
+val c = 4
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/script/ScriptAfterClosingBrace.kts b/idea/testData/indentationOnNewline/script/ScriptAfterClosingBrace.kts
index abeccd8e81d..d3f92df2581 100644
--- a/idea/testData/indentationOnNewline/script/ScriptAfterClosingBrace.kts
+++ b/idea/testData/indentationOnNewline/script/ScriptAfterClosingBrace.kts
@@ -2,4 +2,6 @@ foo() {
 
 }<caret>
 
-val c = 4
\ No newline at end of file
+val c = 4
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/script/ScriptAfterExpression.after.kts b/idea/testData/indentationOnNewline/script/ScriptAfterExpression.after.kts
index 8bf92306092..56474245d11 100644
--- a/idea/testData/indentationOnNewline/script/ScriptAfterExpression.after.kts
+++ b/idea/testData/indentationOnNewline/script/ScriptAfterExpression.after.kts
@@ -2,4 +2,6 @@ package a.b.c
 
 var x = 1
 x = x + 1
-<caret>
\ No newline at end of file
+<caret>
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/script/ScriptAfterExpression.kts b/idea/testData/indentationOnNewline/script/ScriptAfterExpression.kts
index ebd77e8bde2..de929a5848d 100644
--- a/idea/testData/indentationOnNewline/script/ScriptAfterExpression.kts
+++ b/idea/testData/indentationOnNewline/script/ScriptAfterExpression.kts
@@ -1,4 +1,6 @@
 package a.b.c
 
 var x = 1
-x = x + 1<caret>
\ No newline at end of file
+x = x + 1<caret>
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/script/ScriptAfterFun.after.kts b/idea/testData/indentationOnNewline/script/ScriptAfterFun.after.kts
index 4cedbdc38d9..aa00dac6525 100644
--- a/idea/testData/indentationOnNewline/script/ScriptAfterFun.after.kts
+++ b/idea/testData/indentationOnNewline/script/ScriptAfterFun.after.kts
@@ -3,4 +3,6 @@ package a.b.c
 fun fn() {
 
 }
-<caret>
\ No newline at end of file
+<caret>
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/script/ScriptAfterFun.kts b/idea/testData/indentationOnNewline/script/ScriptAfterFun.kts
index bd4ca22e7ed..acbaf562945 100644
--- a/idea/testData/indentationOnNewline/script/ScriptAfterFun.kts
+++ b/idea/testData/indentationOnNewline/script/ScriptAfterFun.kts
@@ -2,4 +2,6 @@ package a.b.c
 
 fun fn() {
 
-}<caret>
\ No newline at end of file
+}<caret>
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/script/ScriptAfterImport.after.kts b/idea/testData/indentationOnNewline/script/ScriptAfterImport.after.kts
index 7fc156eb5f0..c6a90e61b50 100644
--- a/idea/testData/indentationOnNewline/script/ScriptAfterImport.after.kts
+++ b/idea/testData/indentationOnNewline/script/ScriptAfterImport.after.kts
@@ -1,4 +1,6 @@
 package a.b.c
 
 import x.y.z
-<caret>
\ No newline at end of file
+<caret>
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/script/ScriptAfterImport.kts b/idea/testData/indentationOnNewline/script/ScriptAfterImport.kts
index 19e4e622115..58661b6f68b 100644
--- a/idea/testData/indentationOnNewline/script/ScriptAfterImport.kts
+++ b/idea/testData/indentationOnNewline/script/ScriptAfterImport.kts
@@ -1,3 +1,5 @@
 package a.b.c
 
-import x.y.z<caret>
\ No newline at end of file
+import x.y.z<caret>
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/script/ScriptBetweenFunctionCalls.after.kts b/idea/testData/indentationOnNewline/script/ScriptBetweenFunctionCalls.after.kts
index c69b8d9032c..bf74cd8e937 100644
--- a/idea/testData/indentationOnNewline/script/ScriptBetweenFunctionCalls.after.kts
+++ b/idea/testData/indentationOnNewline/script/ScriptBetweenFunctionCalls.after.kts
@@ -5,4 +5,6 @@ fun foo() {
 foo()
 <caret>
 
-foo()
\ No newline at end of file
+foo()
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/script/ScriptBetweenFunctionCalls.kts b/idea/testData/indentationOnNewline/script/ScriptBetweenFunctionCalls.kts
index 14fdf916487..85730468f1a 100644
--- a/idea/testData/indentationOnNewline/script/ScriptBetweenFunctionCalls.kts
+++ b/idea/testData/indentationOnNewline/script/ScriptBetweenFunctionCalls.kts
@@ -4,4 +4,6 @@ fun foo() {
 
 foo()<caret>
 
-foo()
\ No newline at end of file
+foo()
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/script/ScriptInsideFun.after.kts b/idea/testData/indentationOnNewline/script/ScriptInsideFun.after.kts
index 856dc4a5a03..03318d835e1 100644
--- a/idea/testData/indentationOnNewline/script/ScriptInsideFun.after.kts
+++ b/idea/testData/indentationOnNewline/script/ScriptInsideFun.after.kts
@@ -4,4 +4,6 @@ var x = 2
 fun fn() {
     x = x + 1
     <caret>
-}
\ No newline at end of file
+}
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/script/ScriptInsideFun.kts b/idea/testData/indentationOnNewline/script/ScriptInsideFun.kts
index 0fa26d37fb0..50603191fc3 100644
--- a/idea/testData/indentationOnNewline/script/ScriptInsideFun.kts
+++ b/idea/testData/indentationOnNewline/script/ScriptInsideFun.kts
@@ -3,4 +3,6 @@ package a.b.c
 var x = 2
 fun fn() {
     x = x + 1<caret>
-}
\ No newline at end of file
+}
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/prepare/idea-plugin/build.gradle.kts b/prepare/idea-plugin/build.gradle.kts
index 189cf745c4e..caf269247c3 100644
--- a/prepare/idea-plugin/build.gradle.kts
+++ b/prepare/idea-plugin/build.gradle.kts
@@ -39,6 +39,7 @@ val projectsToShadow by extra(listOf(
         ":idea:scripting-support",
         ":idea:idea-j2k",
         ":idea:formatter",
+        ":idea:line-indent-provider",
         ":compiler:psi",
         ":compiler:fir:cones",
         ":compiler:fir:checkers",
diff --git a/settings.gradle b/settings.gradle
index bdb53aa41e6..7bd066b2d83 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -166,6 +166,7 @@ include ":benchmarks",
         ":idea:idea-core",
         ":idea:idea-fir",
         ":idea:kotlin-gradle-tooling",
+        ":idea:line-indent-provider",
         ":idea:idea-android",
         ":idea:idea-android-output-parser",
         ":idea:idea-test-framework",