From 1dd5f8421758a338e53b96bf365f44fd01d5b9ab Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Tue, 7 Feb 2012 21:40:04 +0400 Subject: [PATCH] Removed named object template. --- .../completion/JetKeywordCompletionContributor.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/idea/src/org/jetbrains/jet/plugin/completion/JetKeywordCompletionContributor.java b/idea/src/org/jetbrains/jet/plugin/completion/JetKeywordCompletionContributor.java index 28ebbcba265..ea15fc67c3a 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/JetKeywordCompletionContributor.java +++ b/idea/src/org/jetbrains/jet/plugin/completion/JetKeywordCompletionContributor.java @@ -62,7 +62,6 @@ public class JetKeywordCompletionContributor extends CompletionContributor { private static final String VAR_WITH_GETTER_AND_SETTER_TEMPLATE = "var <##> : <##>\nget() {\n<##>\n}\nset(value) {\n<##>\n}"; private static final String TRAIT_TEMPLATE = "trait <##> {\n<##>\n}"; private static final String CLASS_TEMPLATE = "class <##> {\n<##>\n}"; - private static final String OBJECT_NAMED_TEMPLATE = "object <##> {\n<##>\n}"; private static final String CLASS_OBJECT_TEMPLATE = "class object {\n<##>\n}"; private static final String FOR_TEMPLATE = "for (<##> in <##>) {\n<##>\n}"; private static final String WHEN_TEMPLATE = "when (<##>) {\n<##> -> <##>\n" + @@ -224,7 +223,7 @@ public class JetKeywordCompletionContributor extends CompletionContributor { registerScopeKeywordsCompletion(new InClassBodyFilter(), ABSTRACT_KEYWORD, FINAL_KEYWORD, GET_KEYWORD, - INLINE_KEYWORD, INTERNAL_KEYWORD, + INLINE_KEYWORD, INTERNAL_KEYWORD, OBJECT_KEYWORD, OPEN_KEYWORD, OVERRIDE_KEYWORD, PRIVATE_KEYWORD, PROTECTED_KEYWORD, PUBLIC_KEYWORD, SET_KEYWORD, TYPE_KEYWORD); @@ -236,7 +235,7 @@ public class JetKeywordCompletionContributor extends CompletionContributor { FALSE_KEYWORD, FINALLY_KEYWORD, GET_KEYWORD, IN_KEYWORD, INLINE_KEYWORD, INTERNAL_KEYWORD, - IS_KEYWORD, NULL_KEYWORD, + IS_KEYWORD, NULL_KEYWORD, OBJECT_KEYWORD, PRIVATE_KEYWORD, PROTECTED_KEYWORD, PUBLIC_KEYWORD, RETURN_KEYWORD, SET_KEYWORD, SUPER_KEYWORD, CAPITALIZED_THIS_KEYWORD, THIS_KEYWORD, THROW_KEYWORD, @@ -260,12 +259,12 @@ public class JetKeywordCompletionContributor extends CompletionContributor { 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, 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, + TRAIT_TEMPLATE, CLASS_TEMPLATE, FOR_TEMPLATE, WHEN_TEMPLATE, WHILE_TEMPLATE, DO_WHILE_TEMPLATE, ENUM_CLASS_TEMPLATE); registerScopeKeywordsCompletion(new InPropertyFilter(), IF_ELSE_ONELINE_TEMPLATE, WHEN_TEMPLATE);