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

Debugger: Exclude inline callable usages inside itself (EA-117459)

Browse Source
This commit is contained in:
Yan Zhulanow
2018-06-01 20:55:13 +03:00
parent 6e3c2e8015
commit 778df36dfa
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/InlineCallableUsagesSearcher.kt
+3 -1
View File
@@ -36,6 +36,8 @@ import org.jetbrains.kotlin.idea.util.ProjectRootsUtil
import org.jetbrains.kotlin.idea.util.application.runReadAction import org.jetbrains.kotlin.idea.util.application.runReadAction
import org.jetbrains.kotlin.psi.KtDeclaration import org.jetbrains.kotlin.psi.KtDeclaration
import org.jetbrains.kotlin.psi.KtElement import org.jetbrains.kotlin.psi.KtElement
import org.jetbrains.kotlin.psi.psiUtil.isAncestor
import org.jetbrains.kotlin.psi.psiUtil.isInsideOf
import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.BindingContext
import org.jetbrains.kotlin.resolve.inline.InlineUtil import org.jetbrains.kotlin.resolve.inline.InlineUtil
@@ -56,7 +58,7 @@ class InlineCallableUsagesSearcher(private val myDebugProcess: DebugProcess) {
ReferencesSearch.search(declaration, getScopeForInlineDeclarationUsages(declaration)).forEach { ReferencesSearch.search(declaration, getScopeForInlineDeclarationUsages(declaration)).forEach {
if (!runReadAction { it.isImportUsage() }) { if (!runReadAction { it.isImportUsage() }) {
val usage = (it.element as? KtElement)?.let(::getRelevantElement) val usage = (it.element as? KtElement)?.let(::getRelevantElement)
if (usage != null) { if (usage != null && !runReadAction { declaration.isAncestor(usage) }) {
searchResult.add(usage) searchResult.add(usage)
} }
} }