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

IDE/FIR IDE: fix not showed following type parameters in completion

Browse Source
This commit is contained in:
Ilya Kirillov
2021-05-26 20:04:56 +02:00
committed by TeamCityServer
parent 0f13359229
commit ff369b1917
5 changed files with 29 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-completion/testData/basic/common/SecondTypeArg.kt
Vendored
+5
View File
@@ -0,0 +1,5 @@
// FIR_COMPARISON
fun <T: <caret>, S>.foo() {}
// EXIST: S
idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JSBasicCompletionTestGenerated.java
Generated
+5
View File
@@ -651,6 +651,11 @@ public class JSBasicCompletionTestGenerated extends AbstractJSBasicCompletionTes
runTest("idea/idea-completion/testData/basic/common/RecieverMembersFromExtFun.kt");
}
@TestMetadata("SecondTypeArg.kt")
public void testSecondTypeArg() throws Exception {
runTest("idea/idea-completion/testData/basic/common/SecondTypeArg.kt");
}
@TestMetadata("SetPrefixForProperties.kt")
public void testSetPrefixForProperties() throws Exception {
runTest("idea/idea-completion/testData/basic/common/SetPrefixForProperties.kt");
idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JvmBasicCompletionTestGenerated.java
Generated
+5
View File
@@ -651,6 +651,11 @@ public class JvmBasicCompletionTestGenerated extends AbstractJvmBasicCompletionT
runTest("idea/idea-completion/testData/basic/common/RecieverMembersFromExtFun.kt");
}
@TestMetadata("SecondTypeArg.kt")
public void testSecondTypeArg() throws Exception {
runTest("idea/idea-completion/testData/basic/common/SecondTypeArg.kt");
}
@TestMetadata("SetPrefixForProperties.kt")
public void testSetPrefixForProperties() throws Exception {
runTest("idea/idea-completion/testData/basic/common/SetPrefixForProperties.kt");
idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/completion/HighLevelJvmBasicCompletionTestGenerated.java
Generated
+5
View File
@@ -651,6 +651,11 @@ public class HighLevelJvmBasicCompletionTestGenerated extends AbstractHighLevelJ
runTest("idea/idea-completion/testData/basic/common/RecieverMembersFromExtFun.kt");
}
@TestMetadata("SecondTypeArg.kt")
public void testSecondTypeArg() throws Exception {
runTest("idea/idea-completion/testData/basic/common/SecondTypeArg.kt");
}
@TestMetadata("SetPrefixForProperties.kt")
public void testSetPrefixForProperties() throws Exception {
runTest("idea/idea-completion/testData/basic/common/SetPrefixForProperties.kt");
idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/completion/CompletionDummyIdentifierProviderService.kt
+9
View File
@@ -43,10 +43,19 @@ abstract class CompletionDummyIdentifierProviderService {
?: specialExtensionReceiverDummyIdentifier(tokenBefore)
?: specialInTypeArgsDummyIdentifier(tokenBefore)
?: specialInArgumentListDummyIdentifier(tokenBefore)
?: isInTypeParametersList(tokenBefore)
?: DEFAULT_DUMMY_IDENTIFIER
}
}
private fun isInTypeParametersList(tokenBefore: PsiElement?): String? {
if (tokenBefore == null) return null
if (tokenBefore.parents.any { it is KtTypeParameterList }) {
return CompletionUtilCore.DUMMY_IDENTIFIER_TRIMMED
}
return null
}
private fun specialLambdaSignatureDummyIdentifier(tokenBefore: PsiElement?): String? {
var leaf = tokenBefore
while (leaf is PsiWhiteSpace || leaf is PsiComment) {