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

Correct context element for watches

Browse Source
This commit is contained in:
Natalia Ukhorskaya
2014-06-04 18:07:27 +04:00
parent a593738ca6
commit f4b01b5f47
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinCodeFragmentFactory.kt
+5 -1
View File
@@ -50,7 +50,7 @@ class KotlinCodeFragmentFactory: CodeFragmentFactory() {
override fun isContextAccepted(contextElement: PsiElement?): Boolean { override fun isContextAccepted(contextElement: PsiElement?): Boolean {
if (contextElement is PsiCodeBlock) { if (contextElement is PsiCodeBlock) {
return contextElement.getContext()?.getContext()?.getLanguage() == JetFileType.INSTANCE.getLanguage() return isContextAccepted(contextElement.getContext())
} }
return contextElement?.getLanguage() == JetFileType.INSTANCE.getLanguage() return contextElement?.getLanguage() == JetFileType.INSTANCE.getLanguage()
} }
@@ -63,6 +63,10 @@ class KotlinCodeFragmentFactory: CodeFragmentFactory() {
fun getContextElement(elementAt: PsiElement?): PsiElement? { fun getContextElement(elementAt: PsiElement?): PsiElement? {
if (elementAt == null) return null if (elementAt == null) return null
if (elementAt is PsiCodeBlock) {
return getContextElement(elementAt.getContext())
}
val expressionAtOffset = PsiTreeUtil.findElementOfClassAtOffset(elementAt.getContainingFile()!!, elementAt.getTextOffset(), javaClass<JetExpression>(), false) val expressionAtOffset = PsiTreeUtil.findElementOfClassAtOffset(elementAt.getContainingFile()!!, elementAt.getTextOffset(), javaClass<JetExpression>(), false)
if (expressionAtOffset != null) { if (expressionAtOffset != null) {
return expressionAtOffset return expressionAtOffset