diff --git a/idea/src/org/jetbrains/jet/plugin/completion/JetKeywordCompletionContributor.java b/idea/src/org/jetbrains/jet/plugin/completion/JetKeywordCompletionContributor.java index 9d998ca4cc0..28ebbcba265 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/JetKeywordCompletionContributor.java +++ b/idea/src/org/jetbrains/jet/plugin/completion/JetKeywordCompletionContributor.java @@ -70,6 +70,7 @@ public class JetKeywordCompletionContributor extends CompletionContributor { private static final String WHEN_ENTRY_TEMPLATE = "<##> -> <##>"; private static final String WHILE_TEMPLATE = "while (<##>) {\n<##>\n}"; private static final String DO_WHILE_TEMPLATE = "do {\n<##>\n} while (<##>)"; + private static final String ENUM_CLASS_TEMPLATE = "enum class <##> {\n<##>\n}"; private static class CommentFilter implements ElementFilter { @Override @@ -213,7 +214,7 @@ public class JetKeywordCompletionContributor extends CompletionContributor { public JetKeywordCompletionContributor() { registerScopeKeywordsCompletion(new InTopFilter(), - ABSTRACT_KEYWORD, ENUM_KEYWORD, + ABSTRACT_KEYWORD, FINAL_KEYWORD, GET_KEYWORD, IMPORT_KEYWORD, INLINE_KEYWORD, INTERNAL_KEYWORD, OPEN_KEYWORD, PACKAGE_KEYWORD, PRIVATE_KEYWORD, @@ -221,7 +222,7 @@ public class JetKeywordCompletionContributor extends CompletionContributor { TYPE_KEYWORD); registerScopeKeywordsCompletion(new InClassBodyFilter(), - ABSTRACT_KEYWORD, ENUM_KEYWORD, + ABSTRACT_KEYWORD, FINAL_KEYWORD, GET_KEYWORD, INLINE_KEYWORD, INTERNAL_KEYWORD, OPEN_KEYWORD, OVERRIDE_KEYWORD, PRIVATE_KEYWORD, @@ -231,7 +232,7 @@ public class JetKeywordCompletionContributor extends CompletionContributor { registerScopeKeywordsCompletion(new InNonClassBlockFilter(), AS_KEYWORD, BREAK_KEYWORD, BY_KEYWORD, CATCH_KEYWORD, CONTINUE_KEYWORD, - ELSE_KEYWORD, ENUM_KEYWORD, + ELSE_KEYWORD, FALSE_KEYWORD, FINALLY_KEYWORD, GET_KEYWORD, IN_KEYWORD, INLINE_KEYWORD, INTERNAL_KEYWORD, @@ -255,16 +256,17 @@ public class JetKeywordCompletionContributor extends CompletionContributor { registerScopeKeywordsCompletion(new InTopFilter(), FUN_TEMPLATE, VAL_WITH_TYPE_TEMPLATE, VAL_WITH_GETTER_TEMPLATE, VAR_WITH_TYPE_TEMPLATE, VAR_WITH_GETTER_AND_SETTER_TEMPLATE, - TRAIT_TEMPLATE, CLASS_TEMPLATE); + TRAIT_TEMPLATE, CLASS_TEMPLATE, ENUM_CLASS_TEMPLATE); registerScopeKeywordsCompletion(new InClassBodyFilter(), FUN_TEMPLATE, VAL_WITH_TYPE_TEMPLATE, VAL_WITH_GETTER_TEMPLATE, VAR_WITH_TYPE_TEMPLATE, VAR_WITH_GETTER_AND_SETTER_TEMPLATE, - TRAIT_TEMPLATE, CLASS_TEMPLATE, OBJECT_NAMED_TEMPLATE, CLASS_OBJECT_TEMPLATE); + TRAIT_TEMPLATE, CLASS_TEMPLATE, OBJECT_NAMED_TEMPLATE, CLASS_OBJECT_TEMPLATE, + ENUM_CLASS_TEMPLATE); registerScopeKeywordsCompletion(new InNonClassBlockFilter(), IF_TEMPLATE, IF_ELSE_TEMPLATE, IF_ELSE_ONELINE_TEMPLATE, FUN_TEMPLATE, VAL_SIMPLE_TEMPLATE, VAR_SIMPLE_TEMPLATE, TRAIT_TEMPLATE, CLASS_TEMPLATE, OBJECT_NAMED_TEMPLATE, FOR_TEMPLATE, - WHEN_TEMPLATE, WHILE_TEMPLATE, DO_WHILE_TEMPLATE); + WHEN_TEMPLATE, WHILE_TEMPLATE, DO_WHILE_TEMPLATE, ENUM_CLASS_TEMPLATE); registerScopeKeywordsCompletion(new InPropertyFilter(), IF_ELSE_ONELINE_TEMPLATE, WHEN_TEMPLATE); }