From 8d50d17f92570f810ec63a1dcaaf38f14f01cb5f Mon Sep 17 00:00:00 2001
From: Evgeny Gerashchenko <Evgeny.Gerashchenko@jetbrains.com>
Date: Wed, 8 Feb 2012 00:06:54 +0400
Subject: [PATCH] Added auto-importing when methods are implemented or
 overriden.

---
 idea/resources/liveTemplates/Kotlin.xml       |  9 ++++++
 idea/src/META-INF/plugin.xml                  |  2 ++
 .../jetbrains/jet/plugin/JetBundle.properties |  3 ++
 .../macro/JetIterableVariableMacro.java       | 30 +++++++++++++++++++
 .../macro/JetSuggestVariableNameMacro.java    | 29 ++++++++++++++++++
 5 files changed, 73 insertions(+)
 create mode 100644 idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetIterableVariableMacro.java
 create mode 100644 idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetSuggestVariableNameMacro.java

diff --git a/idea/resources/liveTemplates/Kotlin.xml b/idea/resources/liveTemplates/Kotlin.xml
index 7e63db35cc4..723711f1992 100644
--- a/idea/resources/liveTemplates/Kotlin.xml
+++ b/idea/resources/liveTemplates/Kotlin.xml
@@ -39,6 +39,15 @@
             <option name="KOTLIN_STATEMENT" value="true"/>
         </context>
     </template>
+    <template resource-bundle="messages.CodeInsightBundle" key="livetemplate.description.iter"
+              name="iter" toReformat="true" toShortenFQNames="true"
+              value="for ($VAR$ in $ITERABLE$) {&#10;$END$&#10;}">
+        <variable alwaysStopAt="false" defaultValue="kotlinIterableVariable()" expression="" name="ITERABLE" />
+        <variable alwaysStopAt="false" defaultValue="kotlinSuggestVariableName()" expression="" name="VAR" />
+        <context>
+            <option name="KOTLIN_STATEMENT" value="true" />
+        </context>
+    </template>
 
     <template resource-bundle="org.jetbrains.jet.plugin.JetBundle" key="livetemplate.description.void"
               name="void" toReformat="true" toShortenFQNames="true" value="fun $NAME$($PARAMS$) {&#10;$END$&#10;}">
diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index d6ad3fa5d43..02ad735645f 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -97,6 +97,8 @@
       <liveTemplateMacro implementation="org.jetbrains.jet.plugin.liveTemplates.macro.JetVariableOfTypeMacro"/>
       <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"/>
+      <liveTemplateMacro implementation="org.jetbrains.jet.plugin.liveTemplates.macro.JetSuggestVariableNameMacro"/>
 
       <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 711bf9a54d8..1018896c576 100644
--- a/idea/src/org/jetbrains/jet/plugin/JetBundle.properties
+++ b/idea/src/org/jetbrains/jet/plugin/JetBundle.properties
@@ -29,6 +29,7 @@ implement.members=Implement members
 
 livetemplate.description.main=main() function
 livetemplate.description.soutp=Prints function parameter names and values to System.out
+livetemplate.description.iter=Iterate over elements of iterable
 livetemplate.description.void=Function returning nothing
 livetemplate.description.fun0=Function with no parameters
 livetemplate.description.fun1=Function with one parameter
@@ -41,5 +42,7 @@ livetemplate.description.exfun=Extension function
 livetemplate.description.exval=Extension read-only property
 livetemplate.description.exvar=Extension read-write property
 macro.variable.of.type=kotlinVariableOfType(Type)
+macro.iterable.variable=kotlinIterableVariable()
+macro.suggest.variable.name=kotlinSuggestVariableName()
 macro.fun.parameters=functionParameters()
 macro.fun.anonymousSuper=anonymousSuper()
\ No newline at end of file
diff --git a/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetIterableVariableMacro.java b/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetIterableVariableMacro.java
new file mode 100644
index 00000000000..08fbb39afd9
--- /dev/null
+++ b/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetIterableVariableMacro.java
@@ -0,0 +1,30 @@
+package org.jetbrains.jet.plugin.liveTemplates.macro;
+
+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 org.jetbrains.annotations.NotNull;
+import org.jetbrains.jet.plugin.JetBundle;
+
+/**
+ * @author Evgeny Gerashchenko
+ * @since 2/7/12
+ */
+public class JetIterableVariableMacro extends Macro {
+    @Override
+    public String getName() {
+        return "kotlinIterableVariable";
+    }
+
+    @Override
+    public String getPresentableName() {
+        return JetBundle.message("macro.iterable.variable");
+    }
+
+    @Override
+    public Result calculateResult(@NotNull Expression[] params, ExpressionContext context) {
+        // TODO
+        return null;
+    }
+}
diff --git a/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetSuggestVariableNameMacro.java b/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetSuggestVariableNameMacro.java
new file mode 100644
index 00000000000..fa3fe7ed374
--- /dev/null
+++ b/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetSuggestVariableNameMacro.java
@@ -0,0 +1,29 @@
+package org.jetbrains.jet.plugin.liveTemplates.macro;
+
+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 org.jetbrains.annotations.NotNull;
+import org.jetbrains.jet.plugin.JetBundle;
+
+/**
+ * @author Evgeny Gerashchenko
+ * @since 2/7/12
+ */
+public class JetSuggestVariableNameMacro extends Macro {
+    @Override
+    public String getName() {
+        return "suggestVariableName";
+    }
+
+    @Override
+    public String getPresentableName() {
+        return JetBundle.message("macro.suggest.variable.name");
+    }
+
+    @Override
+    public Result calculateResult(@NotNull Expression[] params, ExpressionContext context) {
+        return null;  //TODO
+    }
+}