diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java b/compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java index 5597ab4b821..a9e376209cd 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java @@ -1454,7 +1454,9 @@ public class JetExpressionParsing extends AbstractJetParsing { PsiBuilder.Marker parameter = mark(); if (at(VAL_KEYWORD) || at(VAR_KEYWORD)) advance(); // VAL_KEYWORD or VAR_KEYWORD - expect(IDENTIFIER, "Expecting a variable name", TokenSet.create(COLON)); + if (!myJetParsing.parseIdeTemplate()) { + expect(IDENTIFIER, "Expecting a variable name", TokenSet.create(COLON)); + } if (at(COLON)) { advance(); // COLON myJetParsing.parseTypeRef(); diff --git a/idea/src/org/jetbrains/jet/plugin/completion/JetKeywordCompletionContributor.java b/idea/src/org/jetbrains/jet/plugin/completion/JetKeywordCompletionContributor.java index 5d285f19c41..f417cfc4c8e 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/JetKeywordCompletionContributor.java +++ b/idea/src/org/jetbrains/jet/plugin/completion/JetKeywordCompletionContributor.java @@ -64,6 +64,7 @@ public class JetKeywordCompletionContributor extends CompletionContributor { 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 class CommentFilter implements ElementFilter { @Override @@ -214,7 +215,7 @@ public class JetKeywordCompletionContributor extends CompletionContributor { AS_KEYWORD, BREAK_KEYWORD, BY_KEYWORD, CATCH_KEYWORD, CONTINUE_KEYWORD, DO_KEYWORD, ELSE_KEYWORD, ENUM_KEYWORD, - FALSE_KEYWORD, FINALLY_KEYWORD, FOR_KEYWORD, + FALSE_KEYWORD, FINALLY_KEYWORD, GET_KEYWORD, IN_KEYWORD, INLINE_KEYWORD, INTERNAL_KEYWORD, IS_KEYWORD, NULL_KEYWORD, @@ -244,7 +245,7 @@ public class JetKeywordCompletionContributor extends CompletionContributor { 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); + TRAIT_TEMPLATE, CLASS_TEMPLATE, OBJECT_NAMED_TEMPLATE, FOR_TEMPLATE); registerScopeKeywordsCompletion(new InPropertyFilter(), IF_ELSE_ONELINE_TEMPLATE); }