azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Renamed kotlinVariableOfType() macro to kotlinAnyVariable()

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-02-08 15:55:46 +04:00
parent ca446030ea
commit f64ecd7eb5
4 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/resources/liveTemplates/Kotlin.xml
+1 -1
View File
@@ -25,7 +25,7 @@
name="soutv" toReformat="true" toShortenFQNames="true" name="soutv" toReformat="true" toShortenFQNames="true"
value="println("$EXPR_COPY$ = $DOLLAR${$EXPR$}")"> value="println("$EXPR_COPY$ = $DOLLAR${$EXPR$}")">
<variable alwaysStopAt="false" defaultValue="&quot;$&quot;" expression="" name="DOLLAR" /> <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" /> <variable alwaysStopAt="false" defaultValue="" expression="EXPR" name="EXPR_COPY" />
<context> <context>
<option name="KOTLIN_STATEMENT" value="true" /> <option name="KOTLIN_STATEMENT" value="true" />
idea/src/META-INF/plugin.xml
+1 -1
View File
@@ -94,7 +94,7 @@
<liveTemplateContext implementation="org.jetbrains.jet.plugin.liveTemplates.JetTemplateContextType$Class"/> <liveTemplateContext implementation="org.jetbrains.jet.plugin.liveTemplates.JetTemplateContextType$Class"/>
<liveTemplateContext implementation="org.jetbrains.jet.plugin.liveTemplates.JetTemplateContextType$Expression"/> <liveTemplateContext implementation="org.jetbrains.jet.plugin.liveTemplates.JetTemplateContextType$Expression"/>
<defaultLiveTemplatesProvider implementation="org.jetbrains.jet.plugin.liveTemplates.JetLiveTemplatesProvider"/> <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.JetFunctionParametersMacro"/>
<liveTemplateMacro implementation="org.jetbrains.jet.plugin.liveTemplates.macro.JetAnonymousSuperMacro"/> <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.JetIterableVariableMacro"/>
idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/BaseJetVariableMacro.java
+1 -3
View File
@@ -32,9 +32,7 @@ import java.util.Set;
public abstract class BaseJetVariableMacro extends Macro { public abstract class BaseJetVariableMacro extends Macro {
@Nullable @Nullable
private JetNamedDeclaration[] getVariables(Expression[] params, ExpressionContext context) { private JetNamedDeclaration[] getVariables(Expression[] params, ExpressionContext context) {
if (params.length != 1) return null; if (params.length != 0) return null;
final Result result = params[0].calculateResult(context);
if (result == null) return null;
Project project = context.getProject(); Project project = context.getProject();
PsiDocumentManager.getInstance(project).commitAllDocuments(); PsiDocumentManager.getInstance(project).commitAllDocuments();
idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetVariableOfTypeMacro.java → idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetAnyVariableMacro.java
+2 -2
View File
@@ -8,10 +8,10 @@ import org.jetbrains.jet.plugin.JetBundle;
* @author Evgeny Gerashchenko * @author Evgeny Gerashchenko
* @since 1/30/12 * @since 1/30/12
*/ */
public class JetVariableOfTypeMacro extends BaseJetVariableMacro { public class JetAnyVariableMacro extends BaseJetVariableMacro {
@Override @Override
public String getName() { public String getName() {
return "kotlinVariableOfType"; return "kotlinVariable";
} }
@Override @Override