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

Debugger: Search candidates for smart step into in a read action

Browse Source
This commit is contained in:
Yan Zhulanow
2019-08-13 22:08:52 +09:00
parent 9cc7ff0efc
commit c3e46ebe5c
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/stepping/smartStepInto/KotlinSmartStepIntoHandler.kt
+7 -5
View File
@@ -17,6 +17,7 @@ import org.jetbrains.kotlin.idea.debugger.stepping.KotlinBasicStepMethodFilter
import org.jetbrains.kotlin.idea.debugger.stepping.KotlinLambdaMethodFilter import org.jetbrains.kotlin.idea.debugger.stepping.KotlinLambdaMethodFilter
import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.psi.psiUtil.createSmartPointer import org.jetbrains.kotlin.psi.psiUtil.createSmartPointer
import org.jetbrains.kotlin.idea.util.application.runReadAction
class KotlinSmartStepIntoHandler : JvmSmartStepIntoHandler() { class KotlinSmartStepIntoHandler : JvmSmartStepIntoHandler() {
override fun isAvailable(position: SourcePosition?) = position?.file is KtFile override fun isAvailable(position: SourcePosition?) = position?.file is KtFile
@@ -29,11 +30,12 @@ class KotlinSmartStepIntoHandler : JvmSmartStepIntoHandler() {
val document = PsiDocumentManager.getInstance(file.project).getDocument(file) ?: return emptyList() val document = PsiDocumentManager.getInstance(file.project).getDocument(file) ?: return emptyList()
val lines = Range(document.getLineNumber(elementTextRange.startOffset), document.getLineNumber(elementTextRange.endOffset)) val lines = Range(document.getLineNumber(elementTextRange.startOffset), document.getLineNumber(elementTextRange.endOffset))
val consumer = OrderedSet<SmartStepTarget>() return runReadAction {
val visitor = SmartStepTargetVisitor(ktElement, lines, consumer) val consumer = OrderedSet<SmartStepTarget>()
ktElement.accept(visitor, null) val visitor = SmartStepTargetVisitor(ktElement, lines, consumer)
ktElement.accept(visitor, null)
return consumer return@runReadAction consumer
}
} }
override fun createMethodFilter(stepTarget: SmartStepTarget?): MethodFilter? { override fun createMethodFilter(stepTarget: SmartStepTarget?): MethodFilter? {