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

Use PARTIAL mode in analyzer to provide lambda return value hints

Browse Source 
It only uses `isUsedAsResultOfLambda` (so, CFA) and don't have to
 resolve bodies fully
This commit is contained in:
Mikhail Zarechenskiy
2019-09-09 03:29:28 +03:00
parent d253cd5032
commit 85ff979bd4
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/parameterInfo/LambdaReturnValueHints.kt
+2 -1
View File
@@ -14,6 +14,7 @@ import org.jetbrains.kotlin.psi.psiUtil.getParentOfType
import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType
import org.jetbrains.kotlin.psi.psiUtil.startOffset import org.jetbrains.kotlin.psi.psiUtil.startOffset
import org.jetbrains.kotlin.resolve.bindingContextUtil.isUsedAsResultOfLambda import org.jetbrains.kotlin.resolve.bindingContextUtil.isUsedAsResultOfLambda
import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
fun provideLambdaReturnValueHints(expression: KtExpression): List<InlayInfo> { fun provideLambdaReturnValueHints(expression: KtExpression): List<InlayInfo> {
if (expression is KtWhenExpression || expression is KtBlockExpression) { if (expression is KtWhenExpression || expression is KtBlockExpression) {
@@ -42,7 +43,7 @@ fun provideLambdaReturnValueHints(expression: KtExpression): List<InlayInfo> {
return emptyList() return emptyList()
} }
val bindingContext = expression.analyze() val bindingContext = expression.analyze(BodyResolveMode.PARTIAL_WITH_CFA)
if (expression.isUsedAsResultOfLambda(bindingContext)) { if (expression.isUsedAsResultOfLambda(bindingContext)) {
val lambdaName = getNameOfFunctionThatTakesLambda(expression) ?: "lambda" val lambdaName = getNameOfFunctionThatTakesLambda(expression) ?: "lambda"
return listOf(InlayInfo("$TYPE_INFO_PREFIX^$lambdaName", expression.startOffset)) return listOf(InlayInfo("$TYPE_INFO_PREFIX^$lambdaName", expression.startOffset))