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

LineIndentProvider: temporarily disable before elvis operator

Browse Source 
#KT-39716 Fixed
This commit is contained in:
Dmitry Gridin
2020-06-23 15:16:44 +07:00
parent 793ada08a9
commit 9313073971
7 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/line-indent-provider/src/org/jetbrains/kotlin/idea/formatter/lineIndent/KotlinLikeLangLineIndentProvider.kt
+9 -8
View File
@@ -66,14 +66,15 @@ abstract class KotlinLikeLangLineIndentProvider : JavaLikeLangLineIndentProvider
before.isAt(BlockOpeningBrace) && before.beforeIgnoringWhiteSpaceOrComment().isFunctionDeclaration() -> before.isAt(BlockOpeningBrace) && before.beforeIgnoringWhiteSpaceOrComment().isFunctionDeclaration() ->
return factory.createIndentCalculator(Indent.getNormalIndent(), before.startOffset) return factory.createIndentCalculator(Indent.getNormalIndent(), before.startOffset)
after.isAt(Quest) && after.after().isAt(Colon) -> { // KT-39716
val indent = if (settings.continuationIndentInElvis) // after.isAt(Quest) && after.after().isAt(Colon) -> {
Indent.getContinuationIndent() // val indent = if (settings.continuationIndentInElvis)
else // Indent.getContinuationIndent()
Indent.getNormalIndent() // else
// Indent.getNormalIndent()
return factory.createIndentCalculator(indent, before.startOffset) //
} // return factory.createIndentCalculator(indent, before.startOffset)
// }
before.isAt(Colon) && before.before().isAt(Quest) -> before.isAt(Colon) && before.before().isAt(Quest) ->
return factory.createIndentCalculator(Indent.getNoneIndent(), before.startOffset) return factory.createIndentCalculator(Indent.getNoneIndent(), before.startOffset)
idea/testData/indentationOnNewline/elvis/BeforeElvis.after.inv.kt
Vendored
+2 -1
View File
@@ -3,4 +3,5 @@ fun test(some: Any?, error: Int) {
<caret>?: error <caret>?: error
} }
// SET_FALSE: CONTINUATION_INDENT_IN_ELVIS // SET_FALSE: CONTINUATION_INDENT_IN_ELVIS
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
idea/testData/indentationOnNewline/elvis/BeforeElvis.after.kt
Vendored
+2 -1
View File
@@ -3,4 +3,5 @@ fun test(some: Any?, error: Int) {
<caret>?: error <caret>?: error
} }
// SET_FALSE: CONTINUATION_INDENT_IN_ELVIS // SET_FALSE: CONTINUATION_INDENT_IN_ELVIS
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
idea/testData/indentationOnNewline/elvis/BeforeElvis.kt
Vendored
+2 -1
View File
@@ -2,4 +2,5 @@ fun test(some: Any?, error: Int) {
val test = some <caret>?: error val test = some <caret>?: error
} }
// SET_FALSE: CONTINUATION_INDENT_IN_ELVIS // SET_FALSE: CONTINUATION_INDENT_IN_ELVIS
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
idea/testData/indentationOnNewline/elvis/BeforeElvisInBinaryExpression.after.inv.kt
Vendored
+2 -1
View File
@@ -3,4 +3,5 @@ fun a() {
<caret>?: 2) <caret>?: 2)
} }
// SET_FALSE: CONTINUATION_INDENT_IN_ELVIS // SET_FALSE: CONTINUATION_INDENT_IN_ELVIS
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
idea/testData/indentationOnNewline/elvis/BeforeElvisInBinaryExpression.after.kt
Vendored
+2 -1
View File
@@ -3,4 +3,5 @@ fun a() {
<caret>?: 2) <caret>?: 2)
} }
// SET_FALSE: CONTINUATION_INDENT_IN_ELVIS // SET_FALSE: CONTINUATION_INDENT_IN_ELVIS
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
idea/testData/indentationOnNewline/elvis/BeforeElvisInBinaryExpression.kt
Vendored
+2 -1
View File
@@ -2,4 +2,5 @@ fun a() {
println(1 + null <caret>?: 2) println(1 + null <caret>?: 2)
} }
// SET_FALSE: CONTINUATION_INDENT_IN_ELVIS // SET_FALSE: CONTINUATION_INDENT_IN_ELVIS
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER