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

Replace not debug usages of DescriptorRenderer.DEBUG_TEXT to DescriptorRenderer.FQ_NAMES_IN_TYPES.

Browse Source
This commit is contained in:
Stanislav Erokhin
2016-05-25 00:25:37 +03:00
parent 710e920df7
commit 4b9aac6318
65 changed files with 92 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/pseudocodeUtils.kt
+1 -1
View File
@@ -92,7 +92,7 @@ fun getExpectedTypePredicate(
val candidates = callee.getReferenceTargets(bindingContext)
.filterIsInstance<FunctionDescriptor>()
.sortedBy { DescriptorRenderer.DEBUG_TEXT.render(it) }
.sortedBy { DescriptorRenderer.FQ_NAMES_IN_TYPES.render(it) }
if (candidates.isEmpty()) return null
val explicitReceiver = call.getExplicitReceiver()
idea/ide-common/src/org/jetbrains/kotlin/idea/util/psi/patternMatching/KotlinPsiUnifier.kt
+1 -1
View File
@@ -350,7 +350,7 @@ class KotlinPsiUnifier(
}
private fun matchTypes(types1: Collection<KotlinType>, types2: Collection<KotlinType>): Boolean {
fun sortTypes(types: Collection<KotlinType>) = types.sortedBy { DescriptorRenderer.DEBUG_TEXT.renderType(it) }
fun sortTypes(types: Collection<KotlinType>) = types.sortedBy { DescriptorRenderer.FQ_NAMES_IN_TYPES.renderType(it) }
if (types1.size != types2.size) return false
return (sortTypes(types1).zip(sortTypes(types2))).all { matchTypes(it.first, it.second) == MATCHED }
idea/testData/refactoring/extractFunction/basic/callWithPlatformTypeReceiver.kt
Vendored
+2 -2
View File
@@ -1,7 +1,7 @@
// WITH_RUNTIME
// SUGGESTED_RETURN_TYPES: kotlin.Boolean?, kotlin.Boolean
// PARAM_DESCRIPTOR: value-parameter it: kotlin.collections.Map.Entry<(Boolean..Boolean?), (Boolean..Boolean?)> defined in test.<anonymous>
// PARAM_TYPES: kotlin.collections.Map.Entry<(Boolean..Boolean?), (Boolean..Boolean?)>
// PARAM_DESCRIPTOR: value-parameter it: kotlin.collections.Map.Entry<kotlin.Boolean!, kotlin.Boolean!> defined in test.<anonymous>
// PARAM_TYPES: kotlin.collections.Map.Entry<kotlin.Boolean!, kotlin.Boolean!>
fun test() {
J.getMap().filter { <selection>it.key</selection> }
}
idea/testData/refactoring/extractFunction/basic/callWithPlatformTypeReceiver.kt.after
Vendored
+2 -2
View File
@@ -1,7 +1,7 @@
// WITH_RUNTIME
// SUGGESTED_RETURN_TYPES: kotlin.Boolean?, kotlin.Boolean
// PARAM_DESCRIPTOR: value-parameter it: kotlin.collections.Map.Entry<(Boolean..Boolean?), (Boolean..Boolean?)> defined in test.<anonymous>
// PARAM_TYPES: kotlin.collections.Map.Entry<(Boolean..Boolean?), (Boolean..Boolean?)>
// PARAM_DESCRIPTOR: value-parameter it: kotlin.collections.Map.Entry<kotlin.Boolean!, kotlin.Boolean!> defined in test.<anonymous>
// PARAM_TYPES: kotlin.collections.Map.Entry<kotlin.Boolean!, kotlin.Boolean!>
fun test() {
J.getMap().filter { b(it) }
}
idea/testData/refactoring/extractFunction/basic/extensionFunForArray.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// PARAM_TYPES: kotlin.Array<T>, Cloneable, java.io.Serializable, Any
// PARAM_TYPES: kotlin.Array<T>, kotlin.Cloneable, java.io.Serializable, kotlin.Any
// PARAM_DESCRIPTOR: public fun <T> kotlin.Array<T>.test(): kotlin.Unit defined in root package
// SIBLING:
fun <T> Array<T>.test() {
idea/testData/refactoring/extractFunction/basic/extensionFunForArray.kt.after
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// PARAM_TYPES: kotlin.Array<T>, Cloneable, java.io.Serializable, Any
// PARAM_TYPES: kotlin.Array<T>, kotlin.Cloneable, java.io.Serializable, kotlin.Any
// PARAM_DESCRIPTOR: public fun <T> kotlin.Array<T>.test(): kotlin.Unit defined in root package
// SIBLING:
fun <T> Array<T>.test() {
idea/testData/refactoring/extractFunction/basic/identityEquals.kt
Vendored
+2 -2
View File
@@ -1,8 +1,8 @@
// SUGGESTED_NAMES: b, getT
// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in test
// PARAM_DESCRIPTOR: value-parameter b: kotlin.Int defined in test
// PARAM_TYPES: kotlin.Int, Number, Comparable<Int>, java.io.Serializable, Any
// PARAM_TYPES: kotlin.Int, Number, Comparable<Int>, java.io.Serializable, Any
// PARAM_TYPES: kotlin.Int, kotlin.Number, kotlin.Comparable<kotlin.Int>, java.io.Serializable, kotlin.Any
// PARAM_TYPES: kotlin.Int, kotlin.Number, kotlin.Comparable<kotlin.Int>, java.io.Serializable, kotlin.Any
fun test(a: Int, b: Int): Boolean {
val t = <selection>a === b</selection>
idea/testData/refactoring/extractFunction/basic/identityEquals.kt.after
Vendored
+2 -2
View File
@@ -1,8 +1,8 @@
// SUGGESTED_NAMES: b, getT
// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in test
// PARAM_DESCRIPTOR: value-parameter b: kotlin.Int defined in test
// PARAM_TYPES: kotlin.Int, Number, Comparable<Int>, java.io.Serializable, Any
// PARAM_TYPES: kotlin.Int, Number, Comparable<Int>, java.io.Serializable, Any
// PARAM_TYPES: kotlin.Int, kotlin.Number, kotlin.Comparable<kotlin.Int>, java.io.Serializable, kotlin.Any
// PARAM_TYPES: kotlin.Int, kotlin.Number, kotlin.Comparable<kotlin.Int>, java.io.Serializable, kotlin.Any
fun test(a: Int, b: Int): Boolean {
val t = b(a, b)
idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithIf.kt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
// PARAM_TYPES: kotlin.Int
// PARAM_TYPES: kotlin.Int, Number, Comparable<Int>, java.io.Serializable, Any
// PARAM_TYPES: kotlin.Int, kotlin.Number, kotlin.Comparable<kotlin.Int>, java.io.Serializable, kotlin.Any
// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo
// PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo
fun bar(a: Int): Int {
idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithIf.kt.after
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
// PARAM_TYPES: kotlin.Int
// PARAM_TYPES: kotlin.Int, Number, Comparable<Int>, java.io.Serializable, Any
// PARAM_TYPES: kotlin.Int, kotlin.Number, kotlin.Comparable<kotlin.Int>, java.io.Serializable, kotlin.Any
// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo
// PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo
fun bar(a: Int): Int {
idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithIfNoBlocks.kt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
// PARAM_TYPES: kotlin.Int
// PARAM_TYPES: kotlin.Int, Number, Comparable<Int>, java.io.Serializable, Any
// PARAM_TYPES: kotlin.Int, kotlin.Number, kotlin.Comparable<kotlin.Int>, java.io.Serializable, kotlin.Any
// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo
// PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo
fun bar(a: Int): Int {
idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithIfNoBlocks.kt.after
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
// PARAM_TYPES: kotlin.Int
// PARAM_TYPES: kotlin.Int, Number, Comparable<Int>, java.io.Serializable, Any
// PARAM_TYPES: kotlin.Int, kotlin.Number, kotlin.Comparable<kotlin.Int>, java.io.Serializable, kotlin.Any
// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo
// PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo
fun bar(a: Int): Int {
idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithWhen.kt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
// PARAM_TYPES: kotlin.Int
// PARAM_TYPES: kotlin.Int, Number, Comparable<Int>, java.io.Serializable, Any
// PARAM_TYPES: kotlin.Int, kotlin.Number, kotlin.Comparable<kotlin.Int>, java.io.Serializable, kotlin.Any
// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo
// PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo
fun bar(a: Int): Int {
idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithWhen.kt.after
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
// PARAM_TYPES: kotlin.Int
// PARAM_TYPES: kotlin.Int, Number, Comparable<Int>, java.io.Serializable, Any
// PARAM_TYPES: kotlin.Int, kotlin.Number, kotlin.Comparable<kotlin.Int>, java.io.Serializable, kotlin.Any
// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo
// PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo
fun bar(a: Int): Int {
idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithWhenNoBlocks.kt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
// PARAM_TYPES: kotlin.Int
// PARAM_TYPES: kotlin.Int, Number, Comparable<Int>, java.io.Serializable, Any
// PARAM_TYPES: kotlin.Int, kotlin.Number, kotlin.Comparable<kotlin.Int>, java.io.Serializable, kotlin.Any
// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo
// PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo
fun bar(a: Int): Int {
idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithWhenNoBlocks.kt.after
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
// PARAM_TYPES: kotlin.Int
// PARAM_TYPES: kotlin.Int, Number, Comparable<Int>, java.io.Serializable, Any
// PARAM_TYPES: kotlin.Int, kotlin.Number, kotlin.Comparable<kotlin.Int>, java.io.Serializable, kotlin.Any
// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo
// PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo
fun bar(a: Int): Int {
idea/testData/refactoring/extractFunction/controlFlow/exitPointEquivalence/defaultAndReturnInWhen.kt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
// WITH_RUNTIME
// PARAM_TYPES: kotlin.Int, Comparable<Int>
// PARAM_TYPES: kotlin.Int, kotlin.Comparable<kotlin.Int>
// PARAM_DESCRIPTOR: value-parameter i: kotlin.Int defined in example
fun example(i: Int) {
when (i) {
idea/testData/refactoring/extractFunction/controlFlow/exitPointEquivalence/defaultAndReturnInWhen.kt.after
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
// WITH_RUNTIME
// PARAM_TYPES: kotlin.Int, Comparable<Int>
// PARAM_TYPES: kotlin.Int, kotlin.Comparable<kotlin.Int>
// PARAM_DESCRIPTOR: value-parameter i: kotlin.Int defined in example
fun example(i: Int) {
when (i) {
idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithIf.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// PARAM_TYPES: kotlin.Int, Comparable<Int>
// PARAM_TYPES: kotlin.Int, kotlin.Comparable<kotlin.Int>
// PARAM_TYPES: kotlin.Int
// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo
// PARAM_DESCRIPTOR: var b: kotlin.Int defined in foo
idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithIf.kt.after
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// PARAM_TYPES: kotlin.Int, Comparable<Int>
// PARAM_TYPES: kotlin.Int, kotlin.Comparable<kotlin.Int>
// PARAM_TYPES: kotlin.Int
// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo
// PARAM_DESCRIPTOR: var b: kotlin.Int defined in foo
idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithWhen.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// PARAM_TYPES: kotlin.Int, Comparable<Int>
// PARAM_TYPES: kotlin.Int, kotlin.Comparable<kotlin.Int>
// PARAM_TYPES: kotlin.Int
// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo
// PARAM_DESCRIPTOR: var b: kotlin.Int defined in foo
idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithWhen.kt.after
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// PARAM_TYPES: kotlin.Int, Comparable<Int>
// PARAM_TYPES: kotlin.Int, kotlin.Comparable<kotlin.Int>
// PARAM_TYPES: kotlin.Int
// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo
// PARAM_DESCRIPTOR: var b: kotlin.Int defined in foo
idea/testData/refactoring/extractFunction/duplicates/notNullAssertion.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// PARAM_TYPES: kotlin.String?, kotlin.Comparable<String>?, kotlin.CharSequence?, java.io.Serializable?, kotlin.Any?
// PARAM_TYPES: kotlin.String?, kotlin.Comparable<kotlin.String>?, kotlin.CharSequence?, java.io.Serializable?, kotlin.Any?
// PARAM_DESCRIPTOR: val s: kotlin.String? defined in foo
// SIBLING:
idea/testData/refactoring/extractFunction/duplicates/notNullAssertion.kt.after
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// PARAM_TYPES: kotlin.String?, kotlin.Comparable<String>?, kotlin.CharSequence?, java.io.Serializable?, kotlin.Any?
// PARAM_TYPES: kotlin.String?, kotlin.Comparable<kotlin.String>?, kotlin.CharSequence?, java.io.Serializable?, kotlin.Any?
// PARAM_DESCRIPTOR: val s: kotlin.String? defined in foo
// SIBLING:
idea/testData/refactoring/extractFunction/parameters/candidateTypes/flexibleTypesWithNull.kt
Vendored
+2 -2
View File
@@ -1,7 +1,7 @@
// WITH_RUNTIME
// SUGGESTED_NAMES: i, getN
// PARAM_TYPES: String?, String, kotlin.CharSequence?, CharSequence
// PARAM_DESCRIPTOR: val property: (String..String?) defined in test
// PARAM_TYPES: kotlin.String?, kotlin.String, kotlin.CharSequence?, kotlin.CharSequence
// PARAM_DESCRIPTOR: val property: kotlin.String! defined in test
fun test() {
val property = System.getProperty("some")
val n = <selection>property?.length</selection>
idea/testData/refactoring/extractFunction/parameters/candidateTypes/flexibleTypesWithNull.kt.after
Vendored
+2 -2
View File
@@ -1,7 +1,7 @@
// WITH_RUNTIME
// SUGGESTED_NAMES: i, getN
// PARAM_TYPES: String?, String, kotlin.CharSequence?, CharSequence
// PARAM_DESCRIPTOR: val property: (String..String?) defined in test
// PARAM_TYPES: kotlin.String?, kotlin.String, kotlin.CharSequence?, kotlin.CharSequence
// PARAM_DESCRIPTOR: val property: kotlin.String! defined in test
fun test() {
val property = System.getProperty("some")
val n = i(property)
idea/testData/refactoring/extractFunction/parameters/candidateTypes/flexibleTypesWithoutNull.kt
Vendored
+2 -2
View File
@@ -1,7 +1,7 @@
// WITH_RUNTIME
// SUGGESTED_NAMES: i, getN
// PARAM_TYPES: String, CharSequence
// PARAM_DESCRIPTOR: val property: (String..String?) defined in test
// PARAM_TYPES: kotlin.String, kotlin.CharSequence
// PARAM_DESCRIPTOR: val property: kotlin.String! defined in test
fun test() {
val property = System.getProperty("some")
val n = <selection>property.length</selection>
idea/testData/refactoring/extractFunction/parameters/candidateTypes/flexibleTypesWithoutNull.kt.after
Vendored
+3 -3
View File
@@ -1,10 +1,10 @@
// WITH_RUNTIME
// SUGGESTED_NAMES: i, getN
// PARAM_TYPES: String, CharSequence
// PARAM_DESCRIPTOR: val property: (String..String?) defined in test
// PARAM_TYPES: kotlin.String, kotlin.CharSequence
// PARAM_DESCRIPTOR: val property: kotlin.String! defined in test
fun test() {
val property = System.getProperty("some")
val n = i(property)
}
private fun i(property: String) = property.length
private fun i(property: String) = property.length
idea/testData/refactoring/extractFunction/parameters/candidateTypes/mutablyFlexibleType.kt
Vendored
+2 -2
View File
@@ -1,6 +1,6 @@
// WITH_RUNTIME
// PARAM_DESCRIPTOR: val data: (kotlin.collections.MutableList<(String..String?)>..kotlin.collections.List<(String..String?)>) defined in test
// PARAM_TYPES: kotlin.collections.List<(String..String?)>, kotlin.collections.MutableList<(String..String?)>, kotlin.collections.MutableCollection<(String..String?)>, kotlin.collections.Collection<(String..String?)>
// PARAM_DESCRIPTOR: val data: kotlin.collections.(Mutable)List<kotlin.String!> defined in test
// PARAM_TYPES: kotlin.collections.List<kotlin.String!>, kotlin.collections.MutableList<kotlin.String!>, kotlin.collections.MutableCollection<kotlin.String!>, kotlin.collections.Collection<kotlin.String!>
fun test(): Boolean {
val j: J? = null
val data = j?.getData() ?: return false
idea/testData/refactoring/extractFunction/parameters/candidateTypes/mutablyFlexibleType.kt.after
Vendored
+2 -2
View File
@@ -1,6 +1,6 @@
// WITH_RUNTIME
// PARAM_DESCRIPTOR: val data: (kotlin.collections.MutableList<(String..String?)>..kotlin.collections.List<(String..String?)>) defined in test
// PARAM_TYPES: kotlin.collections.List<(String..String?)>, kotlin.collections.MutableList<(String..String?)>, kotlin.collections.MutableCollection<(String..String?)>, kotlin.collections.Collection<(String..String?)>
// PARAM_DESCRIPTOR: val data: kotlin.collections.(Mutable)List<kotlin.String!> defined in test
// PARAM_TYPES: kotlin.collections.List<kotlin.String!>, kotlin.collections.MutableList<kotlin.String!>, kotlin.collections.MutableCollection<kotlin.String!>, kotlin.collections.Collection<kotlin.String!>
fun test(): Boolean {
val j: J? = null
val data = j?.getData() ?: return false
idea/testData/refactoring/extractFunction/parameters/candidateTypes/nonNullableTypes.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// PARAM_TYPES: kotlin.String, Comparable<String>, CharSequence, java.io.Serializable, Any
// PARAM_TYPES: kotlin.String, kotlin.Comparable<kotlin.String>, kotlin.CharSequence, java.io.Serializable, kotlin.Any
// PARAM_TYPES: X<kotlin.Any>
// PARAM_DESCRIPTOR: value-parameter s: kotlin.String? defined in foo
// PARAM_DESCRIPTOR: value-parameter x: X<kotlin.Any> defined in foo
idea/testData/refactoring/extractFunction/parameters/candidateTypes/nonNullableTypes.kt.after
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// PARAM_TYPES: kotlin.String, Comparable<String>, CharSequence, java.io.Serializable, Any
// PARAM_TYPES: kotlin.String, kotlin.Comparable<kotlin.String>, kotlin.CharSequence, java.io.Serializable, kotlin.Any
// PARAM_TYPES: X<kotlin.Any>
// PARAM_DESCRIPTOR: value-parameter s: kotlin.String? defined in foo
// PARAM_DESCRIPTOR: value-parameter x: X<kotlin.Any> defined in foo
idea/testData/refactoring/extractFunction/parameters/candidateTypes/nullableTypes.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// PARAM_TYPES: kotlin.String?, kotlin.Comparable<String>?, kotlin.CharSequence?, java.io.Serializable?, kotlin.Any?
// PARAM_TYPES: kotlin.String?, kotlin.Comparable<kotlin.String>?, kotlin.CharSequence?, java.io.Serializable?, kotlin.Any?
// PARAM_TYPES: X<kotlin.Any?>
// PARAM_DESCRIPTOR: value-parameter s: kotlin.String? defined in foo
// PARAM_DESCRIPTOR: value-parameter x: X<kotlin.Any?> defined in foo
idea/testData/refactoring/extractFunction/parameters/candidateTypes/nullableTypes.kt.after
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// PARAM_TYPES: kotlin.String?, kotlin.Comparable<String>?, kotlin.CharSequence?, java.io.Serializable?, kotlin.Any?
// PARAM_TYPES: kotlin.String?, kotlin.Comparable<kotlin.String>?, kotlin.CharSequence?, java.io.Serializable?, kotlin.Any?
// PARAM_TYPES: X<kotlin.Any?>
// PARAM_DESCRIPTOR: value-parameter s: kotlin.String? defined in foo
// PARAM_DESCRIPTOR: value-parameter x: X<kotlin.Any?> defined in foo
idea/testData/refactoring/extractFunction/parameters/capturedFunctions/deeplyLocalFun.kt
Vendored
+2 -2
View File
@@ -1,7 +1,7 @@
// OPTIONS: true, false, false, false, true, false
// PARAM_DESCRIPTOR: local final fun baz(m: kotlin.Int): Int defined in foo.bar
// PARAM_DESCRIPTOR: local final fun baz(m: kotlin.Int): kotlin.Int defined in foo.bar
// PARAM_DESCRIPTOR: value-parameter n: kotlin.Int defined in foo
// PARAM_TYPES: (kotlin.Int) -> Int
// PARAM_TYPES: (kotlin.Int) -> kotlin.Int
// PARAM_TYPES: kotlin.Int
// SIBLING:
idea/testData/refactoring/extractFunction/parameters/capturedFunctions/deeplyLocalFun.kt.after
Vendored
+2 -2
View File
@@ -1,7 +1,7 @@
// OPTIONS: true, false, false, false, true, false
// PARAM_DESCRIPTOR: local final fun baz(m: kotlin.Int): Int defined in foo.bar
// PARAM_DESCRIPTOR: local final fun baz(m: kotlin.Int): kotlin.Int defined in foo.bar
// PARAM_DESCRIPTOR: value-parameter n: kotlin.Int defined in foo
// PARAM_TYPES: (kotlin.Int) -> Int
// PARAM_TYPES: (kotlin.Int) -> kotlin.Int
// PARAM_TYPES: kotlin.Int
// SIBLING:
idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFun.kt
Vendored
+2 -2
View File
@@ -1,7 +1,7 @@
// OPTIONS: true, false, false, false, true, false
// PARAM_DESCRIPTOR: local final fun kotlin.Int.bar(m: kotlin.Int): Int defined in foo
// PARAM_DESCRIPTOR: local final fun kotlin.Int.bar(m: kotlin.Int): kotlin.Int defined in foo
// PARAM_DESCRIPTOR: value-parameter n: kotlin.Int defined in foo
// PARAM_TYPES: kotlin.Int.(kotlin.Int) -> Int
// PARAM_TYPES: kotlin.Int.(kotlin.Int) -> kotlin.Int
// PARAM_TYPES: kotlin.Int
fun foo(n: Int): Int {
fun Int.bar(m: Int) = this * m * n
idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFun.kt.after
Vendored
+2 -2
View File
@@ -1,7 +1,7 @@
// OPTIONS: true, false, false, false, true, false
// PARAM_DESCRIPTOR: local final fun kotlin.Int.bar(m: kotlin.Int): Int defined in foo
// PARAM_DESCRIPTOR: local final fun kotlin.Int.bar(m: kotlin.Int): kotlin.Int defined in foo
// PARAM_DESCRIPTOR: value-parameter n: kotlin.Int defined in foo
// PARAM_TYPES: kotlin.Int.(kotlin.Int) -> Int
// PARAM_TYPES: kotlin.Int.(kotlin.Int) -> kotlin.Int
// PARAM_TYPES: kotlin.Int
fun foo(n: Int): Int {
fun Int.bar(m: Int) = this * m * n
idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFunChainedCalls.kt
Vendored
+4 -4
View File
@@ -1,9 +1,9 @@
// OPTIONS: true, false, false, false, true, false
// 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: local final fun kotlin.Int.bar1(m: kotlin.Int): kotlin.Int defined in foo
// PARAM_DESCRIPTOR: local final fun kotlin.Int.bar2(m: kotlin.Int): kotlin.Int defined in foo
// PARAM_DESCRIPTOR: value-parameter n: kotlin.Int defined in foo
// PARAM_TYPES: kotlin.Int.(kotlin.Int) -> Int
// PARAM_TYPES: kotlin.Int.(kotlin.Int) -> Int
// PARAM_TYPES: kotlin.Int.(kotlin.Int) -> kotlin.Int
// PARAM_TYPES: kotlin.Int.(kotlin.Int) -> kotlin.Int
// PARAM_TYPES: kotlin.Int
fun foo(n: Int): Int {
fun Int.bar1(m: Int) = this + m + n
idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFunChainedCalls.kt.after
Vendored
+4 -4
View File
@@ -1,9 +1,9 @@
// OPTIONS: true, false, false, false, true, false
// 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: local final fun kotlin.Int.bar1(m: kotlin.Int): kotlin.Int defined in foo
// PARAM_DESCRIPTOR: local final fun kotlin.Int.bar2(m: kotlin.Int): kotlin.Int defined in foo
// PARAM_DESCRIPTOR: value-parameter n: kotlin.Int defined in foo
// PARAM_TYPES: kotlin.Int.(kotlin.Int) -> Int
// PARAM_TYPES: kotlin.Int.(kotlin.Int) -> Int
// PARAM_TYPES: kotlin.Int.(kotlin.Int) -> kotlin.Int
// PARAM_TYPES: kotlin.Int.(kotlin.Int) -> kotlin.Int
// PARAM_TYPES: kotlin.Int
fun foo(n: Int): Int {
fun Int.bar1(m: Int) = this + m + n
idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFunInfixCall.kt
Vendored
+2 -2
View File
@@ -1,7 +1,7 @@
// OPTIONS: true, false, false, false, true, false
// PARAM_DESCRIPTOR: local final fun kotlin.Int.bar(m: kotlin.Int): Int defined in foo
// PARAM_DESCRIPTOR: local final fun kotlin.Int.bar(m: kotlin.Int): kotlin.Int defined in foo
// PARAM_DESCRIPTOR: value-parameter n: kotlin.Int defined in foo
// PARAM_TYPES: kotlin.Int.(kotlin.Int) -> Int
// PARAM_TYPES: kotlin.Int.(kotlin.Int) -> kotlin.Int
// PARAM_TYPES: kotlin.Int
fun foo(n: Int): Int {
fun Int.bar(m: Int) = this * m * n
idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFunInfixCall.kt.after
Vendored
+2 -2
View File
@@ -1,7 +1,7 @@
// OPTIONS: true, false, false, false, true, false
// PARAM_DESCRIPTOR: local final fun kotlin.Int.bar(m: kotlin.Int): Int defined in foo
// PARAM_DESCRIPTOR: local final fun kotlin.Int.bar(m: kotlin.Int): kotlin.Int defined in foo
// PARAM_DESCRIPTOR: value-parameter n: kotlin.Int defined in foo
// PARAM_TYPES: kotlin.Int.(kotlin.Int) -> Int
// PARAM_TYPES: kotlin.Int.(kotlin.Int) -> kotlin.Int
// PARAM_TYPES: kotlin.Int
fun foo(n: Int): Int {
fun Int.bar(m: Int) = this * m * n
idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localFun.kt
Vendored
+2 -2
View File
@@ -1,7 +1,7 @@
// OPTIONS: true, false, false, false, true, false
// PARAM_DESCRIPTOR: local final fun bar(m: kotlin.Int): Int defined in foo
// PARAM_DESCRIPTOR: local final fun bar(m: kotlin.Int): kotlin.Int defined in foo
// PARAM_DESCRIPTOR: value-parameter n: kotlin.Int defined in foo
// PARAM_TYPES: (kotlin.Int) -> Int
// PARAM_TYPES: (kotlin.Int) -> kotlin.Int
// PARAM_TYPES: kotlin.Int
fun foo(n: Int): Int {
fun bar(m: Int) = m * n
idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localFun.kt.after
Vendored
+2 -2
View File
@@ -1,7 +1,7 @@
// OPTIONS: true, false, false, false, true, false
// PARAM_DESCRIPTOR: local final fun bar(m: kotlin.Int): Int defined in foo
// PARAM_DESCRIPTOR: local final fun bar(m: kotlin.Int): kotlin.Int defined in foo
// PARAM_DESCRIPTOR: value-parameter n: kotlin.Int defined in foo
// PARAM_TYPES: (kotlin.Int) -> Int
// PARAM_TYPES: (kotlin.Int) -> kotlin.Int
// PARAM_TYPES: kotlin.Int
fun foo(n: Int): Int {
fun bar(m: Int) = m * n
idea/testData/refactoring/extractFunction/parameters/extractThis/javaSyntheticProperty.kt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
// WITH_RUNTIME
// PARAM_DESCRIPTOR: private final fun Named.foo(): [@org.jetbrains.annotations.NotNull] String defined in Test
// PARAM_DESCRIPTOR: private final fun Named.foo(): kotlin.String defined in Test
// PARAM_TYPES: Named
public class Test {
private fun Named.foo() = <selection>name</selection>
idea/testData/refactoring/extractFunction/parameters/extractThis/javaSyntheticProperty.kt.after
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
// WITH_RUNTIME
// PARAM_DESCRIPTOR: private final fun Named.foo(): [@org.jetbrains.annotations.NotNull] String defined in Test
// PARAM_DESCRIPTOR: private final fun Named.foo(): kotlin.String defined in Test
// PARAM_TYPES: Named
public class Test {
private fun Named.foo() = s()
idea/testData/refactoring/extractFunction/parameters/extractThis/javaSyntheticPropertyWithDelegation.kt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
// WITH_RUNTIME
// PARAM_DESCRIPTOR: private final fun NamedEx.foo(): [@org.jetbrains.annotations.NotNull] String defined in Test
// PARAM_DESCRIPTOR: private final fun NamedEx.foo(): kotlin.String defined in Test
// PARAM_TYPES: NamedEx
// SIBLING:
public class Test {
idea/testData/refactoring/extractFunction/parameters/extractThis/javaSyntheticPropertyWithDelegation.kt.after
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
// WITH_RUNTIME
// PARAM_DESCRIPTOR: private final fun NamedEx.foo(): [@org.jetbrains.annotations.NotNull] String defined in Test
// PARAM_DESCRIPTOR: private final fun NamedEx.foo(): kotlin.String defined in Test
// PARAM_TYPES: NamedEx
// SIBLING:
public class Test {
idea/testData/refactoring/extractFunction/parameters/extractThis/javaSyntheticPropertyWithOverride.kt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
// WITH_RUNTIME
// PARAM_DESCRIPTOR: private final fun NamedEx.foo(): [@org.jetbrains.annotations.NotNull] String defined in Test
// PARAM_DESCRIPTOR: private final fun NamedEx.foo(): kotlin.String defined in Test
// PARAM_TYPES: NamedEx
// SIBLING:
public class Test {
idea/testData/refactoring/extractFunction/parameters/extractThis/javaSyntheticPropertyWithOverride.kt.after
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
// WITH_RUNTIME
// PARAM_DESCRIPTOR: private final fun NamedEx.foo(): [@org.jetbrains.annotations.NotNull] String defined in Test
// PARAM_DESCRIPTOR: private final fun NamedEx.foo(): kotlin.String defined in Test
// PARAM_TYPES: NamedEx
// SIBLING:
public class Test {
idea/testData/refactoring/extractFunction/parameters/extractThis/qualifiedThis.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// PARAM_TYPES: kotlin.String, Comparable<String>, CharSequence, java.io.Serializable, Any
// PARAM_TYPES: kotlin.String, kotlin.Comparable<kotlin.String>, kotlin.CharSequence, java.io.Serializable, kotlin.Any
// PARAM_DESCRIPTOR: public fun kotlin.String.test(): kotlin.Unit defined in root package
fun String.foo(f: () -> Unit) {
f()
idea/testData/refactoring/extractFunction/parameters/extractThis/qualifiedThis.kt.after
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// PARAM_TYPES: kotlin.String, Comparable<String>, CharSequence, java.io.Serializable, Any
// PARAM_TYPES: kotlin.String, kotlin.Comparable<kotlin.String>, kotlin.CharSequence, java.io.Serializable, kotlin.Any
// PARAM_DESCRIPTOR: public fun kotlin.String.test(): kotlin.Unit defined in root package
fun String.foo(f: () -> Unit) {
f()
idea/testData/refactoring/extractFunction/parameters/extractThis/qualifiedThisAsArgument.kt
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
// PARAM_TYPES: A
// PARAM_TYPES: B
// PARAM_DESCRIPTOR: public final class A defined in root package
// PARAM_DESCRIPTOR: public final fun B.foo(): Int defined in A
// PARAM_DESCRIPTOR: public final fun B.foo(): kotlin.Int defined in A
// SIBLING:
class A {
val a = 1
idea/testData/refactoring/extractFunction/parameters/extractThis/qualifiedThisAsArgument.kt.after
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
// PARAM_TYPES: A
// PARAM_TYPES: B
// PARAM_DESCRIPTOR: public final class A defined in root package
// PARAM_DESCRIPTOR: public final fun B.foo(): Int defined in A
// PARAM_DESCRIPTOR: public final fun B.foo(): kotlin.Int defined in A
// SIBLING:
class A {
val a = 1
idea/testData/refactoring/extractFunction/parameters/misc/multiDeclaration.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// PARAM_TYPES: kotlin.Int, Number, Comparable<Int>, java.io.Serializable, Any
// PARAM_TYPES: kotlin.Int, kotlin.Number, kotlin.Comparable<kotlin.Int>, java.io.Serializable, kotlin.Any
// PARAM_DESCRIPTOR: val a: kotlin.Int defined in main
// SIBLING:
fun main(args: Array<String>) {
idea/testData/refactoring/extractFunction/parameters/misc/multiDeclaration.kt.after
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// PARAM_TYPES: kotlin.Int, Number, Comparable<Int>, java.io.Serializable, Any
// PARAM_TYPES: kotlin.Int, kotlin.Number, kotlin.Comparable<kotlin.Int>, java.io.Serializable, kotlin.Any
// PARAM_DESCRIPTOR: val a: kotlin.Int defined in main
// SIBLING:
fun main(args: Array<String>) {
idea/testData/refactoring/extractFunction/parameters/nonDenotableTypes/localClassWithSuperclassParameter.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// PARAM_DESCRIPTOR: val a: foo.A defined in foo.bar
// PARAM_DESCRIPTOR: val a: A defined in foo.bar
// PARAM_TYPES: T
interface T
idea/testData/refactoring/extractFunction/parameters/nonDenotableTypes/localClassWithSuperclassParameter.kt.after
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// PARAM_DESCRIPTOR: val a: foo.A defined in foo.bar
// PARAM_DESCRIPTOR: val a: A defined in foo.bar
// PARAM_TYPES: T
interface T
idea/testData/refactoring/extractFunction/parameters/nonDenotableTypes/localClassWithSuperclassParameterInLocalFun.kt
Vendored
+2 -2
View File
@@ -1,5 +1,5 @@
// PARAM_DESCRIPTOR: val a: foo.A defined in foo.bar
// PARAM_TYPES: foo.A, T
// PARAM_DESCRIPTOR: val a: A defined in foo.bar
// PARAM_TYPES: A, T
interface T
fun foo(): T {
idea/testData/refactoring/extractFunction/parameters/nonDenotableTypes/localClassWithSuperclassParameterInLocalFun.kt.after
Vendored
+2 -2
View File
@@ -1,5 +1,5 @@
// PARAM_DESCRIPTOR: val a: foo.A defined in foo.bar
// PARAM_TYPES: foo.A, T
// PARAM_DESCRIPTOR: val a: A defined in foo.bar
// PARAM_TYPES: A, T
interface T
fun foo(): T {
idea/testData/refactoring/extractFunction/stringTemplates/fullContent.kt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo
// PARAM_TYPES: kotlin.Int, Number, Comparable<Int>, java.io.Serializable, Any
// PARAM_TYPES: kotlin.Int, kotlin.Number, kotlin.Comparable<kotlin.Int>, java.io.Serializable, kotlin.Any
fun foo(a: Int): String {
val x = "abc$a"
val y = "abc${a}"
idea/testData/refactoring/extractFunction/stringTemplates/fullContent.kt.after
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo
// PARAM_TYPES: kotlin.Int, Number, Comparable<Int>, java.io.Serializable, Any
// PARAM_TYPES: kotlin.Int, kotlin.Number, kotlin.Comparable<kotlin.Int>, java.io.Serializable, kotlin.Any
fun foo(a: Int): String {
val x = s(a)
val y = s(a)
idea/testData/refactoring/extractFunction/stringTemplates/fullEntryWithSimpleName.kt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo
// PARAM_TYPES: kotlin.Int, Number, Comparable<Int>, java.io.Serializable, Any
// PARAM_TYPES: kotlin.Int, kotlin.Number, kotlin.Comparable<kotlin.Int>, java.io.Serializable, kotlin.Any
fun foo(a: Int): String {
val x = "-$a"
val y = "x${a}y"
idea/testData/refactoring/extractFunction/stringTemplates/fullEntryWithSimpleName.kt.after
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo
// PARAM_TYPES: kotlin.Int, Number, Comparable<Int>, java.io.Serializable, Any
// PARAM_TYPES: kotlin.Int, kotlin.Number, kotlin.Comparable<kotlin.Int>, java.io.Serializable, kotlin.Any
fun foo(a: Int): String {
val x = "-${i(a)}"
val y = "x${i(a)}y"
idea/tests/org/jetbrains/kotlin/idea/refactoring/introduce/AbstractExtractionTest.kt
+1 -1
View File
@@ -255,7 +255,7 @@ abstract class AbstractExtractionTest() : KotlinLightCodeInsightFixtureTestCase(
} else ExtractionOptions.DEFAULT
}
val renderer = DescriptorRenderer.DEBUG_TEXT
val renderer = DescriptorRenderer.FQ_NAMES_IN_TYPES
val editor = fixture.editor
val handler = ExtractKotlinFunctionHandler(