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

EA-217072: Add missing read action

Browse Source
This commit is contained in:
Yan Zhulanow
2019-11-13 18:49:03 +09:00
parent 6a4b658ad4
commit 54203100bc
1 changed files with 12 additions and 10 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/debuggerUtil.kt
+12 -10
View File
@@ -216,19 +216,21 @@ fun findElementAtLine(file: KtFile, line: Int): PsiElement? {
val lineStartOffset = file.getLineStartOffset(line) ?: return null val lineStartOffset = file.getLineStartOffset(line) ?: return null
val lineEndOffset = file.getLineEndOffset(line) ?: return null val lineEndOffset = file.getLineEndOffset(line) ?: return null
var topMostElement: PsiElement? = null return runReadAction {
var elementAt: PsiElement? var topMostElement: PsiElement? = null
for (offset in lineStartOffset until lineEndOffset) { var elementAt: PsiElement?
elementAt = file.findElementAt(offset) for (offset in lineStartOffset until lineEndOffset) {
if (elementAt != null) { elementAt = file.findElementAt(offset)
topMostElement = CodeInsightUtils.getTopmostElementAtOffset(elementAt, offset) if (elementAt != null) {
if (topMostElement is KtElement) { topMostElement = CodeInsightUtils.getTopmostElementAtOffset(elementAt, offset)
break if (topMostElement is KtElement) {
break
}
} }
} }
}
return topMostElement topMostElement
}
} }
fun findCallByEndToken(element: PsiElement): KtCallExpression? { fun findCallByEndToken(element: PsiElement): KtCallExpression? {