From 11c550ec8a554188ad015c3f0a129edc18566851 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Mon, 30 Jan 2012 18:18:56 +0400 Subject: [PATCH] Changed Kotlin namespace context so template name parsed as modifier is not considered as piece of function/property/class --- .../jet/plugin/liveTemplates/JetTemplateContextType.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/idea/src/org/jetbrains/jet/plugin/liveTemplates/JetTemplateContextType.java b/idea/src/org/jetbrains/jet/plugin/liveTemplates/JetTemplateContextType.java index 63bddd947ab..924f3158bf7 100644 --- a/idea/src/org/jetbrains/jet/plugin/liveTemplates/JetTemplateContextType.java +++ b/idea/src/org/jetbrains/jet/plugin/liveTemplates/JetTemplateContextType.java @@ -56,6 +56,14 @@ public abstract class JetTemplateContextType extends TemplateContextType { protected boolean isInContext(@NotNull PsiElement element) { PsiElement e = element; 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 || e instanceof JetClassOrObject) { return false;