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

Skip whitespaces as context elements of codeFragmnets

Browse Source 
#KT-10171 Fixed
This commit is contained in:
Natalia Ukhorskaya
2015-12-02 17:53:12 +03:00
parent 49e484d796
commit 42119b311d
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinCodeFragmentFactory.kt
+9 -2
View File
@@ -151,9 +151,16 @@ class KotlinCodeFragmentFactory: CodeFragmentFactory() {
val containingFile = elementAt.containingFile val containingFile = elementAt.containingFile
if (containingFile !is KtFile) return null if (containingFile !is KtFile) return null
var result = PsiTreeUtil.findElementOfClassAtOffset(containingFile, elementAt.textOffset, javaClass<KtExpression>(), false) // elementAt can be PsiWhiteSpace when codeFragment is created from line start offset (in case of first opening EE window)
val lineStartOffset = if (elementAt is PsiWhiteSpace || elementAt is PsiComment) {
PsiTreeUtil.skipSiblingsForward(elementAt, PsiWhiteSpace::class.java, PsiComment::class.java)?.textOffset ?: elementAt.textOffset
} else {
elementAt.textOffset
}
var result = PsiTreeUtil.findElementOfClassAtOffset(containingFile, lineStartOffset, javaClass<KtExpression>(), false)
if (result.check()) { if (result.check()) {
return CodeInsightUtils.getTopmostElementAtOffset(result!!, result.textOffset, KtExpression::class.java) return CodeInsightUtils.getTopmostElementAtOffset(result!!, lineStartOffset, KtExpression::class.java)
} }
result = KotlinEditorTextProvider.findExpressionInner(elementAt, true) result = KotlinEditorTextProvider.findExpressionInner(elementAt, true)