diff --git a/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/PerformanceTypingIndentationTestGenerated.java b/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/PerformanceTypingIndentationTestGenerated.java
index 6584c9bf744..0d3745feae0 100644
--- a/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/PerformanceTypingIndentationTestGenerated.java
+++ b/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/PerformanceTypingIndentationTestGenerated.java
@@ -34,6 +34,16 @@ public class PerformanceTypingIndentationTestGenerated extends AbstractPerforman
         runTest("idea/testData/indentationOnNewline/AfterClassNameBeforeFun.kt");
     }
 
+    @TestMetadata("AfterExtensionPropertyGetter.kt")
+    public void testAfterExtensionPropertyGetter() throws Exception {
+        runTest("idea/testData/indentationOnNewline/AfterExtensionPropertyGetter.kt");
+    }
+
+    @TestMetadata("AfterExtensionPropertySetter.kt")
+    public void testAfterExtensionPropertySetter() throws Exception {
+        runTest("idea/testData/indentationOnNewline/AfterExtensionPropertySetter.kt");
+    }
+
     @TestMetadata("AfterFinally.kt")
     public void testAfterFinally() throws Exception {
         runTest("idea/testData/indentationOnNewline/AfterFinally.kt");
@@ -44,6 +54,16 @@ public class PerformanceTypingIndentationTestGenerated extends AbstractPerforman
         runTest("idea/testData/indentationOnNewline/AfterImport.kt");
     }
 
+    @TestMetadata("AfterPropertyGetter.kt")
+    public void testAfterPropertyGetter() throws Exception {
+        runTest("idea/testData/indentationOnNewline/AfterPropertyGetter.kt");
+    }
+
+    @TestMetadata("AfterPropertySetter.kt")
+    public void testAfterPropertySetter() throws Exception {
+        runTest("idea/testData/indentationOnNewline/AfterPropertySetter.kt");
+    }
+
     @TestMetadata("AfterTry.kt")
     public void testAfterTry() throws Exception {
         runTest("idea/testData/indentationOnNewline/AfterTry.kt");
diff --git a/idea/testData/indentationOnNewline/AfterExtensionPropertyGetter.after.kt b/idea/testData/indentationOnNewline/AfterExtensionPropertyGetter.after.kt
new file mode 100644
index 00000000000..e18110b7c06
--- /dev/null
+++ b/idea/testData/indentationOnNewline/AfterExtensionPropertyGetter.after.kt
@@ -0,0 +1,5 @@
+var String.foo: Int
+    get() = length
+<caret>
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/AfterExtensionPropertyGetter.kt b/idea/testData/indentationOnNewline/AfterExtensionPropertyGetter.kt
new file mode 100644
index 00000000000..189e5e6c3c1
--- /dev/null
+++ b/idea/testData/indentationOnNewline/AfterExtensionPropertyGetter.kt
@@ -0,0 +1,4 @@
+var String.foo: Int
+    get() = length<caret>
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/AfterExtensionPropertySetter.after.kt b/idea/testData/indentationOnNewline/AfterExtensionPropertySetter.after.kt
new file mode 100644
index 00000000000..478eec0f38c
--- /dev/null
+++ b/idea/testData/indentationOnNewline/AfterExtensionPropertySetter.after.kt
@@ -0,0 +1,5 @@
+var String.foo: Int
+    set(value) {}
+<caret>
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/AfterExtensionPropertySetter.kt b/idea/testData/indentationOnNewline/AfterExtensionPropertySetter.kt
new file mode 100644
index 00000000000..0958c27dc2c
--- /dev/null
+++ b/idea/testData/indentationOnNewline/AfterExtensionPropertySetter.kt
@@ -0,0 +1,4 @@
+var String.foo: Int
+    set(value) {}<caret>
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/AfterPropertyGetter.after.kt b/idea/testData/indentationOnNewline/AfterPropertyGetter.after.kt
new file mode 100644
index 00000000000..00ce4dc3d74
--- /dev/null
+++ b/idea/testData/indentationOnNewline/AfterPropertyGetter.after.kt
@@ -0,0 +1,5 @@
+var foo: Int
+    get() = length
+<caret>
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/AfterPropertyGetter.kt b/idea/testData/indentationOnNewline/AfterPropertyGetter.kt
new file mode 100644
index 00000000000..76d93affe81
--- /dev/null
+++ b/idea/testData/indentationOnNewline/AfterPropertyGetter.kt
@@ -0,0 +1,4 @@
+var foo: Int
+    get() = length<caret>
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/AfterPropertySetter.after.kt b/idea/testData/indentationOnNewline/AfterPropertySetter.after.kt
new file mode 100644
index 00000000000..962faae5065
--- /dev/null
+++ b/idea/testData/indentationOnNewline/AfterPropertySetter.after.kt
@@ -0,0 +1,5 @@
+var foo: Int
+    set(value) {}
+<caret>
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/testData/indentationOnNewline/AfterPropertySetter.kt b/idea/testData/indentationOnNewline/AfterPropertySetter.kt
new file mode 100644
index 00000000000..de8eaccf36c
--- /dev/null
+++ b/idea/testData/indentationOnNewline/AfterPropertySetter.kt
@@ -0,0 +1,4 @@
+var foo: Int
+    set(value) {}<caret>
+
+// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/formatter/TypingIndentationTestBaseGenerated.java b/idea/tests/org/jetbrains/kotlin/formatter/TypingIndentationTestBaseGenerated.java
index 2e7c87e2ef7..63064b41918 100644
--- a/idea/tests/org/jetbrains/kotlin/formatter/TypingIndentationTestBaseGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/formatter/TypingIndentationTestBaseGenerated.java
@@ -36,6 +36,16 @@ public class TypingIndentationTestBaseGenerated extends AbstractTypingIndentatio
             runTest("idea/testData/indentationOnNewline/AfterClassNameBeforeFun.after.kt");
         }
 
+        @TestMetadata("AfterExtensionPropertyGetter.after.kt")
+        public void testAfterExtensionPropertyGetter() throws Exception {
+            runTest("idea/testData/indentationOnNewline/AfterExtensionPropertyGetter.after.kt");
+        }
+
+        @TestMetadata("AfterExtensionPropertySetter.after.kt")
+        public void testAfterExtensionPropertySetter() throws Exception {
+            runTest("idea/testData/indentationOnNewline/AfterExtensionPropertySetter.after.kt");
+        }
+
         @TestMetadata("AfterFinally.after.kt")
         public void testAfterFinally() throws Exception {
             runTest("idea/testData/indentationOnNewline/AfterFinally.after.kt");
@@ -46,6 +56,16 @@ public class TypingIndentationTestBaseGenerated extends AbstractTypingIndentatio
             runTest("idea/testData/indentationOnNewline/AfterImport.after.kt");
         }
 
+        @TestMetadata("AfterPropertyGetter.after.kt")
+        public void testAfterPropertyGetter() throws Exception {
+            runTest("idea/testData/indentationOnNewline/AfterPropertyGetter.after.kt");
+        }
+
+        @TestMetadata("AfterPropertySetter.after.kt")
+        public void testAfterPropertySetter() throws Exception {
+            runTest("idea/testData/indentationOnNewline/AfterPropertySetter.after.kt");
+        }
+
         @TestMetadata("AfterTry.after.kt")
         public void testAfterTry() throws Exception {
             runTest("idea/testData/indentationOnNewline/AfterTry.after.kt");