From 434139d9864efc142013e20dd383db60846b7d38 Mon Sep 17 00:00:00 2001 From: Dmitry Gridin Date: Fri, 9 Oct 2020 19:44:50 +0700 Subject: [PATCH] Revert "Add indent before accessor for extension property (KT-33131)" This reverts commit ab34f8c7 ^KT-42560 Fixed --- .../kotlin/idea/formatter/KotlinCommonBlock.kt | 9 ++------- .../PerformanceTypingIndentationTestGenerated.java | 10 ---------- .../AfterExtensionPropertyGetter.after.kt | 5 ----- .../AfterExtensionPropertyGetter.kt | 4 ---- .../AfterExtensionPropertySetter.after.kt | 5 ----- .../AfterExtensionPropertySetter.kt | 4 ---- .../formatter/TypingIndentationTestBaseGenerated.java | 10 ---------- 7 files changed, 2 insertions(+), 45 deletions(-) delete mode 100644 idea/testData/indentationOnNewline/AfterExtensionPropertyGetter.after.kt delete mode 100644 idea/testData/indentationOnNewline/AfterExtensionPropertyGetter.kt delete mode 100644 idea/testData/indentationOnNewline/AfterExtensionPropertySetter.after.kt delete mode 100644 idea/testData/indentationOnNewline/AfterExtensionPropertySetter.kt diff --git a/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/KotlinCommonBlock.kt b/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/KotlinCommonBlock.kt index 955c6b1f37c..5f277403159 100644 --- a/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/KotlinCommonBlock.kt +++ b/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/KotlinCommonBlock.kt @@ -328,15 +328,10 @@ abstract class KotlinCommonBlock( } if (newChildIndex > 0) { - val prevNode = mySubBlocks?.get(newChildIndex - 1)?.node - if (prevNode?.elementType == MODIFIER_LIST) { + val prevBlock = mySubBlocks?.get(newChildIndex - 1) + if (prevBlock?.node?.elementType == MODIFIER_LIST) { return ChildAttributes(Indent.getNoneIndent(), null) } - val property = prevNode?.psi as? KtProperty - if (property?.receiverTypeReference != null && property.accessors.isNotEmpty()) { - val indent = if (type in CODE_BLOCKS) Indent.getContinuationIndent() else Indent.getNormalIndent() - return ChildAttributes(indent, null) - } } return when (type) { 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 f87fe017b12..6584c9bf744 100644 --- a/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/PerformanceTypingIndentationTestGenerated.java +++ b/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/PerformanceTypingIndentationTestGenerated.java @@ -34,16 +34,6 @@ 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"); diff --git a/idea/testData/indentationOnNewline/AfterExtensionPropertyGetter.after.kt b/idea/testData/indentationOnNewline/AfterExtensionPropertyGetter.after.kt deleted file mode 100644 index 31dbf30b9c2..00000000000 --- a/idea/testData/indentationOnNewline/AfterExtensionPropertyGetter.after.kt +++ /dev/null @@ -1,5 +0,0 @@ -var String.foo: Int - get() = length - - -// 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 deleted file mode 100644 index 189e5e6c3c1..00000000000 --- a/idea/testData/indentationOnNewline/AfterExtensionPropertyGetter.kt +++ /dev/null @@ -1,4 +0,0 @@ -var String.foo: Int - get() = length - -// 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 deleted file mode 100644 index a9529bc6136..00000000000 --- a/idea/testData/indentationOnNewline/AfterExtensionPropertySetter.after.kt +++ /dev/null @@ -1,5 +0,0 @@ -var String.foo: Int - set(value) {} - - -// 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 deleted file mode 100644 index 0958c27dc2c..00000000000 --- a/idea/testData/indentationOnNewline/AfterExtensionPropertySetter.kt +++ /dev/null @@ -1,4 +0,0 @@ -var String.foo: Int - set(value) {} - -// 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 432df1955f3..2e7c87e2ef7 100644 --- a/idea/tests/org/jetbrains/kotlin/formatter/TypingIndentationTestBaseGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/formatter/TypingIndentationTestBaseGenerated.java @@ -36,16 +36,6 @@ 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");