diff --git a/idea/resources/liveTemplates/Kotlin.xml b/idea/resources/liveTemplates/Kotlin.xml
index aec0cecc7ba..7cb5d003dba 100644
--- a/idea/resources/liveTemplates/Kotlin.xml
+++ b/idea/resources/liveTemplates/Kotlin.xml
@@ -22,7 +22,7 @@
     <template resource-bundle="messages.CodeInsightBundle" key="livetemplate.description.soutv"
               name="soutv" toReformat="true" toShortenFQNames="true" value="println(&quot;$EXPR_COPY$ = $DOLLAR${$EXPR$}&quot;)">
         <variable alwaysStopAt="false" defaultValue="&quot;$&quot;" expression="" name="DOLLAR" />
-        <variable alwaysStopAt="true" defaultValue="&quot;expr&quot;" expression="variableOfType(&quot;&quot;)" name="EXPR" />
+        <variable alwaysStopAt="true" defaultValue="&quot;expr&quot;" expression="kotlinVariableOfType(&quot;&quot;)" name="EXPR" />
         <variable alwaysStopAt="false" defaultValue="" expression="EXPR" name="EXPR_COPY" />
         <context>
             <option name="KOTLIN_STATEMENT" value="true" />
diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index 63462adf91d..90dec7adb80 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -69,6 +69,7 @@
       <liveTemplateContext implementation="org.jetbrains.jet.plugin.liveTemplates.JetTemplateContextType$Namespace"/>
       <liveTemplateContext implementation="org.jetbrains.jet.plugin.liveTemplates.JetTemplateContextType$Statement"/>
       <defaultLiveTemplatesProvider implementation="org.jetbrains.jet.plugin.liveTemplates.JetLiveTemplatesProvider"/>
+      <liveTemplateMacro implementation="org.jetbrains.jet.plugin.liveTemplates.macro.JetVariableOfTypeMacro"/>
 
       <annotator language="jet" implementationClass="org.jetbrains.jet.plugin.annotations.SoftKeywordsAnnotator"/>
       <annotator language="jet" implementationClass="org.jetbrains.jet.plugin.annotations.LabelsAnnotator"/>
diff --git a/idea/src/org/jetbrains/jet/plugin/JetBundle.properties b/idea/src/org/jetbrains/jet/plugin/JetBundle.properties
index 632af78f2b2..b4604f59863 100644
--- a/idea/src/org/jetbrains/jet/plugin/JetBundle.properties
+++ b/idea/src/org/jetbrains/jet/plugin/JetBundle.properties
@@ -28,3 +28,4 @@ change.to.backing.field=Change reference to backing field
 implement.members=Implement members
 
 livetemplate.description.main=main() function
+macro.variable.of.type=kotlinVariableOfType(Type)
\ No newline at end of file
diff --git a/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetPsiElementResult.java b/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetPsiElementResult.java
new file mode 100644
index 00000000000..b5b3a8f22b1
--- /dev/null
+++ b/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetPsiElementResult.java
@@ -0,0 +1,19 @@
+package org.jetbrains.jet.plugin.liveTemplates.macro;
+
+import com.intellij.codeInsight.template.PsiElementResult;
+import org.jetbrains.jet.lang.psi.JetNamedDeclaration;
+
+/**
+ * @author Evgeny Gerashchenko
+ * @since 1/30/12
+ */
+public class JetPsiElementResult extends PsiElementResult {
+    public JetPsiElementResult(JetNamedDeclaration element) {
+        super(element);
+    }
+
+    @Override
+    public String toString() {
+        return ((JetNamedDeclaration) getElement()).getName();
+    }
+}
diff --git a/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetVariableOfTypeMacro.java b/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetVariableOfTypeMacro.java
new file mode 100644
index 00000000000..c0c02d7e63b
--- /dev/null
+++ b/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetVariableOfTypeMacro.java
@@ -0,0 +1,110 @@
+package org.jetbrains.jet.plugin.liveTemplates.macro;
+
+import com.intellij.codeInsight.lookup.LookupElement;
+import com.intellij.codeInsight.lookup.LookupElementBuilder;
+import com.intellij.codeInsight.template.Expression;
+import com.intellij.codeInsight.template.ExpressionContext;
+import com.intellij.codeInsight.template.Macro;
+import com.intellij.codeInsight.template.Result;
+import com.intellij.openapi.project.Project;
+import com.intellij.psi.PsiDocumentManager;
+import com.intellij.psi.PsiElement;
+import com.intellij.psi.PsiFile;
+import com.intellij.psi.PsiNamedElement;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
+import org.jetbrains.jet.lang.psi.*;
+import org.jetbrains.jet.lang.resolve.BindingContext;
+import org.jetbrains.jet.lang.resolve.scopes.JetScope;
+import org.jetbrains.jet.plugin.JetBundle;
+import org.jetbrains.jet.plugin.compiler.WholeProjectAnalyzerFacade;
+
+import java.util.ArrayList;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * @author Evgeny Gerashchenko
+ * @since 1/30/12
+ */
+public class JetVariableOfTypeMacro extends Macro {
+    @Override
+    public String getName() {
+        return "kotlinVariableOfType";
+    }
+
+    @Override
+    public String getPresentableName() {
+        return JetBundle.message("macro.variable.of.type");
+    }
+
+    @Override
+    public Result calculateResult(@NotNull Expression[] params, ExpressionContext context) {
+        final JetNamedDeclaration[] vars = getVariables(params, context);
+        if (vars == null || vars.length == 0) return null;
+        return new JetPsiElementResult(vars[0]);
+    }
+
+    @Override
+    public LookupElement[] calculateLookupItems(@NotNull Expression[] params, ExpressionContext context) {
+        final PsiNamedElement[] vars = getVariables(params, context);
+        if (vars == null || vars.length < 2) return null;
+        final Set<LookupElement> set = new LinkedHashSet<LookupElement>();
+        for (PsiNamedElement var : vars) {
+            set.add(LookupElementBuilder.create(var));
+        }
+        return set.toArray(new LookupElement[set.size()]);
+    }
+
+    @Nullable
+    private static JetNamedDeclaration[] getVariables(Expression[] params, ExpressionContext context) {
+        if (params.length != 1) return null;
+        final Result result = params[0].calculateResult(context);
+        if (result == null) return null;
+
+        Project project = context.getProject();
+        PsiDocumentManager.getInstance(project).commitAllDocuments();
+
+        PsiFile psiFile = PsiDocumentManager.getInstance(project).getPsiFile(context.getEditor().getDocument());
+        if (!(psiFile instanceof JetFile)) return null;
+        
+        JetExpression contextExpression = findContextExpression(psiFile, context.getStartOffset());
+        if (contextExpression == null) return null;
+
+        BindingContext bc = WholeProjectAnalyzerFacade.analyzeProjectWithCacheOnAFile((JetFile) psiFile);
+        JetScope scope = bc.get(BindingContext.RESOLUTION_SCOPE, contextExpression);
+        if (scope == null) {
+            return null;
+        }
+
+        List<JetNamedDeclaration> elements = new ArrayList<JetNamedDeclaration>();
+
+        for (DeclarationDescriptor declarationDescriptor : scope.getAllDescriptors()) {
+            PsiElement declaration = bc.get(BindingContext.DESCRIPTOR_TO_DECLARATION, declarationDescriptor);
+            assert declaration == null || declaration instanceof PsiNamedElement;
+
+            if (declaration instanceof JetProperty) {
+                elements.add((JetProperty) declaration);
+            } else if (declaration instanceof JetParameter) {
+                elements.add((JetParameter) declaration);
+            }
+        }
+
+        return elements.toArray(new JetNamedDeclaration[elements.size()]);
+    }
+    
+    @Nullable
+    private static JetExpression findContextExpression(PsiFile psiFile, int startOffset) {
+        PsiElement e = psiFile.findElementAt(startOffset);
+        while (e != null) {
+            if (e instanceof JetExpression) {
+                return (JetExpression) e;
+            }
+            e = e.getParent();
+        }
+        return null;
+    }
+}
+                          
\ No newline at end of file