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

NI: Fix resolution ambiguity for references returned from lambda

Browse Source 
^KT-32267 Fixed
This commit is contained in:
Denis Zharkov
2019-12-26 17:23:14 +03:00
committed by Mikhail Zarechenskiy
parent 534718794c
commit caf02806d5
13 changed files with 290 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirOldFrontendDiagnosticsTestGenerated.java
Generated
+15
View File
@@ -1849,11 +1849,21 @@ public class FirOldFrontendDiagnosticsTestGenerated extends AbstractFirOldFronte
runTest("compiler/testData/diagnostics/tests/callableReference/kt32256.kt");
}
@TestMetadata("kt32267.kt")
public void testKt32267() throws Exception {
runTest("compiler/testData/diagnostics/tests/callableReference/kt32267.kt");
}
@TestMetadata("kt7430_wrongClassOnLHS.kt")
public void testKt7430_wrongClassOnLHS() throws Exception {
runTest("compiler/testData/diagnostics/tests/callableReference/kt7430_wrongClassOnLHS.kt");
}
@TestMetadata("lambdaResult.kt")
public void testLambdaResult() throws Exception {
runTest("compiler/testData/diagnostics/tests/callableReference/lambdaResult.kt");
}
@TestMetadata("memberExtensionsImportedFromObjectsUnsupported.kt")
public void testMemberExtensionsImportedFromObjectsUnsupported() throws Exception {
runTest("compiler/testData/diagnostics/tests/callableReference/memberExtensionsImportedFromObjectsUnsupported.kt");
@@ -10223,6 +10233,11 @@ public class FirOldFrontendDiagnosticsTestGenerated extends AbstractFirOldFronte
runTest("compiler/testData/diagnostics/tests/inference/coercionToUnit/coercionToUnitForLastLambdaInLambda.kt");
}
@TestMetadata("coercionToUnitReference.kt")
public void testCoercionToUnitReference() throws Exception {
runTest("compiler/testData/diagnostics/tests/inference/coercionToUnit/coercionToUnitReference.kt");
}
@TestMetadata("coercionWithExpectedType.kt")
public void testCoercionWithExpectedType() throws Exception {
runTest("compiler/testData/diagnostics/tests/inference/coercionToUnit/coercionWithExpectedType.kt");
compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/KotlinResolutionCallbacksImpl.kt
+11
View File
@@ -15,6 +15,7 @@ import org.jetbrains.kotlin.descriptors.FunctionDescriptor
import org.jetbrains.kotlin.descriptors.ModuleDescriptor
import org.jetbrains.kotlin.descriptors.annotations.Annotations
import org.jetbrains.kotlin.lexer.KtTokens
import org.jetbrains.kotlin.psi.KtCallableReferenceExpression
import org.jetbrains.kotlin.psi.KtExpression
import org.jetbrains.kotlin.psi.KtPsiUtil
import org.jetbrains.kotlin.psi.KtReturnExpression
@@ -116,6 +117,16 @@ class KotlinResolutionCallbacksImpl(
return it
}
val deparenthesizedExpression = KtPsiUtil.deparenthesize(ktExpression) ?: ktExpression
if (deparenthesizedExpression is KtCallableReferenceExpression) {
return psiCallResolver.createCallableReferenceKotlinCallArgument(
newContext, deparenthesizedExpression, DataFlowInfo.EMPTY,
CallMaker.makeExternalValueArgument(deparenthesizedExpression),
argumentName = null,
outerCallContext
)
}
return createSimplePSICallArgument(
trace.bindingContext, outerCallContext.statementFilter, outerCallContext.scope.ownerDescriptor,
CallMaker.makeExternalValueArgument(ktExpression), DataFlowInfo.EMPTY, typeInfo, languageVersionSettings,
compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/PSICallResolver.kt
+1 -1
View File
@@ -702,7 +702,7 @@ class PSICallResolver(
return createSimplePSICallArgument(context, valueArgument, typeInfo) ?: createParseErrorElement()
}
private fun createCallableReferenceKotlinCallArgument(
fun createCallableReferenceKotlinCallArgument(
context: BasicCallResolutionContext,
ktExpression: KtCallableReferenceExpression,
startDataFlowInfo: DataFlowInfo,
compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ControlStructureTypingVisitor.java
+1 -1
View File
@@ -895,7 +895,7 @@ public class ControlStructureTypingVisitor extends ExpressionTypingVisitor {
if (returnedExpression != null) {
if (newInferenceLambdaInfo != null) {
LambdaContextInfo contextInfo;
if (returnedExpression instanceof KtLambdaExpression) {
if (returnedExpression instanceof KtLambdaExpression || returnedExpression instanceof KtCallableReferenceExpression) {
contextInfo = new LambdaContextInfo(
new KotlinTypeInfo(DONT_CARE, context.dataFlowInfo),
null,
compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingServices.java
+40 -16
View File
@@ -5,7 +5,6 @@
package org.jetbrains.kotlin.types.expressions;
import com.intellij.psi.PsiElement;
import com.intellij.psi.tree.IElementType;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -317,10 +316,24 @@ public class ExpressionTypingServices {
@NotNull CoercionStrategy coercionStrategyForLastExpression,
@NotNull ExpressionTypingInternals blockLevelVisitor
) {
boolean isUnitExpectedType = context.expectedType != NO_EXPECTED_TYPE &&
(
context.expectedType == UNIT_EXPECTED_TYPE ||
//the first check is necessary to avoid invocation 'isUnit(UNIT_EXPECTED_TYPE)'
(
coercionStrategyForLastExpression == COERCION_TO_UNIT &&
KotlinBuiltIns.isUnit(context.expectedType)
)
);
if (!isUnitExpectedType && statementExpression instanceof KtCallableReferenceExpression) {
KotlinTypeInfo typeInfo = createDontCareTypeInfoForNILambda(statementExpression, context);
if (typeInfo != null) return typeInfo;
}
if (context.expectedType != NO_EXPECTED_TYPE) {
KotlinType expectedType;
if (context.expectedType == UNIT_EXPECTED_TYPE ||//the first check is necessary to avoid invocation 'isUnit(UNIT_EXPECTED_TYPE)'
(coercionStrategyForLastExpression == COERCION_TO_UNIT && KotlinBuiltIns.isUnit(context.expectedType))) {
if (isUnitExpectedType) {
expectedType = UNIT_EXPECTED_TYPE;
}
else {
@@ -329,20 +342,12 @@ public class ExpressionTypingServices {
return blockLevelVisitor.getTypeInfo(statementExpression, context.replaceExpectedType(expectedType), true);
}
if (context.languageVersionSettings.supportsFeature(LanguageFeature.NewInference) &&
statementExpression instanceof KtLambdaExpression) {
PsiElement parent = PsiUtilsKt.getNonStrictParentOfType(statementExpression, KtFunctionLiteral.class);
if (parent != null) {
KtFunctionLiteral functionLiteral = (KtFunctionLiteral) parent;
KotlinResolutionCallbacksImpl.LambdaInfo info =
context.trace.getBindingContext().get(BindingContext.NEW_INFERENCE_LAMBDA_INFO, functionLiteral);
if (info != null) {
info.getLastExpressionInfo().setLexicalScope(context.scope);
info.getLastExpressionInfo().setTrace(context.trace);
return new KotlinTypeInfo(DONT_CARE, context.dataFlowInfo);
}
}
if (statementExpression instanceof KtLambdaExpression) {
KotlinTypeInfo typeInfo = createDontCareTypeInfoForNILambda(statementExpression, context);
if (typeInfo != null) return typeInfo;
}
KotlinTypeInfo result = blockLevelVisitor.getTypeInfo(statementExpression, context, true);
if (coercionStrategyForLastExpression == COERCION_TO_UNIT) {
boolean mightBeUnit = false;
@@ -369,6 +374,25 @@ public class ExpressionTypingServices {
return result;
}
@Nullable
private static KotlinTypeInfo createDontCareTypeInfoForNILambda(
@NotNull KtExpression statementExpression,
@NotNull ExpressionTypingContext context
) {
if (!context.languageVersionSettings.supportsFeature(LanguageFeature.NewInference)) return null;
KtFunctionLiteral functionLiteral = PsiUtilsKt.getNonStrictParentOfType(statementExpression, KtFunctionLiteral.class);
if (functionLiteral != null) {
KotlinResolutionCallbacksImpl.LambdaInfo info =
context.trace.getBindingContext().get(BindingContext.NEW_INFERENCE_LAMBDA_INFO, functionLiteral);
if (info != null) {
info.getLastExpressionInfo().setLexicalScope(context.scope);
info.getLastExpressionInfo().setTrace(context.trace);
return new KotlinTypeInfo(DONT_CARE, context.dataFlowInfo);
}
}
return null;
}
private static class EffectsFilteringTrace extends AbstractFilteringTrace {
public EffectsFilteringTrace(BindingTrace parentTrace) {
super(parentTrace, "Effects filtering trace");
compiler/testData/diagnostics/tests/callableReference/kt32267.fir.kt
Vendored
+39
View File
@@ -0,0 +1,39 @@
// SKIP_TXT
// !DIAGNOSTICS: -UNUSED_PARAMETER
// !LANGUAGE: +NewInference
fun main() {
Configuration().commands {
<!INAPPLICABLE_CANDIDATE!>Command1<!> { <!UNRESOLVED_REFERENCE!>someService<!>::execute } // Overload resolution ambiguity. All these functions match.
<!INAPPLICABLE_CANDIDATE!>Command2<!> { <!UNRESOLVED_REFERENCE!>someService<!>::execute } // Overload resolution ambiguity. All these functions match.
<!INAPPLICABLE_CANDIDATE!>Command1<!> { { <!UNRESOLVED_REFERENCE!>someService<!>.<!UNRESOLVED_REFERENCE!>execute<!>(<!UNRESOLVED_REFERENCE!>it<!>) } } // fine
<!INAPPLICABLE_CANDIDATE!>Command2<!> { { <!UNRESOLVED_REFERENCE!>someService<!>.<!UNRESOLVED_REFERENCE!>execute<!>(<!UNRESOLVED_REFERENCE!>it<!>) } } // fine
}
}
interface Command
interface CommandFactory<TCommand : Command>
class Command1 : Command {
companion object : CommandFactory<Command1>
}
class Command2 : Command {
companion object : CommandFactory<Command2>
}
class Configuration {
val commands = Commands()
inline fun commands(configure: Commands.() -> Unit) {
commands.<!UNRESOLVED_REFERENCE!>configure<!>()
}
class Commands {
operator fun <TCommand : Command> CommandFactory<TCommand>.invoke(
handler: Transaction.() -> ((command: TCommand) -> Unit)
) {
}
}
}
interface Transaction {
val someService: SomeService
}
interface SomeService {
fun execute(command: Command1)
fun execute(command: Command2)
}
compiler/testData/diagnostics/tests/callableReference/kt32267.kt
Vendored
+39
View File
@@ -0,0 +1,39 @@
// SKIP_TXT
// !DIAGNOSTICS: -UNUSED_PARAMETER
// !LANGUAGE: +NewInference
fun main() {
Configuration().commands {
Command1 { someService::execute } // Overload resolution ambiguity. All these functions match.
Command2 { someService::execute } // Overload resolution ambiguity. All these functions match.
Command1 { { someService.execute(it) } } // fine
Command2 { { someService.execute(it) } } // fine
}
}
interface Command
interface CommandFactory<TCommand : Command>
class Command1 : Command {
companion object : CommandFactory<Command1>
}
class Command2 : Command {
companion object : CommandFactory<Command2>
}
class Configuration {
val commands = Commands()
inline fun commands(configure: Commands.() -> Unit) {
commands.configure()
}
class Commands {
operator fun <TCommand : Command> CommandFactory<TCommand>.invoke(
handler: Transaction.() -> ((command: TCommand) -> Unit)
) {
}
}
}
interface Transaction {
val someService: SomeService
}
interface SomeService {
fun execute(command: Command1)
fun execute(command: Command2)
}
compiler/testData/diagnostics/tests/callableReference/lambdaResult.fir.kt
Vendored
+43
View File
@@ -0,0 +1,43 @@
// SKIP_TXT
// !DIAGNOSTICS: -UNUSED_PARAMETER
// !LANGUAGE: +NewInference
interface Inv<T>
fun <E> Inv<E>.foo(
handler: () -> ((command: E) -> Unit)
) {}
fun bar(x: Int) {}
fun bar(x: String) {}
fun bar1(arg: Int) {}
fun foo1(f: () -> (Int) -> Unit) = ""
fun main(x: Inv<Int>) {
x.foo<Int> {
if (x.hashCode() == 0) return@foo <!UNRESOLVED_REFERENCE!>::bar<!>
::bar
}
x.foo {
if (x.hashCode() == 0) return@foo <!UNRESOLVED_REFERENCE!>::bar<!>
::bar
}
foo1 {
::bar1
}
foo1 {
return@foo1 ::bar1
}
foo1 {
if (x.hashCode() == 0) return@foo1 <!UNRESOLVED_REFERENCE!>::bar<!>
::bar
}
}
compiler/testData/diagnostics/tests/callableReference/lambdaResult.kt
Vendored
+43
View File
@@ -0,0 +1,43 @@
// SKIP_TXT
// !DIAGNOSTICS: -UNUSED_PARAMETER
// !LANGUAGE: +NewInference
interface Inv<T>
fun <E> Inv<E>.foo(
handler: () -> ((command: E) -> Unit)
) {}
fun bar(x: Int) {}
fun bar(x: String) {}
fun bar1(arg: Int) {}
fun foo1(f: () -> (Int) -> Unit) = ""
fun main(x: Inv<Int>) {
x.foo<Int> {
if (x.hashCode() == 0) return@foo ::bar
::bar
}
x.foo {
if (x.hashCode() == 0) return@foo ::bar
::bar
}
foo1 {
::bar1
}
foo1 {
return@foo1 ::bar1
}
foo1 {
if (x.hashCode() == 0) return@foo1 ::bar
::bar
}
}
compiler/testData/diagnostics/tests/inference/coercionToUnit/coercionToUnitReference.fir.kt
Vendored
+14
View File
@@ -0,0 +1,14 @@
// SKIP_TXT
// !DIAGNOSTICS: -UNUSED_PARAMETER
// !LANGUAGE: +NewInference
fun foo(f: () -> Unit) {}
fun bar(): Int = 42
fun test() {
foo {
::bar // should be fine
}
foo {
{ "something" } // should be fine
}
}
compiler/testData/diagnostics/tests/inference/coercionToUnit/coercionToUnitReference.kt
Vendored
+14
View File
@@ -0,0 +1,14 @@
// SKIP_TXT
// !DIAGNOSTICS: -UNUSED_PARAMETER
// !LANGUAGE: +NewInference
fun foo(f: () -> Unit) {}
fun bar(): Int = 42
fun test() {
foo {
<!UNUSED_EXPRESSION!>::bar<!> // should be fine
}
foo {
<!UNUSED_LAMBDA_EXPRESSION!>{ "something" }<!> // should be fine
}
}
compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java
Generated
+15
View File
@@ -1856,11 +1856,21 @@ public class DiagnosticsTestGenerated extends AbstractDiagnosticsTest {
runTest("compiler/testData/diagnostics/tests/callableReference/kt32256.kt");
}
@TestMetadata("kt32267.kt")
public void testKt32267() throws Exception {
runTest("compiler/testData/diagnostics/tests/callableReference/kt32267.kt");
}
@TestMetadata("kt7430_wrongClassOnLHS.kt")
public void testKt7430_wrongClassOnLHS() throws Exception {
runTest("compiler/testData/diagnostics/tests/callableReference/kt7430_wrongClassOnLHS.kt");
}
@TestMetadata("lambdaResult.kt")
public void testLambdaResult() throws Exception {
runTest("compiler/testData/diagnostics/tests/callableReference/lambdaResult.kt");
}
@TestMetadata("memberExtensionsImportedFromObjectsUnsupported.kt")
public void testMemberExtensionsImportedFromObjectsUnsupported() throws Exception {
runTest("compiler/testData/diagnostics/tests/callableReference/memberExtensionsImportedFromObjectsUnsupported.kt");
@@ -10230,6 +10240,11 @@ public class DiagnosticsTestGenerated extends AbstractDiagnosticsTest {
runTest("compiler/testData/diagnostics/tests/inference/coercionToUnit/coercionToUnitForLastLambdaInLambda.kt");
}
@TestMetadata("coercionToUnitReference.kt")
public void testCoercionToUnitReference() throws Exception {
runTest("compiler/testData/diagnostics/tests/inference/coercionToUnit/coercionToUnitReference.kt");
}
@TestMetadata("coercionWithExpectedType.kt")
public void testCoercionWithExpectedType() throws Exception {
runTest("compiler/testData/diagnostics/tests/inference/coercionToUnit/coercionWithExpectedType.kt");
compiler/tests/org/jetbrains/kotlin/checkers/javac/DiagnosticsUsingJavacTestGenerated.java
Generated
+15
View File
@@ -1851,11 +1851,21 @@ public class DiagnosticsUsingJavacTestGenerated extends AbstractDiagnosticsUsing
runTest("compiler/testData/diagnostics/tests/callableReference/kt32256.kt");
}
@TestMetadata("kt32267.kt")
public void testKt32267() throws Exception {
runTest("compiler/testData/diagnostics/tests/callableReference/kt32267.kt");
}
@TestMetadata("kt7430_wrongClassOnLHS.kt")
public void testKt7430_wrongClassOnLHS() throws Exception {
runTest("compiler/testData/diagnostics/tests/callableReference/kt7430_wrongClassOnLHS.kt");
}
@TestMetadata("lambdaResult.kt")
public void testLambdaResult() throws Exception {
runTest("compiler/testData/diagnostics/tests/callableReference/lambdaResult.kt");
}
@TestMetadata("memberExtensionsImportedFromObjectsUnsupported.kt")
public void testMemberExtensionsImportedFromObjectsUnsupported() throws Exception {
runTest("compiler/testData/diagnostics/tests/callableReference/memberExtensionsImportedFromObjectsUnsupported.kt");
@@ -10225,6 +10235,11 @@ public class DiagnosticsUsingJavacTestGenerated extends AbstractDiagnosticsUsing
runTest("compiler/testData/diagnostics/tests/inference/coercionToUnit/coercionToUnitForLastLambdaInLambda.kt");
}
@TestMetadata("coercionToUnitReference.kt")
public void testCoercionToUnitReference() throws Exception {
runTest("compiler/testData/diagnostics/tests/inference/coercionToUnit/coercionToUnitReference.kt");
}
@TestMetadata("coercionWithExpectedType.kt")
public void testCoercionWithExpectedType() throws Exception {
runTest("compiler/testData/diagnostics/tests/inference/coercionToUnit/coercionWithExpectedType.kt");