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

Introduced constants with if and if-else templates

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-02-01 15:11:51 +04:00
parent bc6a785ef0
commit 89055ebf39
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/completion/JetKeywordCompletionContributor.java
+8 -4
View File
@@ -50,6 +50,10 @@ public class JetKeywordCompletionContributor extends CompletionContributor {
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 \n}";
private static final String IF_ELSE_TEMPLATE = "if (<#<condition>#>) {\n \n} else {\n \n}";
// private static final String FUN_TEMPLATE = "fun <#<name>#>(<#<params>#>) : <#<return>#> {\n \n}";
private static class CommentFilter implements ElementFilter { private static class CommentFilter implements ElementFilter {
@Override @Override
public boolean isAcceptable(Object element, PsiElement context) { public boolean isAcceptable(Object element, PsiElement context) {
@@ -222,8 +226,8 @@ public class JetKeywordCompletionContributor extends CompletionContributor {
// templates // templates
registerScopeKeywordsCompletion(new InTopFilter(), ArrayUtil.EMPTY_STRING_ARRAY); registerScopeKeywordsCompletion(new InTopFilter(), ArrayUtil.EMPTY_STRING_ARRAY);
registerScopeKeywordsCompletion(new InClassBodyFilter(), ArrayUtil.EMPTY_STRING_ARRAY); registerScopeKeywordsCompletion(new InClassBodyFilter(), ArrayUtil.EMPTY_STRING_ARRAY);
registerScopeKeywordsCompletion(new InNonClassBlockFilter(), "if (<#<condition>#>) {\n \n}", "if (<#<condition>#>) {\n \n} else {\n \n}"); registerScopeKeywordsCompletion(new InNonClassBlockFilter(), IF_TEMPLATE, IF_ELSE_TEMPLATE);
registerScopeKeywordsCompletion(new InPropertyFilter(), "if (<#<condition>#>) {\n \n} else {\n \n}", "if (<#<condition>#>) {\n \n}"); registerScopeKeywordsCompletion(new InPropertyFilter(), IF_ELSE_TEMPLATE, IF_TEMPLATE);
registerScopeKeywordsCompletion(new InParametersFilter(), ArrayUtil.EMPTY_STRING_ARRAY); registerScopeKeywordsCompletion(new InParametersFilter(), ArrayUtil.EMPTY_STRING_ARRAY);
} }
@@ -241,8 +245,8 @@ public class JetKeywordCompletionContributor extends CompletionContributor {
for (JetToken keyword : keywords) { for (JetToken keyword : keywords) {
strings.add(keyword.toString()); strings.add(keyword.toString());
} }
return strings.toArray(new String[strings.size()]); return ArrayUtil.toStringArray(strings);
} }
private static ElementPattern<PsiElement> getPlacePattern(final ElementFilter placeFilter) { private static ElementPattern<PsiElement> getPlacePattern(final ElementFilter placeFilter) {