azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Add indent before accessor for extension property (KT-33131)"

Browse Source 
This reverts commit ab34f8c7

^KT-42560 Fixed
This commit is contained in:
Dmitry Gridin
2020-10-09 19:44:50 +07:00
parent 852d705c71
commit 434139d986
7 changed files with 2 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/formatter/src/org/jetbrains/kotlin/idea/formatter/KotlinCommonBlock.kt
+2 -7
View File
@@ -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) {
idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/PerformanceTypingIndentationTestGenerated.java
Generated
-10
View File
@@ -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");
idea/testData/indentationOnNewline/AfterExtensionPropertyGetter.after.kt
Vendored
-5
View File
@@ -1,5 +0,0 @@
var String.foo: Int
get() = length
<caret>
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
idea/testData/indentationOnNewline/AfterExtensionPropertyGetter.kt
Vendored
-4
View File
@@ -1,4 +0,0 @@
var String.foo: Int
get() = length<caret>
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
idea/testData/indentationOnNewline/AfterExtensionPropertySetter.after.kt
Vendored
-5
View File
@@ -1,5 +0,0 @@
var String.foo: Int
set(value) {}
<caret>
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
idea/testData/indentationOnNewline/AfterExtensionPropertySetter.kt
Vendored
-4
View File
@@ -1,4 +0,0 @@
var String.foo: Int
set(value) {}<caret>
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
idea/tests/org/jetbrains/kotlin/formatter/TypingIndentationTestBaseGenerated.java
Generated
-10
View File
@@ -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");