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

Fix the problem with code completion of type extension method

Browse Source 
KT-23834 Fixed
This commit is contained in:
shiraji
2018-09-09 00:14:43 +09:00
committed by Alexander Podkhalyuzin
parent 9ff8c93529
commit fd3fe52eb4
5 changed files with 51 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/ide-common/src/org/jetbrains/kotlin/idea/util/ShadowedDeclarationsFilter.kt
+9
View File
@@ -246,6 +246,15 @@ class ShadowedDeclarationsFilter(
if (p1.varargElementType != p2.varargElementType) return false // both should be vararg or or both not
if (p1.type != p2.type) return false
}
val typeParameters1 = function.typeParameters
val typeParameters2 = other.function.typeParameters
if (typeParameters1.size != typeParameters2.size) return false
for (i in typeParameters1.indices) {
val t1 = typeParameters1[i]
val t2 = typeParameters2[i]
if (t1.upperBounds != t2.upperBounds) return false
}
return true
}
idea/idea-completion/testData/basic/common/shadowing/ExtensionShadows.kt
Vendored
+13
View File
@@ -0,0 +1,13 @@
class Shadow {
fun shade() {}
}
fun <X> Shadow.shade() {}
fun context() {
Shadow().sha<caret>
}
// EXIST: { lookupString: "shade", itemText: "shade", tailText: "()", typeText: "Unit" }
// EXIST: { lookupString: "shade", itemText: "shade", tailText: "() for Shadow in <root>", typeText: "Unit" }
// NOTHING_ELSE
idea/idea-completion/testData/basic/common/shadowing/PreferMoreSpecificExtensionGenericWithMultipleParam.kt
Vendored
+9
View File
@@ -0,0 +1,9 @@
fun <T, S> List<T>.xxx(t: T){}
fun <T, W> Iterable<T>.xxx(t: T){}
fun foo() {
listOf(1).xx<caret>
}
// EXIST: { lookupString: "xxx", itemText: "xxx", tailText: "(t: Int) for List<T> in <root>", typeText: "Unit" }
// NOTHING_ELSE
idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JSBasicCompletionTestGenerated.java
Generated
+10
View File
@@ -2110,6 +2110,11 @@ public class JSBasicCompletionTestGenerated extends AbstractJSBasicCompletionTes
KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common/shadowing"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
}
@TestMetadata("ExtensionShadows.kt")
public void testExtensionShadows() throws Exception {
runTest("idea/idea-completion/testData/basic/common/shadowing/ExtensionShadows.kt");
}
@TestMetadata("InInitializer1.kt")
public void testInInitializer1() throws Exception {
runTest("idea/idea-completion/testData/basic/common/shadowing/InInitializer1.kt");
@@ -2200,6 +2205,11 @@ public class JSBasicCompletionTestGenerated extends AbstractJSBasicCompletionTes
runTest("idea/idea-completion/testData/basic/common/shadowing/PreferMoreSpecificExtensionGeneric.kt");
}
@TestMetadata("PreferMoreSpecificExtensionGenericWithMultipleParam.kt")
public void testPreferMoreSpecificExtensionGenericWithMultipleParam() throws Exception {
runTest("idea/idea-completion/testData/basic/common/shadowing/PreferMoreSpecificExtensionGenericWithMultipleParam.kt");
}
@TestMetadata("PreferMoreSpecificExtensionGenericWithParam.kt")
public void testPreferMoreSpecificExtensionGenericWithParam() throws Exception {
runTest("idea/idea-completion/testData/basic/common/shadowing/PreferMoreSpecificExtensionGenericWithParam.kt");
idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JvmBasicCompletionTestGenerated.java
Generated
+10
View File
@@ -2110,6 +2110,11 @@ public class JvmBasicCompletionTestGenerated extends AbstractJvmBasicCompletionT
KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common/shadowing"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
}
@TestMetadata("ExtensionShadows.kt")
public void testExtensionShadows() throws Exception {
runTest("idea/idea-completion/testData/basic/common/shadowing/ExtensionShadows.kt");
}
@TestMetadata("InInitializer1.kt")
public void testInInitializer1() throws Exception {
runTest("idea/idea-completion/testData/basic/common/shadowing/InInitializer1.kt");
@@ -2200,6 +2205,11 @@ public class JvmBasicCompletionTestGenerated extends AbstractJvmBasicCompletionT
runTest("idea/idea-completion/testData/basic/common/shadowing/PreferMoreSpecificExtensionGeneric.kt");
}
@TestMetadata("PreferMoreSpecificExtensionGenericWithMultipleParam.kt")
public void testPreferMoreSpecificExtensionGenericWithMultipleParam() throws Exception {
runTest("idea/idea-completion/testData/basic/common/shadowing/PreferMoreSpecificExtensionGenericWithMultipleParam.kt");
}
@TestMetadata("PreferMoreSpecificExtensionGenericWithParam.kt")
public void testPreferMoreSpecificExtensionGenericWithParam() throws Exception {
runTest("idea/idea-completion/testData/basic/common/shadowing/PreferMoreSpecificExtensionGenericWithParam.kt");