[AA] include inferred types in functional exp expected type

Fixed for K2 only, k1 remains as is

^KT-62466 fixed

analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/components/expressionTypeProvider/Fe10IdeNormalAnalysisSourceModuleExpectedExpressionTypeTestGenerated.java

@@ -184,6 +184,12 @@ public class Fe10IdeNormalAnalysisSourceModuleExpectedExpressionTypeTestGenerate
         runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/functionPositionalParamQualified.kt");
     }
 
+    @Test
+    @TestMetadata("functionalTypeSubstitution.kt")
+    public void testFunctionalTypeSubstitution() throws Exception {
+        runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/functionalTypeSubstitution.kt");
+    }
+
     @Test
     @TestMetadata("ifCondition.kt")
     public void testIfCondition() throws Exception {

analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirExpressionTypeProvider.kt

@@ -223,7 +223,10 @@ internal class KtFirExpressionTypeProvider(
 
         val callee = (firCall.calleeReference as? FirResolvedNamedReference)?.resolvedSymbol
         if (callee?.fir?.origin == FirDeclarationOrigin.SamConstructor) {
-            return (callee.fir as FirSimpleFunction).returnTypeRef.coneType.asKtType()
+            val substitutor = (firCall as? FirQualifiedAccessExpression)
+                ?.createConeSubstitutorFromTypeArguments(discardErrorTypes = true)
+                ?: ConeSubstitutor.Empty
+            return substitutor.substituteOrSelf((callee.fir as FirSimpleFunction).returnTypeRef.coneType).asKtType()
         }
 
         val argumentsToParameters = firCall.argumentsToSubstitutedValueParameters(substituteWithErrorTypes = false) ?: return null

analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/expressionTypeProvider/FirIdeDependentAnalysisSourceModuleExpectedExpressionTypeTestGenerated.java

@@ -184,6 +184,12 @@ public class FirIdeDependentAnalysisSourceModuleExpectedExpressionTypeTestGenera
         runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/functionPositionalParamQualified.kt");
     }
 
+    @Test
+    @TestMetadata("functionalTypeSubstitution.kt")
+    public void testFunctionalTypeSubstitution() throws Exception {
+        runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/functionalTypeSubstitution.kt");
+    }
+
     @Test
     @TestMetadata("ifCondition.kt")
     public void testIfCondition() throws Exception {

analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/expressionTypeProvider/FirIdeNormalAnalysisSourceModuleExpectedExpressionTypeTestGenerated.java

@@ -184,6 +184,12 @@ public class FirIdeNormalAnalysisSourceModuleExpectedExpressionTypeTestGenerated
         runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/functionPositionalParamQualified.kt");
     }
 
+    @Test
+    @TestMetadata("functionalTypeSubstitution.kt")
+    public void testFunctionalTypeSubstitution() throws Exception {
+        runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/functionalTypeSubstitution.kt");
+    }
+
     @Test
     @TestMetadata("ifCondition.kt")
     public void testIfCondition() throws Exception {

analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/components/expressionTypeProvider/FirStandaloneNormalAnalysisSourceModuleExpectedExpressionTypeTestGenerated.java

@@ -184,6 +184,12 @@ public class FirStandaloneNormalAnalysisSourceModuleExpectedExpressionTypeTestGe
         runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/functionPositionalParamQualified.kt");
     }
 
+    @Test
+    @TestMetadata("functionalTypeSubstitution.kt")
+    public void testFunctionalTypeSubstitution() throws Exception {
+        runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/functionalTypeSubstitution.kt");
+    }
+
     @Test
     @TestMetadata("ifCondition.kt")
     public void testIfCondition() throws Exception {

analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/functionalTypeSubstitution.descriptors.txt

@@ -0,0 +1,11 @@
+expression: {
+            s: String -> 0
+    }
+expected type: KtUsualClassType:
+  annotationsList: []
+  ownTypeArguments: [
+    KtTypeParameterType:
+      annotationsList: []
+      type: T
+  ]
+  type: java/lang/Comparable<T>

analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/functionalTypeSubstitution.kt

@@ -0,0 +1,7 @@
+fun <K> test(f: java.lang.Comparable<K>) {}
+
+fun f() {
+    test(java.lang.Comparable {<caret>
+            s: String -> 0
+    })
+}

analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/functionalTypeSubstitution.txt

@@ -0,0 +1,11 @@
+expression: {
+            s: String -> 0
+    }
+expected type: KtUsualClassType:
+  annotationsList: []
+  ownTypeArguments: [
+    KtFlexibleType:
+      annotationsList: []
+      type: kotlin/String!
+  ]
+  type: java/lang/Comparable<kotlin/String!>