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

Minor: explicitly use FULL mode for resolve, tests are falling otherwise

Browse Source
This commit is contained in:
Nikolay Krasko
2019-01-23 17:12:37 +03:00
parent a0b8980d77
commit 92a50b2880
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinHighlightExitPointsHandlerFactory.kt
+3 -2
View File
@@ -32,6 +32,7 @@ import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.psi.psiUtil.parents import org.jetbrains.kotlin.psi.psiUtil.parents
import org.jetbrains.kotlin.resolve.bindingContextUtil.isUsedAsResultOfLambda import org.jetbrains.kotlin.resolve.bindingContextUtil.isUsedAsResultOfLambda
import org.jetbrains.kotlin.resolve.inline.InlineUtil import org.jetbrains.kotlin.resolve.inline.InlineUtil
import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
class KotlinHighlightExitPointsHandlerFactory : HighlightUsagesHandlerFactoryBase() { class KotlinHighlightExitPointsHandlerFactory : HighlightUsagesHandlerFactoryBase() {
companion object { companion object {
@@ -111,7 +112,7 @@ class KotlinHighlightExitPointsHandlerFactory : HighlightUsagesHandlerFactoryBas
return false return false
} }
val bindingContext = expression.analyze() val bindingContext = expression.analyze(BodyResolveMode.FULL)
if (!expression.isUsedAsResultOfLambda(bindingContext)) { if (!expression.isUsedAsResultOfLambda(bindingContext)) {
return false return false
} }
@@ -157,7 +158,7 @@ private fun KtExpression.getRelevantDeclaration(): KtDeclarationWithBody? {
} }
if (InlineUtil.canBeInlineArgument(parent) && if (InlineUtil.canBeInlineArgument(parent) &&
!InlineUtil.isInlinedArgument(parent as KtFunction, parent.analyze(), false) !InlineUtil.isInlinedArgument(parent as KtFunction, parent.analyze(BodyResolveMode.FULL), false)
) { ) {
return parent return parent
} }