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

Never take ExpectedInfo from outer expression "as is"

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-10-02 21:38:43 +03:00
parent da7c62e788
commit fd6244ac51
4 changed files with 27 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/ExpectedInfos.kt
+6 -2
View File
@@ -432,10 +432,11 @@ class ExpectedInfos(
ifExpression.getElse() -> {
val ifExpectedInfo = calculate(ifExpression)
val thenType = ifExpression.getThen()?.let { bindingContext.getType(it) }
if (thenType != null && !thenType.isError())
val filteredInfo = if (thenType != null && !thenType.isError())
ifExpectedInfo.filter { it.matchingSubstitutor(thenType) != null }
else
ifExpectedInfo
return filteredInfo.copyWithNoAdditionalData()
}
else -> return null
@@ -452,10 +453,11 @@ class ExpectedInfos(
val leftTypeNotNullable = leftType?.makeNotNullable()
val expectedInfos = calculate(binaryExpression)
if (expectedInfos.isNotEmpty()) {
return if (leftTypeNotNullable != null)
val filteredInfo = if (leftTypeNotNullable != null)
expectedInfos.filter { it.matchingSubstitutor(leftTypeNotNullable) != null }
else
expectedInfos
return filteredInfo.copyWithNoAdditionalData()
}
else if (leftTypeNotNullable != null) {
return listOf(ExpectedInfo(leftTypeNotNullable, null, null))
@@ -605,6 +607,8 @@ class ExpectedInfos(
private fun String.unpluralize()
= StringUtil.unpluralize(this)
private fun Collection<ExpectedInfo>.copyWithNoAdditionalData() = map { it.copy(additionalData = null, itemOptions = ItemOptions.DEFAULT) }
}
val COMPARISON_TOKENS = setOf(JetTokens.EQEQ, JetTokens.EXCLEQ, JetTokens.EQEQEQ, JetTokens.EXCLEQEQEQ)
idea/idea-completion/testData/basic/common/namedArguments/NotInElse.kt
Vendored
+9
View File
@@ -0,0 +1,9 @@
fun foo(p1: Int, p2: Int) {
}
fun bar(b: Boolean) {
foo(if (b) 1 else <caret>)
}
// ABSENT: p1
// ABSENT: p2
idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JSBasicCompletionTestGenerated.java
+6
View File
@@ -1497,6 +1497,12 @@ public class JSBasicCompletionTestGenerated extends AbstractJSBasicCompletionTes
doTest(fileName);
}
@TestMetadata("NotInElse.kt")
public void testNotInElse() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/namedArguments/NotInElse.kt");
doTest(fileName);
}
@TestMetadata("NotOnlyNamedArguments.kt")
public void testNotOnlyNamedArguments() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/namedArguments/NotOnlyNamedArguments.kt");
idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JvmBasicCompletionTestGenerated.java
+6
View File
@@ -1497,6 +1497,12 @@ public class JvmBasicCompletionTestGenerated extends AbstractJvmBasicCompletionT
doTest(fileName);
}
@TestMetadata("NotInElse.kt")
public void testNotInElse() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/namedArguments/NotInElse.kt");
doTest(fileName);
}
@TestMetadata("NotOnlyNamedArguments.kt")
public void testNotOnlyNamedArguments() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/namedArguments/NotOnlyNamedArguments.kt");