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

Changed Kotlin namespace context so template name parsed as modifier is not considered as piece of function/property/class

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-01-30 18:18:56 +04:00
parent 834ac6ea1f
commit 11c550ec8a
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/liveTemplates/JetTemplateContextType.java
+8
View File
@@ -56,6 +56,14 @@ public abstract class JetTemplateContextType extends TemplateContextType {
protected boolean isInContext(@NotNull PsiElement element) { protected boolean isInContext(@NotNull PsiElement element) {
PsiElement e = element; PsiElement e = element;
while (e != null) { while (e != null) {
if (e instanceof JetModifierList) {
// skip property/function/class or object which is owner of modifier list
e = e.getParent();
if (e != null) {
e = e.getParent();
}
continue;
}
if (e instanceof JetProperty || e instanceof JetNamedFunction if (e instanceof JetProperty || e instanceof JetNamedFunction
|| e instanceof JetClassOrObject) { || e instanceof JetClassOrObject) {
return false; return false;