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

Removed templates from completion after dot and in comments

Browse Source 
#KT-1460 fixed
This commit is contained in:
Evgeny Gerashchenko
2012-02-29 12:06:16 +04:00
parent 827a97f661
commit 8bcd70e822
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/liveTemplates/JetTemplateContextType.java
+2 -1
View File
@@ -18,6 +18,7 @@ package org.jetbrains.jet.plugin.liveTemplates;
import com.intellij.codeInsight.template.EverywhereContextType; import com.intellij.codeInsight.template.EverywhereContextType;
import com.intellij.codeInsight.template.TemplateContextType; import com.intellij.codeInsight.template.TemplateContextType;
import com.intellij.psi.PsiComment;
import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile; import com.intellij.psi.PsiFile;
import com.intellij.psi.PsiWhiteSpace; import com.intellij.psi.PsiWhiteSpace;
@@ -44,7 +45,7 @@ public abstract class JetTemplateContextType extends TemplateContextType {
public boolean isInContext(@NotNull PsiFile file, int offset) { public boolean isInContext(@NotNull PsiFile file, int offset) {
if (PsiUtilBase.getLanguageAtOffset(file, offset).isKindOf(JetLanguage.INSTANCE)) { if (PsiUtilBase.getLanguageAtOffset(file, offset).isKindOf(JetLanguage.INSTANCE)) {
PsiElement element = file.findElementAt(offset); PsiElement element = file.findElementAt(offset);
if (element instanceof PsiWhiteSpace) { if (element instanceof PsiWhiteSpace || element instanceof PsiComment) {
return false; return false;
} else if (element instanceof LeafPsiElement) { } else if (element instanceof LeafPsiElement) {
IElementType elementType = ((LeafPsiElement) element).getElementType(); IElementType elementType = ((LeafPsiElement) element).getElementType();