diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/typeUtils.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/typeUtils.kt index 7c21f1c4602..25ca6b3e9ee 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/typeUtils.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/typeUtils.kt @@ -349,10 +349,9 @@ fun getDataFlowAwareTypes( if (originalType == null) return emptyList() val dataFlowInfo = bindingContext.getDataFlowInfoAfter(expression) val dataFlowValueFactory = expression.getResolutionFacade().frontendService() + val expressionType = bindingContext.getType(expression) ?: return listOf(originalType) val dataFlowValue = dataFlowValueFactory.createDataFlowValue( - expression, - bindingContext.getType(expression)!!, - bindingContext, expression.getResolutionFacade().moduleDescriptor + expression, expressionType, bindingContext, expression.getResolutionFacade().moduleDescriptor ) return dataFlowInfo.getCollectedTypes(dataFlowValue, expression.languageVersionSettings).ifEmpty { listOf(originalType) } } \ No newline at end of file