From 19efb9fee55c987e8293b06241e85fae7d0892bf Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Sun, 8 Apr 2012 18:10:38 +0400 Subject: [PATCH] Got rid of live templates in completion after dot. #KT-1676 fixed --- .../plugin/liveTemplates/JetTemplateContextType.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/idea/src/org/jetbrains/jet/plugin/liveTemplates/JetTemplateContextType.java b/idea/src/org/jetbrains/jet/plugin/liveTemplates/JetTemplateContextType.java index 546353a8f2c..3cdc8b093a0 100644 --- a/idea/src/org/jetbrains/jet/plugin/liveTemplates/JetTemplateContextType.java +++ b/idea/src/org/jetbrains/jet/plugin/liveTemplates/JetTemplateContextType.java @@ -55,8 +55,16 @@ public abstract class JetTemplateContextType extends TemplateContextType { } else if (element instanceof LeafPsiElement) { IElementType elementType = ((LeafPsiElement) element).getElementType(); - if (elementType == JetTokens.IDENTIFIER && !(element.getParent() instanceof JetReferenceExpression)) { - return false; + if (elementType == JetTokens.IDENTIFIER) { + if (element.getParent() instanceof JetReferenceExpression) { + PsiElement parentOfParent = element.getParent().getParent(); + JetQualifiedExpression qualifiedExpression = PsiTreeUtil.getParentOfType(element, JetQualifiedExpression.class); + if (qualifiedExpression != null && qualifiedExpression.getSelectorExpression() == parentOfParent) { + return false; + } + } else { + return false; + } } } return element != null && isInContext(element);