[AA] getExpectedType should not calculate expression type

if property doesn't specify explicit type,
property's return type would be calculated by provided initializer

^KT-62588 fixed


Merge-request: KT-MR-12564
Merged-by: Anna Kozlova <Anna.Kozlova@jetbrains.com>

analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/components/KtFe10ExpressionTypeProvider.kt

@@ -191,6 +191,8 @@ class KtFe10ExpressionTypeProvider(
                     return null
                 }
 
+                if (parentExpression.typeReference == null) return null
+
                 val bindingContext = analysisContext.analyze(parentExpression)
                 val descriptor = bindingContext[BindingContext.DECLARATION_TO_DESCRIPTOR, parentExpression]
                 if (descriptor is CallableDescriptor) {

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

@@ -280,6 +280,12 @@ public class Fe10IdeNormalAnalysisSourceModuleExpectedExpressionTypeTestGenerate
         runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/propertyDeclaration.kt");
     }
 
+    @Test
+    @TestMetadata("propertyDeclarationNoExplicitType.kt")
+    public void testPropertyDeclarationNoExplicitType() throws Exception {
+        runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/propertyDeclarationNoExplicitType.kt");
+    }
+
     @Test
     @TestMetadata("propertyDeclarationQualified.kt")
     public void testPropertyDeclarationQualified() throws Exception {

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

@@ -317,6 +317,7 @@ internal class KtFirExpressionTypeProvider(
         // Given: `val x: T = expression`
         // Expected type of `expression` is `T`
         val property = expression.unwrapQualified<KtProperty> { property, expr -> property.initializer == expr } ?: return null
+        if (property.typeReference == null) return null
         return getReturnTypeForKtDeclaration(property).nonErrorTypeOrNull()
     }
 
@@ -329,6 +330,7 @@ internal class KtFirExpressionTypeProvider(
             // which may raise an exception if we attempt to retrieve, e.g., callable declaration from it.
             return null
         }
+        if (function.typeReference == null) return null
         return getReturnTypeForKtDeclaration(function).nonErrorTypeOrNull()
     }
 

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

@@ -280,6 +280,12 @@ public class FirIdeDependentAnalysisSourceModuleExpectedExpressionTypeTestGenera
         runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/propertyDeclaration.kt");
     }
 
+    @Test
+    @TestMetadata("propertyDeclarationNoExplicitType.kt")
+    public void testPropertyDeclarationNoExplicitType() throws Exception {
+        runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/propertyDeclarationNoExplicitType.kt");
+    }
+
     @Test
     @TestMetadata("propertyDeclarationQualified.kt")
     public void testPropertyDeclarationQualified() throws Exception {

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

@@ -280,6 +280,12 @@ public class FirIdeNormalAnalysisSourceModuleExpectedExpressionTypeTestGenerated
         runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/propertyDeclaration.kt");
     }
 
+    @Test
+    @TestMetadata("propertyDeclarationNoExplicitType.kt")
+    public void testPropertyDeclarationNoExplicitType() throws Exception {
+        runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/propertyDeclarationNoExplicitType.kt");
+    }
+
     @Test
     @TestMetadata("propertyDeclarationQualified.kt")
     public void testPropertyDeclarationQualified() throws Exception {

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

@@ -280,6 +280,12 @@ public class FirStandaloneNormalAnalysisSourceModuleExpectedExpressionTypeTestGe
         runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/propertyDeclaration.kt");
     }
 
+    @Test
+    @TestMetadata("propertyDeclarationNoExplicitType.kt")
+    public void testPropertyDeclarationNoExplicitType() throws Exception {
+        runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/propertyDeclarationNoExplicitType.kt");
+    }
+
     @Test
     @TestMetadata("propertyDeclarationQualified.kt")
     public void testPropertyDeclarationQualified() throws Exception {

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

@@ -1,5 +1,2 @@
 expression: av
-expected type: KtUsualClassType:
+expected type: null
-  annotationsList: []
-  ownTypeArguments: []
-  type: kotlin/String

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

@@ -2,16 +2,4 @@ expression: { a: Int ->
     val b = 1
     a + b
 }
-expected type: KtFunctionalType:
+expected type: null
-  annotationsList: []
-  ownTypeArguments: [
-    KtUsualClassType:
-      annotationsList: []
-      ownTypeArguments: []
-      type: kotlin/Int
-    KtUsualClassType:
-      annotationsList: []
-      ownTypeArguments: []
-      type: kotlin/Int
-  ]
-  type: kotlin/Function1<kotlin/Int, kotlin/Int>

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

@@ -0,0 +1,4 @@
+class C {
+    var y = "<caret>"
+}
+

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

@@ -0,0 +1,2 @@
+expression: ""
+expected type: null

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

@@ -1,5 +1,2 @@
 expression: av
-expected type: KtUsualClassType:
+expected type: null
-  annotationsList: []
-  ownTypeArguments: []
-  type: kotlin/String

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

@@ -1,5 +1,4 @@
 expression: av
-expected type: KtUsualClassType:
+expected type: KtIntersectionType:
   annotationsList: []
-  ownTypeArguments: []
+  type: it(kotlin/Int & kotlin/String)
-  type: kotlin/Any