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

tests: apply official code style

Browse Source 
#KT-38632 Fixed
This commit is contained in:
Dmitry Gridin
2020-04-28 15:51:57 +07:00
parent d8f9643650
commit 11a3482970
406 changed files with 1785 additions and 1525 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/testData/inspectionsLocal/branched/ifThenToElvis/ifToElvisSwallowComments.kt.after
Vendored
+2 -2
View File
@@ -1,6 +1,6 @@
fun foo(arg: Any): Int {
// 1
return arg as? Int
// 2
?: 10
// 2
?: 10
}
idea/testData/inspectionsLocal/branched/ifThenToElvis/longLine.kt.after
Vendored
+1 -1
View File
@@ -6,5 +6,5 @@ val xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
fun main() {
val c = xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
?: "abcdfdfdfdfdfdfdfdfdfdfdfdfdfdfdfdfdfdfdfdf"
?: "abcdfdfdfdfdfdfdfdfdfdfdfdfdfdfdfdfdfdfdfdf"
}
idea/testData/inspectionsLocal/collections/convertCallChainIntoSequence/allTransformations.kt.after
Vendored
+33 -33
View File
@@ -2,37 +2,37 @@
fun test(list: List<Int>): List<Pair<IndexedValue<List<Int>>, IndexedValue<List<Int>>>> {
return list
.asSequence()
.chunked(1)
.distinct()
.distinctBy { it }
.drop(1)
.dropWhile { true }
.filter { true }
.filterIndexed { index, list -> true }
.filterIsInstance<Int>()
.filterNot { true }
.filterNotNull()
.map { it }
.mapIndexed { index, i -> i }
.mapIndexedNotNull { index, i -> i }
.mapNotNull { it }
.minus(1)
.minusElement(1)
.onEach {}
.plus(1)
.plusElement(1)
.requireNoNulls()
.sorted()
.sortedBy { it }
.sortedByDescending { it }
.sortedDescending()
.sortedWith(Comparator { o1, o2 -> 0 })
.take(1)
.takeWhile { true }
.windowed(1, 1, true)
.withIndex()
.zipWithNext()
.zipWithNext { a, b -> a }
.toList()
.asSequence()
.chunked(1)
.distinct()
.distinctBy { it }
.drop(1)
.dropWhile { true }
.filter { true }
.filterIndexed { index, list -> true }
.filterIsInstance<Int>()
.filterNot { true }
.filterNotNull()
.map { it }
.mapIndexed { index, i -> i }
.mapIndexedNotNull { index, i -> i }
.mapNotNull { it }
.minus(1)
.minusElement(1)
.onEach {}
.plus(1)
.plusElement(1)
.requireNoNulls()
.sorted()
.sortedBy { it }
.sortedByDescending { it }
.sortedDescending()
.sortedWith(Comparator { o1, o2 -> 0 })
.take(1)
.takeWhile { true }
.windowed(1, 1, true)
.withIndex()
.zipWithNext()
.zipWithNext { a, b -> a }
.toList()
}
idea/testData/inspectionsLocal/collections/convertCallChainIntoSequence/comment.kt
Vendored
+3 -3
View File
@@ -2,7 +2,7 @@
fun test(list: List<Int>): Int {
return list // comment1
.<caret>filter { it > 1 } // comment2
.map { it * 2 } // comment3
.sum() // comment4
.<caret>filter { it > 1 } // comment2
.map { it * 2 } // comment3
.sum() // comment4
}
idea/testData/inspectionsLocal/collections/convertCallChainIntoSequence/comment.kt.after
Vendored
+4 -4
View File
@@ -2,8 +2,8 @@
fun test(list: List<Int>): Int {
return list // comment1
.asSequence()
.filter { it > 1 } // comment2
.map { it * 2 } // comment3
.sum() // comment4
.asSequence()
.filter { it > 1 } // comment2
.map { it * 2 } // comment3
.sum() // comment4
}
idea/testData/inspectionsLocal/collections/convertCallChainIntoSequence/comment2.kt
Vendored
+2 -2
View File
@@ -2,6 +2,6 @@
fun test(list: List<Int>): List<Int> {
return list // comment1
.<caret>filter { it > 1 } // comment2
.map { it * 2 } // comment3
.<caret>filter { it > 1 } // comment2
.map { it * 2 } // comment3
}
idea/testData/inspectionsLocal/collections/convertCallChainIntoSequence/comment2.kt.after
Vendored
+4 -4
View File
@@ -2,8 +2,8 @@
fun test(list: List<Int>): List<Int> {
return list // comment1
.asSequence()
.filter { it > 1 } // comment2
.map { it * 2 }
.toList() // comment3
.asSequence()
.filter { it > 1 } // comment2
.map { it * 2 }
.toList() // comment3
}
idea/testData/inspectionsLocal/collections/convertCallChainIntoSequence/noTargetTermination.kt
Vendored
+3 -3
View File
@@ -2,7 +2,7 @@
fun test(list: List<List<Int>>): List<Int> {
return list
.<caret>filter { it.count() > 2 }
.map { it + it }
.flatMap { it + it }
.<caret>filter { it.count() > 2 }
.map { it + it }
.flatMap { it + it }
}
idea/testData/inspectionsLocal/collections/convertCallChainIntoSequence/noTargetTermination.kt.after
Vendored
+5 -5
View File
@@ -2,9 +2,9 @@
fun test(list: List<List<Int>>): List<Int> {
return list
.asSequence()
.filter { it.count() > 2 }
.map { it + it }
.toList()
.flatMap { it + it }
.asSequence()
.filter { it.count() > 2 }
.map { it + it }
.toList()
.flatMap { it + it }
}
idea/testData/inspectionsLocal/collections/convertCallChainIntoSequence/noTargetTermination2.kt
Vendored
+5 -5
View File
@@ -2,9 +2,9 @@
fun test(): Int {
return listOf(1, 2, 3)
.<caret>filter { it > 1 }
.map { it * 2 }
.let {
it.binarySearch(1)
}
.<caret>filter { it > 1 }
.map { it * 2 }
.let {
it.binarySearch(1)
}
}
idea/testData/inspectionsLocal/collections/convertCallChainIntoSequence/noTargetTermination2.kt.after
Vendored
+7 -7
View File
@@ -2,11 +2,11 @@
fun test(): Int {
return listOf(1, 2, 3)
.asSequence()
.filter { it > 1 }
.map { it * 2 }
.toList()
.let {
it.binarySearch(1)
}
.asSequence()
.filter { it > 1 }
.map { it * 2 }
.toList()
.let {
it.binarySearch(1)
}
}
idea/testData/inspectionsLocal/collections/convertCallChainIntoSequence/nullable.kt.after
Vendored
+4 -4
View File
@@ -2,8 +2,8 @@
fun test(list: List<Int>?): List<Int>? {
return list
?.asSequence()
?.filter { it > 1 }
?.map { it * 2 }
?.toList()
?.asSequence()
?.filter { it > 1 }
?.map { it * 2 }
?.toList()
}
idea/testData/inspectionsLocal/collections/convertCallChainIntoSequence/returnAtLabels.kt.after
Vendored
+7 -7
View File
@@ -2,11 +2,11 @@
fun test(list: List<Int>): List<Int> {
return list
.asSequence()
.filter { it > 1 }
.mapNotNull {
if (it == 2) return@mapNotNull null
it * 2
}
.toList()
.asSequence()
.filter { it > 1 }
.mapNotNull {
if (it == 2) return@mapNotNull null
it * 2
}
.toList()
}
idea/testData/inspectionsLocal/collections/convertCallChainIntoSequence/simple.kt.after
Vendored
+2 -1
View File
@@ -3,5 +3,6 @@
// WITH_RUNTIME
fun test(): List<Int> {
return listOf(1, 2, 3).asSequence().filter { it > 1 }.map { it * 2 }.map { it * 3 }.map { it * 4 }.map { it * 5 }.toList()
return listOf(1, 2, 3).asSequence().filter { it > 1 }.map { it * 2 }.map { it * 3 }.map { it * 4 }.map { it * 5 }
.toList()
}
idea/testData/inspectionsLocal/collections/convertCallChainIntoSequence/simple2.kt
Vendored
+4 -4
View File
@@ -3,8 +3,8 @@
fun test(list: List<Int>): List<Int> {
return list
.filter<caret> { it > 1 }
.map { it * 2 }
.map { it * 3 }
.map { it * 4 }
.filter<caret> { it > 1 }
.map { it * 2 }
.map { it * 3 }
.map { it * 4 }
}
idea/testData/inspectionsLocal/collections/convertCallChainIntoSequence/simple2.kt.after
Vendored
+6 -6
View File
@@ -3,10 +3,10 @@
fun test(list: List<Int>): List<Int> {
return list
.asSequence()
.filter { it > 1 }
.map { it * 2 }
.map { it * 3 }
.map { it * 4 }
.toList()
.asSequence()
.filter { it > 1 }
.map { it * 2 }
.map { it * 3 }
.map { it * 4 }
.toList()
}
idea/testData/inspectionsLocal/collections/convertCallChainIntoSequence/simple3.kt
Vendored
+5 -5
View File
@@ -2,9 +2,9 @@
fun test(list: List<Int>): List<Int> {
return list
.reversed()
.<caret>map { it + 1 }
.map { it + 1 }
.dropLast(1)
.takeLast(2)
.reversed()
.<caret>map { it + 1 }
.map { it + 1 }
.dropLast(1)
.takeLast(2)
}
idea/testData/inspectionsLocal/collections/convertCallChainIntoSequence/simple3.kt.after
Vendored
+8 -8
View File
@@ -2,11 +2,11 @@
fun test(list: List<Int>): List<Int> {
return list
.reversed()
.asSequence()
.map { it + 1 }
.map { it + 1 }
.toList()
.dropLast(1)
.takeLast(2)
}
.reversed()
.asSequence()
.map { it + 1 }
.map { it + 1 }
.toList()
.dropLast(1)
.takeLast(2)
}
idea/testData/inspectionsLocal/collections/convertCallChainIntoSequence/simple4.kt.after
Vendored
+4 -4
View File
@@ -2,10 +2,10 @@
fun test(foo: Foo): List<Int> {
return foo.getList()
.asSequence()
.filter { it > 1 }
.map { it * 2 }
.toList()
.asSequence()
.filter { it > 1 }
.map { it * 2 }
.toList()
}
class Foo {
idea/testData/inspectionsLocal/collections/convertCallChainIntoSequence/termination/filterIndexedTo.kt.after
Vendored
+2 -1
View File
@@ -1,5 +1,6 @@
// WITH_RUNTIME
fun test(list: List<Int>) {
val filterIndexedTo: MutableList<Int> = list.asSequence().filter { it > 1 }.filterIndexedTo(mutableListOf()) { index, it -> true }
val filterIndexedTo: MutableList<Int> = list.asSequence().filter { it > 1 }
.filterIndexedTo(mutableListOf()) { index, it -> true }
}
idea/testData/inspectionsLocal/collections/convertCallChainIntoSequence/termination/mapIndexedNotNullTo.kt.after
Vendored
+2 -1
View File
@@ -1,5 +1,6 @@
// WITH_RUNTIME
fun test(list: List<Int>) {
val mapIndexedNotNullTo: MutableList<Int> = list.asSequence().filter { it > 1 }.mapIndexedNotNullTo(mutableListOf()) { index, i -> i }
val mapIndexedNotNullTo: MutableList<Int> = list.asSequence().filter { it > 1 }
.mapIndexedNotNullTo(mutableListOf()) { index, i -> i }
}
idea/testData/inspectionsLocal/collections/simplifiableCallChain/joinToStringWithReferenceAndComment.kt.after
Vendored
+8 -8
View File
@@ -1,12 +1,12 @@
// WITH_RUNTIME
val x = listOf(1, 2, 3).joinToString(
// comment2
prefix = "= ",
// comment3
separator = " + "
// comment4
,
// comment1
transform = Int::toString
// comment2
prefix = "= ",
// comment3
separator = " + "
// comment4
,
// comment1
transform = Int::toString
)
idea/testData/inspectionsLocal/collections/simplifiableCallChain/joinToWithComment.kt.after
Vendored
+7 -7
View File
@@ -2,11 +2,11 @@
val sb = StringBuilder()
val x = listOf(1, 2, 3).joinTo(
// comment1
buffer = sb,
// comment2
prefix = "= ",
// comment3
separator = " + "
// comment4
// comment1
buffer = sb,
// comment2
prefix = "= ",
// comment3
separator = " + "
// comment4
) { "$it*$it" }
idea/testData/inspectionsLocal/collections/simplifiableCallChain/listOfNotNullWithComment.kt.after
Vendored
+2 -2
View File
@@ -2,7 +2,7 @@
fun test() {
<caret>listOfNotNull(
true, // comment1
null // comment2
true, // comment1
null // comment2
).first()
}
idea/testData/inspectionsLocal/collections/simplifiableCallChain/saveComment.kt.after
Vendored
+1 -1
View File
@@ -1,3 +1,3 @@
// WITH_RUNTIME
val v1 = // Some Comment
listOf(1, 2, 3, 11, 33, 25, 100).any { it % 2 == 0 } // Some Additional Comment
listOf(1, 2, 3, 11, 33, 25, 100).any { it % 2 == 0 } // Some Additional Comment
idea/testData/inspectionsLocal/collections/simplifiableCallChain/saveComment2.kt.after
Vendored
+1 -1
View File
@@ -1,3 +1,3 @@
// WITH_RUNTIME
val v1 = // Some Comment
listOf(1, 2, 3, 11, 33, 25, 100).any { it % 2 == 0 }
listOf(1, 2, 3, 11, 33, 25, 100).any { it % 2 == 0 }
idea/testData/inspectionsLocal/foldInitializerAndIfToElvis/CommentInBlock.kt.after
Vendored
+2 -2
View File
@@ -1,6 +1,6 @@
fun foo(p: List<String?>): Int {
val v = p[0]
?: // return -1 if null
<caret>return -1
?: // return -1 if null
<caret>return -1
return v.length
}
idea/testData/inspectionsLocal/foldInitializerAndIfToElvis/Comments2.kt.after
Vendored
+3 -3
View File
@@ -1,8 +1,8 @@
fun foo(p: List<String?>): Int {
val v = p[0]
?: // v is null
// we should do something with it
return -1 // let's return -1
?: // v is null
// we should do something with it
return -1 // let's return -1
// end of if
return v.length
}
idea/testData/inspectionsLocal/foldInitializerAndIfToElvis/LongName.kt.after
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
fun foo(): Any {
val yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy = 7
val xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx = 24
?: return yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy
?: return yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy
return 42
}
idea/testData/inspectionsLocal/migrateDiagnosticSuppression/multiple.kt
Vendored
+3 -3
View File
@@ -1,6 +1,6 @@
@Suppress(
"HEADER_CLASS_CONSTRUCTOR_DELEGATION_CALL",
<caret>"HEADER_CLASS_CONSTRUCTOR_PROPERTY_PARAMETER",
"HEADER_ENUM_CONSTRUCTOR"
"HEADER_CLASS_CONSTRUCTOR_DELEGATION_CALL",
<caret>"HEADER_CLASS_CONSTRUCTOR_PROPERTY_PARAMETER",
"HEADER_ENUM_CONSTRUCTOR"
)
class Dummy
idea/testData/inspectionsLocal/migrateDiagnosticSuppression/multiple.kt.after
Vendored
+3 -3
View File
@@ -1,6 +1,6 @@
@Suppress(
"HEADER_CLASS_CONSTRUCTOR_DELEGATION_CALL",
"EXPECTED_CLASS_CONSTRUCTOR_PROPERTY_PARAMETER",
"HEADER_ENUM_CONSTRUCTOR"
"HEADER_CLASS_CONSTRUCTOR_DELEGATION_CALL",
"EXPECTED_CLASS_CONSTRUCTOR_PROPERTY_PARAMETER",
"HEADER_ENUM_CONSTRUCTOR"
)
class Dummy
idea/testData/inspectionsLocal/trailingComma/addComma.kt.after
Vendored
+2 -2
View File
@@ -2,6 +2,6 @@
// FIX: Add trailing comma
fun a(
i: Int,
b: Boolean,
i: Int,
b: Boolean,
) = Unit
idea/testData/inspectionsLocal/trailingComma/addComma2.kt.after
Vendored
+2 -2
View File
@@ -2,6 +2,6 @@
// FIX: Add trailing comma
fun a(
i: Int,
b: Boolean,
i: Int,
b: Boolean,
) = Unit
idea/testData/inspectionsLocal/trailingComma/addComma5.kt.after
Vendored
+2 -2
View File
@@ -2,6 +2,6 @@
// FIX: Add trailing comma
fun a(
i: Int,
b: Boolean,
i: Int,
b: Boolean,
) = Unit
idea/testData/inspectionsLocal/trailingComma/addComma6.kt.after
Vendored
+3 -3
View File
@@ -2,9 +2,9 @@
// FIX: Add trailing comma
val x = {
x: String,
y
: String,
x: String,
y
: String,
->
val a = 2
}
idea/testData/inspectionsLocal/trailingComma/changeCommaPosition.kt.after
Vendored
+2 -2
View File
@@ -2,7 +2,7 @@
// FIX: Fix comma position
fun a(
i: Int, /*
i: Int, /*
*/
b: Boolean,
b: Boolean,
) = Unit
idea/testData/inspectionsLocal/trailingComma/changeCommaPosition2.kt.after
Vendored
+2 -2
View File
@@ -2,7 +2,7 @@
// FIX: Fix comma position
fun a(
i: Int, /*
i: Int, /*
*/
b: Boolean,
b: Boolean,
) = Unit
idea/testData/inspectionsLocal/trailingComma/changeCommaPosition5.kt.after
Vendored
+2 -2
View File
@@ -2,8 +2,8 @@
// FIX: Fix comma position
val x = {
x: Comparable<Comparable<Number>>,
y: String,
x: Comparable<Comparable<Number>>,
y: String,
->
val a = 42
}
idea/testData/inspectionsLocal/trailingComma/missingLineBreak.kt.after
Vendored
+2 -2
View File
@@ -2,6 +2,6 @@
// FIX: Add line break
fun a(
i: Int,
b: Boolean,
i: Int,
b: Boolean,
) = Unit
idea/testData/inspectionsLocal/trailingComma/missingLineBreak2.kt.after
Vendored
+2 -2
View File
@@ -2,6 +2,6 @@
// FIX: Add line break
fun a(
i: Int,
b: Boolean,
i: Int,
b: Boolean,
) = Unit
idea/testData/inspectionsLocal/trailingComma/missingLineBreak3.kt.after
Vendored
+2 -2
View File
@@ -2,6 +2,6 @@
// FIX: Add line break
fun a(
i: Int,
b: Boolean,
i: Int,
b: Boolean,
) = Unit
idea/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/keepComments/2.kt.after
Vendored
+1 -1
View File
@@ -1,2 +1,2 @@
fun getText(): String =// let's return xxx
"xxx" //TODO
"xxx" //TODO
idea/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/keepComments/3.kt.after
Vendored
+1 -1
View File
@@ -1,2 +1,2 @@
fun getText(): String =// let's return xxx
"xxx"
"xxx"
idea/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/keepComments/4.kt.after
Vendored
+1 -1
View File
@@ -1,2 +1,2 @@
fun getText(): String =/* let's return xxx */
"xxx" /* TODO */
"xxx" /* TODO */
idea/testData/inspectionsLocal/useExpressionBody/if.kt.after
Vendored
+6 -6
View File
@@ -1,9 +1,9 @@
// HIGHLIGHT: INFORMATION
fun abs(x: Int): Int =// No highlighting here
if (x > 0) {
x
}
else {
-x
}
if (x > 0) {
x
}
else {
-x
}
idea/testData/inspectionsLocal/useExpressionBody/veryVeryLong.kt.after
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
fun foo(s1: String, s2: String) = s1 + s2
fun bar(): String =
foo("gjahkrgkjuyrtetyuairytoiuyareoihuyitouy897304hkdjgnba", "uiyiuye987130423toiuywtuiyrwityriwyhw")
foo("gjahkrgkjuyrtetyuairytoiuyareoihuyitouy897304hkdjgnba", "uiyiuye987130423toiuywtuiyrwityriwyhw")