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

Extract Function: Allow capturing local function references as lambda parameters

Browse Source
This commit is contained in:
Alexey Sedunov
2015-04-13 14:37:18 +03:00
parent 86bb0d5bc5
commit daebf569ab
17 changed files with 212 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/testData/refactoring/extractFunction/controlFlow/outputValues/tooManyOutputValuesAsList.kt
+1 -1
View File
@@ -1,5 +1,5 @@
// WITH_RUNTIME
// OPTIONS: true, true, false, false
// OPTIONS: true, true, false, false, false
// PARAM_TYPES: kotlin.Int
// PARAM_TYPES: kotlin.Int
// PARAM_TYPES: kotlin.Int
idea/testData/refactoring/extractFunction/controlFlow/outputValues/tooManyOutputValuesAsList.kt.after
+1 -1
View File
@@ -1,5 +1,5 @@
// WITH_RUNTIME
// OPTIONS: true, true, false, false
// OPTIONS: true, true, false, false, false
// PARAM_TYPES: kotlin.Int
// PARAM_TYPES: kotlin.Int
// PARAM_TYPES: kotlin.Int
idea/testData/refactoring/extractFunction/parameters/capturedFunctions/deeplyLocalFun.kt
+16
View File
@@ -0,0 +1,16 @@
// OPTIONS: true, false, false, false, true
// PARAM_DESCRIPTOR: local final fun baz(m: kotlin.Int): Int defined in foo.bar
// PARAM_DESCRIPTOR: value-parameter val n: kotlin.Int defined in foo
// PARAM_TYPES: (kotlin.Int) -> Int
// PARAM_TYPES: kotlin.Int
// SIBLING:
fun foo(n: Int): Int {
fun bar(): Int {
fun baz(m: Int) = m * n
return <selection>baz(n + 1)</selection>
}
return bar()
}
idea/testData/refactoring/extractFunction/parameters/capturedFunctions/deeplyLocalFun.kt.after
+18
View File
@@ -0,0 +1,18 @@
// OPTIONS: true, false, false, false, true
// PARAM_DESCRIPTOR: local final fun baz(m: kotlin.Int): Int defined in foo.bar
// PARAM_DESCRIPTOR: value-parameter val n: kotlin.Int defined in foo
// PARAM_TYPES: (kotlin.Int) -> Int
// PARAM_TYPES: kotlin.Int
// SIBLING:
fun foo(n: Int): Int {
fun bar(): Int {
fun baz(m: Int) = m * n
return i(::baz, n)
}
return bar()
}
private fun i(baz: (Int) -> Int, n: Int) = baz(n + 1)
idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFun.kt
+10
View File
@@ -0,0 +1,10 @@
// OPTIONS: true, false, false, false, true
// PARAM_DESCRIPTOR: local final fun kotlin.Int.bar(m: kotlin.Int): Int defined in foo
// PARAM_DESCRIPTOR: value-parameter val n: kotlin.Int defined in foo
// PARAM_TYPES: kotlin.Int.(kotlin.Int) -> Int
// PARAM_TYPES: kotlin.Int
fun foo(n: Int): Int {
fun Int.bar(m: Int) = this * m * n
return <selection>n.bar(n + 1)</selection>
}
idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFun.kt.after
+12
View File
@@ -0,0 +1,12 @@
// OPTIONS: true, false, false, false, true
// PARAM_DESCRIPTOR: local final fun kotlin.Int.bar(m: kotlin.Int): Int defined in foo
// PARAM_DESCRIPTOR: value-parameter val n: kotlin.Int defined in foo
// PARAM_TYPES: kotlin.Int.(kotlin.Int) -> Int
// PARAM_TYPES: kotlin.Int
fun foo(n: Int): Int {
fun Int.bar(m: Int) = this * m * n
return i(Int::bar, n)
}
private fun i(bar: Int.(Int) -> Int, n: Int) = n.bar(n + 1)
idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFunChainedCalls.kt
+13
View File
@@ -0,0 +1,13 @@
// OPTIONS: true, false, false, false, true
// PARAM_DESCRIPTOR: local final fun kotlin.Int.bar1(m: kotlin.Int): Int defined in foo
// PARAM_DESCRIPTOR: local final fun kotlin.Int.bar2(m: kotlin.Int): Int defined in foo
// PARAM_DESCRIPTOR: value-parameter val n: kotlin.Int defined in foo
// PARAM_TYPES: kotlin.Int.(kotlin.Int) -> Int
// PARAM_TYPES: kotlin.Int.(kotlin.Int) -> Int
// PARAM_TYPES: kotlin.Int
fun foo(n: Int): Int {
fun Int.bar1(m: Int) = this + m + n
fun Int.bar2(m: Int) = this * m * n
return <selection>n.bar1(n + 1).bar2(n + 2)</selection>
}
idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFunChainedCalls.kt.after
+15
View File
@@ -0,0 +1,15 @@
// OPTIONS: true, false, false, false, true
// PARAM_DESCRIPTOR: local final fun kotlin.Int.bar1(m: kotlin.Int): Int defined in foo
// PARAM_DESCRIPTOR: local final fun kotlin.Int.bar2(m: kotlin.Int): Int defined in foo
// PARAM_DESCRIPTOR: value-parameter val n: kotlin.Int defined in foo
// PARAM_TYPES: kotlin.Int.(kotlin.Int) -> Int
// PARAM_TYPES: kotlin.Int.(kotlin.Int) -> Int
// PARAM_TYPES: kotlin.Int
fun foo(n: Int): Int {
fun Int.bar1(m: Int) = this + m + n
fun Int.bar2(m: Int) = this * m * n
return i(Int::bar1, Int::bar2, n)
}
private fun i(bar1: Int.(Int) -> Int, bar2: Int.(Int) -> Int, n: Int) = n.bar1(n + 1).bar2(n + 2)
idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFunInfixCall.kt
+10
View File
@@ -0,0 +1,10 @@
// OPTIONS: true, false, false, false, true
// PARAM_DESCRIPTOR: local final fun kotlin.Int.bar(m: kotlin.Int): Int defined in foo
// PARAM_DESCRIPTOR: value-parameter val n: kotlin.Int defined in foo
// PARAM_TYPES: kotlin.Int.(kotlin.Int) -> Int
// PARAM_TYPES: kotlin.Int
fun foo(n: Int): Int {
fun Int.bar(m: Int) = this * m * n
return <selection>n bar (n + 1)</selection>
}
idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFunInfixCall.kt.after
+12
View File
@@ -0,0 +1,12 @@
// OPTIONS: true, false, false, false, true
// PARAM_DESCRIPTOR: local final fun kotlin.Int.bar(m: kotlin.Int): Int defined in foo
// PARAM_DESCRIPTOR: value-parameter val n: kotlin.Int defined in foo
// PARAM_TYPES: kotlin.Int.(kotlin.Int) -> Int
// PARAM_TYPES: kotlin.Int
fun foo(n: Int): Int {
fun Int.bar(m: Int) = this * m * n
return i(Int::bar, n)
}
private fun i(bar: Int.(Int) -> Int, n: Int) = n bar (n + 1)
idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localFun.kt
+10
View File
@@ -0,0 +1,10 @@
// OPTIONS: true, false, false, false, true
// PARAM_DESCRIPTOR: local final fun bar(m: kotlin.Int): Int defined in foo
// PARAM_DESCRIPTOR: value-parameter val n: kotlin.Int defined in foo
// PARAM_TYPES: (kotlin.Int) -> Int
// PARAM_TYPES: kotlin.Int
fun foo(n: Int): Int {
fun bar(m: Int) = m * n
return <selection>bar(n + 1)</selection>
}
idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localFun.kt.after
+12
View File
@@ -0,0 +1,12 @@
// OPTIONS: true, false, false, false, true
// PARAM_DESCRIPTOR: local final fun bar(m: kotlin.Int): Int defined in foo
// PARAM_DESCRIPTOR: value-parameter val n: kotlin.Int defined in foo
// PARAM_TYPES: (kotlin.Int) -> Int
// PARAM_TYPES: kotlin.Int
fun foo(n: Int): Int {
fun bar(m: Int) = m * n
return i(::bar, n)
}
private fun i(bar: (Int) -> Int, n: Int) = bar(n + 1)