~ fix callable references case
diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java
index bdb443e..519ef32 100644
--- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java
+++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java
@@ -16584,6 +16584,12 @@
}
@Test
+ @TestMetadata("callableReferenceInsideInvokeCall.kt")
+ public void testCallableReferenceInsideInvokeCall() throws Exception {
+ runTest("compiler/testData/diagnostics/tests/inference/builderInference/callableReferenceInsideInvokeCall.kt");
+ }
+
+ @Test
@TestMetadata("changingResolveIfDontUseBuilderInference.kt")
public void testChangingResolveIfDontUseBuilderInference() throws Exception {
runTest("compiler/testData/diagnostics/tests/inference/builderInference/changingResolveIfDontUseBuilderInference.kt");
diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java
index 6631cea..4b8d406 100644
--- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java
+++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java
@@ -16584,6 +16584,12 @@
}
@Test
+ @TestMetadata("callableReferenceInsideInvokeCall.kt")
+ public void testCallableReferenceInsideInvokeCall() throws Exception {
+ runTest("compiler/testData/diagnostics/tests/inference/builderInference/callableReferenceInsideInvokeCall.kt");
+ }
+
+ @Test
@TestMetadata("changingResolveIfDontUseBuilderInference.kt")
public void testChangingResolveIfDontUseBuilderInference() throws Exception {
runTest("compiler/testData/diagnostics/tests/inference/builderInference/changingResolveIfDontUseBuilderInference.kt");
diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java
index eb7ba580..777b697 100644
--- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java
+++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java
@@ -16578,6 +16578,12 @@
}
@Test
+ @TestMetadata("callableReferenceInsideInvokeCall.kt")
+ public void testCallableReferenceInsideInvokeCall() throws Exception {
+ runTest("compiler/testData/diagnostics/tests/inference/builderInference/callableReferenceInsideInvokeCall.kt");
+ }
+
+ @Test
@TestMetadata("changingResolveIfDontUseBuilderInference.kt")
public void testChangingResolveIfDontUseBuilderInference() throws Exception {
runTest("compiler/testData/diagnostics/tests/inference/builderInference/changingResolveIfDontUseBuilderInference.kt");
diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java
index 2a4b377..68321fe 100644
--- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java
+++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java
@@ -16584,6 +16584,12 @@
}
@Test
+ @TestMetadata("callableReferenceInsideInvokeCall.kt")
+ public void testCallableReferenceInsideInvokeCall() throws Exception {
+ runTest("compiler/testData/diagnostics/tests/inference/builderInference/callableReferenceInsideInvokeCall.kt");
+ }
+
+ @Test
@TestMetadata("changingResolveIfDontUseBuilderInference.kt")
public void testChangingResolveIfDontUseBuilderInference() throws Exception {
runTest("compiler/testData/diagnostics/tests/inference/builderInference/changingResolveIfDontUseBuilderInference.kt");
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/FirBuilderInferenceSession2.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/FirBuilderInferenceSession2.kt
index 3b6ed29..6f95dfe 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/FirBuilderInferenceSession2.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/FirBuilderInferenceSession2.kt
@@ -41,6 +41,9 @@
call.candidate()?.usedOuterCs != true
override fun handleQualifiedAccess(qualifiedAccessExpression: FirExpression, data: ResolutionMode) {
+ // Callable references are being processed together with containing its call
+ if (qualifiedAccessExpression is FirCallableReferenceAccess) return
+
if (qualifiedAccessExpression.resolvedType.containsNotFixedTypeVariables() && (qualifiedAccessExpression as? FirResolvable)?.candidate() == null) {
qualifiedAccessesToProcess.add(qualifiedAccessExpression)
outerCandidate.postponedAccesses += qualifiedAccessExpression
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/callableReferenceInsideInvokeCall.kt b/compiler/testData/diagnostics/tests/inference/builderInference/callableReferenceInsideInvokeCall.kt
new file mode 100644
index 0000000..70238f6
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/callableReferenceInsideInvokeCall.kt
@@ -0,0 +1,15 @@
+// FIR_IDENTICAL
+fun <X> mySuspendable(block: (MyContinuation<X>) -> Unit): X = TODO()
+
+interface MyContinuation<in Y> {
+ fun cancel(): Unit
+}
+
+fun <Z> MyContinuation<Z>.resume(value: Z) {}
+
+fun cancelOrProceed(handler: (cancel: () -> Unit, proceed: () -> Unit) -> Unit) {
+ mySuspendable { x ->
+ // Was exception: Expected expression 'FirCallableReferenceAccessImpl' to be resolved
+ handler(x::cancel) { x.resume("") }
+ }.length
+}
diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
index 82ec273..fb5aa83 100644
--- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
+++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
@@ -16584,6 +16584,12 @@
}
@Test
+ @TestMetadata("callableReferenceInsideInvokeCall.kt")
+ public void testCallableReferenceInsideInvokeCall() throws Exception {
+ runTest("compiler/testData/diagnostics/tests/inference/builderInference/callableReferenceInsideInvokeCall.kt");
+ }
+
+ @Test
@TestMetadata("changingResolveIfDontUseBuilderInference.kt")
public void testChangingResolveIfDontUseBuilderInference() throws Exception {
runTest("compiler/testData/diagnostics/tests/inference/builderInference/changingResolveIfDontUseBuilderInference.kt");
