From f64ecd7eb5debab404bec06ab1dd3f4ee887a517 Mon Sep 17 00:00:00 2001
From: Evgeny Gerashchenko <Evgeny.Gerashchenko@jetbrains.com>
Date: Wed, 8 Feb 2012 15:55:46 +0400
Subject: [PATCH] Renamed kotlinVariableOfType() macro to kotlinAnyVariable()

---
 idea/resources/liveTemplates/Kotlin.xml                       | 2 +-
 idea/src/META-INF/plugin.xml                                  | 2 +-
 .../jet/plugin/liveTemplates/macro/BaseJetVariableMacro.java  | 4 +---
 .../{JetVariableOfTypeMacro.java => JetAnyVariableMacro.java} | 4 ++--
 4 files changed, 5 insertions(+), 7 deletions(-)
 rename idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/{JetVariableOfTypeMacro.java => JetAnyVariableMacro.java} (84%)

diff --git a/idea/resources/liveTemplates/Kotlin.xml b/idea/resources/liveTemplates/Kotlin.xml
index 723711f1992..354d97384bc 100644
--- a/idea/resources/liveTemplates/Kotlin.xml
+++ b/idea/resources/liveTemplates/Kotlin.xml
@@ -25,7 +25,7 @@
               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="kotlinVariableOfType(&quot;&quot;)" name="EXPR" />
+        <variable alwaysStopAt="true" defaultValue="&quot;expr&quot;" expression="kotlinVariable()" 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 02ad735645f..9408e472dd3 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -94,7 +94,7 @@
       <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.JetAnyVariableMacro"/>
       <liveTemplateMacro implementation="org.jetbrains.jet.plugin.liveTemplates.macro.JetFunctionParametersMacro"/>
       <liveTemplateMacro implementation="org.jetbrains.jet.plugin.liveTemplates.macro.JetAnonymousSuperMacro"/>
       <liveTemplateMacro implementation="org.jetbrains.jet.plugin.liveTemplates.macro.JetIterableVariableMacro"/>
diff --git a/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/BaseJetVariableMacro.java b/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/BaseJetVariableMacro.java
index e022ceb3422..6ffcfd19482 100644
--- a/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/BaseJetVariableMacro.java
+++ b/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/BaseJetVariableMacro.java
@@ -32,9 +32,7 @@ import java.util.Set;
 public abstract class BaseJetVariableMacro extends Macro {
     @Nullable
     private JetNamedDeclaration[] getVariables(Expression[] params, ExpressionContext context) {
-        if (params.length != 1) return null;
-        final Result result = params[0].calculateResult(context);
-        if (result == null) return null;
+        if (params.length != 0) return null;
 
         Project project = context.getProject();
         PsiDocumentManager.getInstance(project).commitAllDocuments();
diff --git a/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetVariableOfTypeMacro.java b/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetAnyVariableMacro.java
similarity index 84%
rename from idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetVariableOfTypeMacro.java
rename to idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetAnyVariableMacro.java
index 89b1547fcd5..e18dd131326 100644
--- a/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetVariableOfTypeMacro.java
+++ b/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetAnyVariableMacro.java
@@ -8,10 +8,10 @@ import org.jetbrains.jet.plugin.JetBundle;
  * @author Evgeny Gerashchenko
  * @since 1/30/12
  */
-public class JetVariableOfTypeMacro extends BaseJetVariableMacro {
+public class JetAnyVariableMacro extends BaseJetVariableMacro {
     @Override
     public String getName() {
-        return "kotlinVariableOfType";
+        return "kotlinVariable";
     }
 
     @Override