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

[FIR IDE] Return error types from getExpectedType() as is in AAPI/FE10

Browse Source
This commit is contained in:
Yan Zhulanow
2021-11-02 01:17:40 +09:00
parent d6b9b8bdd4
commit d93d55064c
3 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/components/KtFe10ExpressionTypeProvider.kt
+3 -4
View File
@@ -32,7 +32,6 @@ import org.jetbrains.kotlin.resolve.sam.SamConstructorDescriptor
import org.jetbrains.kotlin.resolve.sam.getFunctionTypeForAbstractMethod import org.jetbrains.kotlin.resolve.sam.getFunctionTypeForAbstractMethod
import org.jetbrains.kotlin.types.ErrorUtils import org.jetbrains.kotlin.types.ErrorUtils
import org.jetbrains.kotlin.types.TypeUtils import org.jetbrains.kotlin.types.TypeUtils
import org.jetbrains.kotlin.types.isError
import org.jetbrains.kotlin.types.typeUtil.makeNullable import org.jetbrains.kotlin.types.typeUtil.makeNullable
class KtFe10ExpressionTypeProvider( class KtFe10ExpressionTypeProvider(
@@ -147,7 +146,7 @@ class KtFe10ExpressionTypeProvider(
val bindingContext = analysisContext.analyze(parentExpression) val bindingContext = analysisContext.analyze(parentExpression)
val descriptor = bindingContext[BindingContext.DECLARATION_TO_DESCRIPTOR, parentExpression] val descriptor = bindingContext[BindingContext.DECLARATION_TO_DESCRIPTOR, parentExpression]
if (descriptor is CallableDescriptor) { if (descriptor is CallableDescriptor) {
return descriptor.returnType?.takeIf { !it.isError }?.toKtType(analysisContext) return descriptor.returnType?.toKtType(analysisContext)
} }
} else if (parentExpression is KtBinaryExpressionWithTypeRHS && KtPsiUtil.isCast(parentExpression)) { } else if (parentExpression is KtBinaryExpressionWithTypeRHS && KtPsiUtil.isCast(parentExpression)) {
val typeReference = parentExpression.right val typeReference = parentExpression.right
@@ -171,7 +170,7 @@ class KtFe10ExpressionTypeProvider(
is SamConstructorDescriptor -> originalCallableDescriptor.returnTypeOrNothing is SamConstructorDescriptor -> originalCallableDescriptor.returnTypeOrNothing
else -> parameterDescriptor.type else -> parameterDescriptor.type
} }
return kotlinType.takeIf { !it.isError }?.toKtType(analysisContext) return kotlinType.toKtType(analysisContext)
} }
} }
} }
@@ -179,7 +178,7 @@ class KtFe10ExpressionTypeProvider(
val bindingContext = analysisContext.analyze(ktExpression) val bindingContext = analysisContext.analyze(ktExpression)
val kotlinType = bindingContext[BindingContext.EXPECTED_EXPRESSION_TYPE, ktExpression] val kotlinType = bindingContext[BindingContext.EXPECTED_EXPRESSION_TYPE, ktExpression]
return kotlinType?.takeIf { !it.isError }?.toKtType(analysisContext) return kotlinType?.toKtType(analysisContext)
} }
private fun getContainingCallExpression(argument: KtValueArgument): KtCallExpression? { private fun getContainingCallExpression(argument: KtValueArgument): KtCallExpression? {
analysis/analysis-api/testData/components/expectedExpressionType/functionExpressionBodyWithoutExplicitType.descriptors.txt
Vendored
-2
View File
@@ -1,2 +0,0 @@
expression: av
expected type: null
analysis/analysis-api/testData/components/expectedExpressionType/propertyDeclarationWithoutExplicitType.descriptors.txt
Vendored
-2
View File
@@ -1,2 +0,0 @@
expression: av
expected type: null