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

Removed live templates from namespace header and import directives.

Browse Source 
#KT-1234 fixed
This commit is contained in:
Evgeny Gerashchenko
2012-02-29 13:09:12 +04:00
parent 1968b941e7
commit d4354a466f
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/liveTemplates/JetTemplateContextType.java
+9 -3
View File
@@ -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);
}
}
}