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

Fixed tests. Added 'object {...}' template after "class" inside class.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-02-23 23:46:14 +04:00
parent 8575da228d
commit f89b0c3193
3 changed files with 79 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/completion/JetKeywordCompletionContributor.java
+70 -37
View File
@@ -26,10 +26,12 @@ import com.intellij.codeInsight.lookup.LookupElementBuilder;
import com.intellij.patterns.ElementPattern; import com.intellij.patterns.ElementPattern;
import com.intellij.patterns.PlatformPatterns; import com.intellij.patterns.PlatformPatterns;
import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiWhiteSpace;
import com.intellij.psi.filters.*; import com.intellij.psi.filters.*;
import com.intellij.psi.filters.position.FilterPattern; import com.intellij.psi.filters.position.FilterPattern;
import com.intellij.psi.filters.position.LeftNeighbour; import com.intellij.psi.filters.position.LeftNeighbour;
import com.intellij.psi.filters.position.PositionElementFilter; import com.intellij.psi.filters.position.PositionElementFilter;
import com.intellij.psi.impl.source.tree.LeafPsiElement;
import com.intellij.psi.util.PsiTreeUtil; import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.util.ArrayUtil; import com.intellij.util.ArrayUtil;
import com.intellij.util.ProcessingContext; import com.intellij.util.ProcessingContext;
@@ -62,11 +64,14 @@ public class JetKeywordCompletionContributor extends CompletionContributor {
new CommentFilter(), // or new CommentFilter(), // or
new ParentFilter(new ClassFilter(JetLiteralStringTemplateEntry.class)), // or new ParentFilter(new ClassFilter(JetLiteralStringTemplateEntry.class)), // or
new ParentFilter(new ClassFilter(JetConstantExpression.class)), // or new ParentFilter(new ClassFilter(JetConstantExpression.class)), // or
new LeftNeighbour(new TextFilter(".")), // or new LeftNeighbour(new TextFilter("."))
new AndFilter(new LeafElementFilter(JetTokens.IDENTIFIER),
new NotFilter(new ParentFilter(new ClassFilter(JetReferenceExpression.class))))
)); ));
private final static ElementFilter NOT_IDENTIFIER_FILTER = new NotFilter(new AndFilter(
new LeafElementFilter(JetTokens.IDENTIFIER),
new NotFilter(new ParentFilter(new ClassFilter(JetReferenceExpression.class))))
);
private final static List<String> FUNCTION_KEYWORDS = Lists.newArrayList(GET_KEYWORD.toString(), SET_KEYWORD.toString()); private final static List<String> FUNCTION_KEYWORDS = Lists.newArrayList(GET_KEYWORD.toString(), SET_KEYWORD.toString());
private static final String IF_TEMPLATE = "if (<#<condition>#>) {\n<#<block>#>\n}"; private static final String IF_TEMPLATE = "if (<#<condition>#>) {\n<#<block>#>\n}";
@@ -82,6 +87,7 @@ public class JetKeywordCompletionContributor extends CompletionContributor {
private static final String TRAIT_TEMPLATE = "trait <#<name>#> {\n<#<body>#>\n}"; private static final String TRAIT_TEMPLATE = "trait <#<name>#> {\n<#<body>#>\n}";
private static final String CLASS_TEMPLATE = "class <#<name>#> {\n<#<body>#>\n}"; private static final String CLASS_TEMPLATE = "class <#<name>#> {\n<#<body>#>\n}";
private static final String CLASS_OBJECT_TEMPLATE = "class object {\n<#<body>#>\n}"; private static final String CLASS_OBJECT_TEMPLATE = "class object {\n<#<body>#>\n}";
private static final String CLASS_OBJECT_WITHOUT_CLASS_TEMPLATE = "object {\n<#<body>#>\n}";
private static final String FOR_TEMPLATE = "for (<#<i>#> in <#<elements>#>) {\n<#<body>#>\n}"; private static final String FOR_TEMPLATE = "for (<#<i>#> in <#<elements>#>) {\n<#<body>#>\n}";
private static final String WHEN_TEMPLATE = "when (<#<expression>#>) {\n<#<condition>#> -> <#<value>#>\n" + private static final String WHEN_TEMPLATE = "when (<#<expression>#>) {\n<#<condition>#> -> <#<value>#>\n" +
"else -> <#<elseValue>#>\n}"; "else -> <#<elseValue>#>\n}";
@@ -165,7 +171,7 @@ public class JetKeywordCompletionContributor extends CompletionContributor {
public boolean isAcceptable(Object element, PsiElement context) { public boolean isAcceptable(Object element, PsiElement context) {
//noinspection unchecked //noinspection unchecked
return PsiTreeUtil.getParentOfType(context, JetClassBody.class, true, return PsiTreeUtil.getParentOfType(context, JetClassBody.class, true,
JetBlockExpression.class, JetProperty.class, JetParameterList.class) != null; JetBlockExpression.class, JetProperty.class, JetParameterList.class) != null;
} }
@Override @Override
@@ -174,6 +180,22 @@ public class JetKeywordCompletionContributor extends CompletionContributor {
} }
} }
private static class AfterClassInClassBodyFilter extends InClassBodyFilter {
@Override
public boolean isAcceptable(Object element, PsiElement context) {
if (super.isAcceptable(element, context)) {
PsiElement ps = context.getPrevSibling();
if (ps instanceof PsiWhiteSpace) {
ps = ps.getPrevSibling();
}
if (ps instanceof LeafPsiElement) {
return ((LeafPsiElement) ps).getElementType() == JetTokens.CLASS_KEYWORD;
}
}
return false;
}
}
private static class InPropertyFilter implements ElementFilter { private static class InPropertyFilter implements ElementFilter {
@Override @Override
public boolean isAcceptable(Object element, PsiElement context) { public boolean isAcceptable(Object element, PsiElement context) {
@@ -202,7 +224,7 @@ public class JetKeywordCompletionContributor extends CompletionContributor {
private final Collection<LookupElement> elements; private final Collection<LookupElement> elements;
public KeywordsCompletionProvider(String ...keywords) { public KeywordsCompletionProvider(String... keywords) {
List<String> elementsList = Lists.newArrayList(keywords); List<String> elementsList = Lists.newArrayList(keywords);
elements = Collections2.transform(elementsList, new Function<String, LookupElement>() { elements = Collections2.transform(elementsList, new Function<String, LookupElement>() {
@Override @Override
@@ -232,39 +254,39 @@ public class JetKeywordCompletionContributor extends CompletionContributor {
public JetKeywordCompletionContributor() { public JetKeywordCompletionContributor() {
registerScopeKeywordsCompletion(new InTopFilter(), registerScopeKeywordsCompletion(new InTopFilter(),
ABSTRACT_KEYWORD, ABSTRACT_KEYWORD,
FINAL_KEYWORD, GET_KEYWORD, FINAL_KEYWORD, GET_KEYWORD,
IMPORT_KEYWORD, INLINE_KEYWORD, INTERNAL_KEYWORD, IMPORT_KEYWORD, INLINE_KEYWORD, INTERNAL_KEYWORD,
OPEN_KEYWORD, PACKAGE_KEYWORD, PRIVATE_KEYWORD, OPEN_KEYWORD, PACKAGE_KEYWORD, PRIVATE_KEYWORD,
PROTECTED_KEYWORD, PUBLIC_KEYWORD, SET_KEYWORD, PROTECTED_KEYWORD, PUBLIC_KEYWORD, SET_KEYWORD,
TYPE_KEYWORD); TYPE_KEYWORD);
registerScopeKeywordsCompletion(new InClassBodyFilter(), registerScopeKeywordsCompletion(new InClassBodyFilter(),
ABSTRACT_KEYWORD, ABSTRACT_KEYWORD,
FINAL_KEYWORD, GET_KEYWORD, FINAL_KEYWORD, GET_KEYWORD,
INLINE_KEYWORD, INTERNAL_KEYWORD, OBJECT_KEYWORD, INLINE_KEYWORD, INTERNAL_KEYWORD,
OPEN_KEYWORD, OVERRIDE_KEYWORD, PRIVATE_KEYWORD, OPEN_KEYWORD, OVERRIDE_KEYWORD, PRIVATE_KEYWORD,
PROTECTED_KEYWORD, PUBLIC_KEYWORD, SET_KEYWORD, PROTECTED_KEYWORD, PUBLIC_KEYWORD, SET_KEYWORD,
TYPE_KEYWORD); TYPE_KEYWORD);
registerScopeKeywordsCompletion(new InNonClassBlockFilter(), registerScopeKeywordsCompletion(new InNonClassBlockFilter(),
AS_KEYWORD, BREAK_KEYWORD, BY_KEYWORD, AS_KEYWORD, BREAK_KEYWORD, BY_KEYWORD,
CATCH_KEYWORD, CONTINUE_KEYWORD, CATCH_KEYWORD, CONTINUE_KEYWORD,
ELSE_KEYWORD, ELSE_KEYWORD,
FALSE_KEYWORD, FINALLY_KEYWORD, FALSE_KEYWORD, FINALLY_KEYWORD,
GET_KEYWORD, GET_KEYWORD,
IN_KEYWORD, INLINE_KEYWORD, INTERNAL_KEYWORD, IN_KEYWORD, INLINE_KEYWORD, INTERNAL_KEYWORD,
IS_KEYWORD, NULL_KEYWORD, OBJECT_KEYWORD, IS_KEYWORD, NULL_KEYWORD, OBJECT_KEYWORD,
PRIVATE_KEYWORD, PROTECTED_KEYWORD, PUBLIC_KEYWORD, PRIVATE_KEYWORD, PROTECTED_KEYWORD, PUBLIC_KEYWORD,
RETURN_KEYWORD, SET_KEYWORD, SUPER_KEYWORD, RETURN_KEYWORD, SET_KEYWORD, SUPER_KEYWORD,
CAPITALIZED_THIS_KEYWORD, THIS_KEYWORD, THROW_KEYWORD, CAPITALIZED_THIS_KEYWORD, THIS_KEYWORD, THROW_KEYWORD,
TRUE_KEYWORD, TRY_KEYWORD, TRUE_KEYWORD, TRY_KEYWORD,
TYPE_KEYWORD, TYPE_KEYWORD,
VARARG_KEYWORD, WHERE_KEYWORD); VARARG_KEYWORD, WHERE_KEYWORD);
registerScopeKeywordsCompletion(new InPropertyFilter(), registerScopeKeywordsCompletion(new InPropertyFilter(),
ELSE_KEYWORD, FALSE_KEYWORD, ELSE_KEYWORD, FALSE_KEYWORD,
NULL_KEYWORD, THIS_KEYWORD, TRUE_KEYWORD); NULL_KEYWORD, THIS_KEYWORD, TRUE_KEYWORD);
registerScopeKeywordsCompletion(new InParametersFilter(), OUT_KEYWORD); registerScopeKeywordsCompletion(new InParametersFilter(), OUT_KEYWORD);
@@ -287,11 +309,17 @@ public class JetKeywordCompletionContributor extends CompletionContributor {
WHEN_TEMPLATE, WHILE_TEMPLATE, DO_WHILE_TEMPLATE, ENUM_CLASS_TEMPLATE); WHEN_TEMPLATE, WHILE_TEMPLATE, DO_WHILE_TEMPLATE, ENUM_CLASS_TEMPLATE);
registerScopeKeywordsCompletion(new InPropertyFilter(), registerScopeKeywordsCompletion(new InPropertyFilter(),
IF_ELSE_ONELINE_TEMPLATE, WHEN_TEMPLATE); IF_ELSE_ONELINE_TEMPLATE, WHEN_TEMPLATE);
registerScopeKeywordsCompletion(new AfterClassInClassBodyFilter(), false,
CLASS_OBJECT_WITHOUT_CLASS_TEMPLATE);
}
private void registerScopeKeywordsCompletion(final ElementFilter placeFilter, boolean notIdentifier, String... keywords) {
extend(CompletionType.BASIC, getPlacePattern(placeFilter, notIdentifier),
new KeywordsCompletionProvider(keywords));
} }
private void registerScopeKeywordsCompletion(final ElementFilter placeFilter, String... keywords) { private void registerScopeKeywordsCompletion(final ElementFilter placeFilter, String... keywords) {
extend(CompletionType.BASIC, getPlacePattern(placeFilter), registerScopeKeywordsCompletion(placeFilter, true, keywords);
new KeywordsCompletionProvider(keywords));
} }
private void registerScopeKeywordsCompletion(final ElementFilter placeFilter, JetToken... keywords) { private void registerScopeKeywordsCompletion(final ElementFilter placeFilter, JetToken... keywords) {
@@ -307,9 +335,14 @@ public class JetKeywordCompletionContributor extends CompletionContributor {
return ArrayUtil.toStringArray(strings); return ArrayUtil.toStringArray(strings);
} }
private static ElementPattern<PsiElement> getPlacePattern(final ElementFilter placeFilter) { private static ElementPattern<PsiElement> getPlacePattern(final ElementFilter placeFilter, boolean notIdentifier) {
return PlatformPatterns.psiElement().and( if (notIdentifier) {
new FilterPattern(new AndFilter(GENERAL_FILTER, placeFilter))); return PlatformPatterns.psiElement().and(
new FilterPattern(new AndFilter(GENERAL_FILTER, NOT_IDENTIFIER_FILTER, placeFilter)));
} else {
return PlatformPatterns.psiElement().and(
new FilterPattern(new AndFilter(GENERAL_FILTER, placeFilter)));
}
} }
idea/src/org/jetbrains/jet/plugin/liveTemplates/JetTemplateContextType.java
+8
View File
@@ -21,11 +21,14 @@ import com.intellij.codeInsight.template.TemplateContextType;
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;
import com.intellij.psi.impl.source.tree.LeafPsiElement;
import com.intellij.psi.tree.IElementType;
import com.intellij.psi.util.PsiUtilBase; import com.intellij.psi.util.PsiUtilBase;
import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.psi.*;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.jet.plugin.JetLanguage; import org.jetbrains.jet.plugin.JetLanguage;
/** /**
@@ -43,6 +46,11 @@ public abstract class JetTemplateContextType extends TemplateContextType {
PsiElement element = file.findElementAt(offset); PsiElement element = file.findElementAt(offset);
if (element instanceof PsiWhiteSpace) { if (element instanceof PsiWhiteSpace) {
return false; return false;
} else if (element instanceof LeafPsiElement) {
IElementType elementType = ((LeafPsiElement) element).getElementType();
if (elementType == JetTokens.IDENTIFIER && !(element.getParent() instanceof JetReferenceExpression)) {
return false;
}
} }
return element != null && isInContext(element); return element != null && isInContext(element);
} }
idea/testData/completion/keywords/classObject.kt
+1 -1
View File
@@ -2,4 +2,4 @@ class Test {
class <caret> class <caret>
} }
// EXIST: object // EXIST: object {...}