From d4354a466fa514453e55b372f7fe78cf9554d839 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Wed, 29 Feb 2012 13:09:12 +0400 Subject: [PATCH] Removed live templates from namespace header and import directives. #KT-1234 fixed --- .../plugin/liveTemplates/JetTemplateContextType.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/idea/src/org/jetbrains/jet/plugin/liveTemplates/JetTemplateContextType.java b/idea/src/org/jetbrains/jet/plugin/liveTemplates/JetTemplateContextType.java index 7eaa7a94f5e..546353a8f2c 100644 --- a/idea/src/org/jetbrains/jet/plugin/liveTemplates/JetTemplateContextType.java +++ b/idea/src/org/jetbrains/jet/plugin/liveTemplates/JetTemplateContextType.java @@ -24,6 +24,7 @@ import com.intellij.psi.PsiFile; import com.intellij.psi.PsiWhiteSpace; import com.intellij.psi.impl.source.tree.LeafPsiElement; import com.intellij.psi.tree.IElementType; +import com.intellij.psi.util.PsiTreeUtil; import com.intellij.psi.util.PsiUtilBase; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; @@ -47,7 +48,12 @@ public abstract class JetTemplateContextType extends TemplateContextType { PsiElement element = file.findElementAt(offset); if (element instanceof PsiWhiteSpace || element instanceof PsiComment) { return false; - } else if (element instanceof LeafPsiElement) { + } + else if (PsiTreeUtil.getParentOfType(element, JetNamespaceHeader.class) != null + || PsiTreeUtil.getParentOfType(element, JetImportDirective.class) != null) { + return false; + } + else if (element instanceof LeafPsiElement) { IElementType elementType = ((LeafPsiElement) element).getElementType(); if (elementType == JetTokens.IDENTIFIER && !(element.getParent() instanceof JetReferenceExpression)) { return false; @@ -152,8 +158,8 @@ public abstract class JetTemplateContextType extends TemplateContextType { @Override protected boolean isInContext(@NotNull PsiElement element) { return element.getParent() instanceof JetExpression && !(element.getParent() instanceof JetConstantExpression) && - !(element.getParent().getParent() instanceof JetDotQualifiedExpression) - && !(element.getParent() instanceof JetParameter); + !(element.getParent().getParent() instanceof JetDotQualifiedExpression) + && !(element.getParent() instanceof JetParameter); } } }