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

Alt+Click: set correct context element for code fragments from Alt+Click and Watch Points

Browse Source 
#KT-5598 Fixed
This commit is contained in:
Natalia Ukhorskaya
2014-08-11 12:53:07 +04:00
parent 12db8f1551
commit e10c79617a
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinCodeFragmentFactory.kt
+3 -2
View File
@@ -50,7 +50,8 @@ class KotlinCodeFragmentFactory: CodeFragmentFactory() {
override fun isContextAccepted(contextElement: PsiElement?): Boolean { override fun isContextAccepted(contextElement: PsiElement?): Boolean {
if (contextElement is PsiCodeBlock) { if (contextElement is PsiCodeBlock) {
return isContextAccepted(contextElement.getContext()) // PsiCodeBlock -> DummyHolder -> originalElement
return isContextAccepted(contextElement.getContext()?.getContext())
} }
return contextElement?.getLanguage() == JetFileType.INSTANCE.getLanguage() return contextElement?.getLanguage() == JetFileType.INSTANCE.getLanguage()
} }
@@ -64,7 +65,7 @@ class KotlinCodeFragmentFactory: CodeFragmentFactory() {
if (elementAt == null) return null if (elementAt == null) return null
if (elementAt is PsiCodeBlock) { if (elementAt is PsiCodeBlock) {
return getContextElement(elementAt.getContext()) return getContextElement(elementAt.getContext()?.getContext())
} }
val expressionAtOffset = PsiTreeUtil.findElementOfClassAtOffset(elementAt.getContainingFile()!!, elementAt.getTextOffset(), javaClass<JetExpression>(), false) val expressionAtOffset = PsiTreeUtil.findElementOfClassAtOffset(elementAt.getContainingFile()!!, elementAt.getTextOffset(), javaClass<JetExpression>(), false)