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

Refine member scope for types with projections

Browse Source 
Instead of erasing descriptors with conflicting substitution,
use invariant CapturedType(<projection>) as replacement for type parameter
within default member scope.

After substitution leave such types 'as is' everywhere except return types,
use common approximation for them.

 #KT-9294 In Progress
 #KT-5411 Fixed
 #KT-8647 Fixed

 #KT-9462 Fixed
 #KT-9893 Fixed
 #KT-7581 Fixed
 #KT-7296 In Progress
This commit is contained in:
Denis Zharkov
2015-12-22 14:02:55 +03:00
parent 365ff593f3
commit e2c02f825f
50 changed files with 655 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/testData/refactoring/extractFunction/basic/extensionFunForArray.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// PARAM_TYPES: kotlin.Array<T>, kotlin.Cloneable, java.io.Serializable, Any
// PARAM_TYPES: kotlin.Array<T>, Cloneable, java.io.Serializable, 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>, kotlin.Cloneable, java.io.Serializable, Any
// PARAM_TYPES: kotlin.Array<T>, Cloneable, java.io.Serializable, 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/parameters/candidateTypes/nonNullableTypes.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// PARAM_TYPES: kotlin.String, Comparable<String>, CharSequence, java.io.Serializable, kotlin.Any
// PARAM_TYPES: kotlin.String, Comparable<String>, CharSequence, java.io.Serializable, Any
// PARAM_TYPES: X<kotlin.Any>
// PARAM_DESCRIPTOR: value-parameter val s: kotlin.String? defined in foo
// PARAM_DESCRIPTOR: value-parameter val 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, kotlin.Any
// PARAM_TYPES: kotlin.String, Comparable<String>, CharSequence, java.io.Serializable, Any
// PARAM_TYPES: X<kotlin.Any>
// PARAM_DESCRIPTOR: value-parameter val s: kotlin.String? defined in foo
// PARAM_DESCRIPTOR: value-parameter val x: X<kotlin.Any> defined in foo
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, kotlin.Any
// PARAM_TYPES: kotlin.String, Comparable<String>, CharSequence, java.io.Serializable, 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, kotlin.Any
// PARAM_TYPES: kotlin.String, Comparable<String>, CharSequence, java.io.Serializable, Any
// PARAM_DESCRIPTOR: public fun kotlin.String.test(): kotlin.Unit defined in root package
fun String.foo(f: () -> Unit) {
f()