From 8bcd70e822ebb9f479454f010ced8c9574c35a62 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Wed, 29 Feb 2012 12:06:16 +0400 Subject: [PATCH] Removed templates from completion after dot and in comments #KT-1460 fixed --- .../jet/plugin/liveTemplates/JetTemplateContextType.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/idea/src/org/jetbrains/jet/plugin/liveTemplates/JetTemplateContextType.java b/idea/src/org/jetbrains/jet/plugin/liveTemplates/JetTemplateContextType.java index 20153d38ede..e9e0bf6ffe7 100644 --- a/idea/src/org/jetbrains/jet/plugin/liveTemplates/JetTemplateContextType.java +++ b/idea/src/org/jetbrains/jet/plugin/liveTemplates/JetTemplateContextType.java @@ -18,6 +18,7 @@ package org.jetbrains.jet.plugin.liveTemplates; import com.intellij.codeInsight.template.EverywhereContextType; import com.intellij.codeInsight.template.TemplateContextType; +import com.intellij.psi.PsiComment; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import com.intellij.psi.PsiWhiteSpace; @@ -44,7 +45,7 @@ public abstract class JetTemplateContextType extends TemplateContextType { public boolean isInContext(@NotNull PsiFile file, int offset) { if (PsiUtilBase.getLanguageAtOffset(file, offset).isKindOf(JetLanguage.INSTANCE)) { PsiElement element = file.findElementAt(offset); - if (element instanceof PsiWhiteSpace) { + if (element instanceof PsiWhiteSpace || element instanceof PsiComment) { return false; } else if (element instanceof LeafPsiElement) { IElementType elementType = ((LeafPsiElement) element).getElementType();