From aae5bc3b705dc2b88f264ab1fd26401822f1a817 Mon Sep 17 00:00:00 2001
From: Evgeny Gerashchenko <Evgeny.Gerashchenko@jetbrains.com>
Date: Thu, 2 Feb 2012 19:35:52 +0400
Subject: [PATCH] Added expression live template context type.

---
 idea/src/META-INF/plugin.xml                          |  1 +
 .../plugin/liveTemplates/JetTemplateContextType.java  | 11 +++++++++++
 2 files changed, 12 insertions(+)

diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index 1bf7a41f0a9..de4c8aaa88d 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -92,6 +92,7 @@
       <liveTemplateContext implementation="org.jetbrains.jet.plugin.liveTemplates.JetTemplateContextType$Namespace"/>
       <liveTemplateContext implementation="org.jetbrains.jet.plugin.liveTemplates.JetTemplateContextType$Statement"/>
       <liveTemplateContext implementation="org.jetbrains.jet.plugin.liveTemplates.JetTemplateContextType$Class"/>
+      <liveTemplateContext implementation="org.jetbrains.jet.plugin.liveTemplates.JetTemplateContextType$Expression"/>
       <defaultLiveTemplatesProvider implementation="org.jetbrains.jet.plugin.liveTemplates.JetLiveTemplatesProvider"/>
       <liveTemplateMacro implementation="org.jetbrains.jet.plugin.liveTemplates.macro.JetVariableOfTypeMacro"/>
       <liveTemplateMacro implementation="org.jetbrains.jet.plugin.liveTemplates.macro.JetFunctionParametersMacro"/>
diff --git a/idea/src/org/jetbrains/jet/plugin/liveTemplates/JetTemplateContextType.java b/idea/src/org/jetbrains/jet/plugin/liveTemplates/JetTemplateContextType.java
index 817dda34f65..b5d60867101 100644
--- a/idea/src/org/jetbrains/jet/plugin/liveTemplates/JetTemplateContextType.java
+++ b/idea/src/org/jetbrains/jet/plugin/liveTemplates/JetTemplateContextType.java
@@ -114,4 +114,15 @@ public abstract class JetTemplateContextType extends TemplateContextType {
             return parent instanceof JetBlockExpression;
         }
     }
+
+    public static class Expression extends JetTemplateContextType {
+        public Expression() {
+            super("KOTLIN_EXPRESSION", "Expression", Generic.class);
+        }
+
+        @Override
+        protected boolean isInContext(@NotNull PsiElement element) {
+            return element.getParent() instanceof JetExpression;
+        }
+    }
 }