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

Added psvm synonym for main, synonym live templates added not only to completion.

Browse Source 
#KT-1326 fixed
This commit is contained in:
Evgeny Gerashchenko
2012-02-29 23:27:36 +04:00
parent d4354a466f
commit 14ab3ff2d5
2 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/resources/liveTemplates/Kotlin.xml
+22
View File
@@ -169,4 +169,26 @@
<option name="KOTLIN_NAMESPACE" value="true"/> <option name="KOTLIN_NAMESPACE" value="true"/>
</context> </context>
</template> </template>
<!-- Synonyms -->
<!-- Synonym for main -->
<template resource-bundle="org.jetbrains.jet.plugin.JetBundle" key="livetemplate.description.main"
name="psvm" toReformat="true" toShortenFQNames="true"
value="fun main(args : Array&lt;String&gt;) {&#10; $END$&#10;}">
<context>
<option name="KOTLIN_NAMESPACE" value="true" />
</context>
</template>
<!-- Synonym for anonymous -->
<template resource-bundle="org.jetbrains.jet.plugin.JetBundle" key="livetemplate.description.anonymous"
name="object" id="kt-object" toReformat="true" toShortenFQNames="true" value="object : $SUPERTYPE$ {&#10;$END$&#10;}">
<variable alwaysStopAt="true" defaultValue="&quot;Object&quot;" expression="anonymousSuper()" name="SUPERTYPE" />
<context>
<option name="KOTLIN_STATEMENT" value="true"/>
<option name="KOTLIN_EXPRESSION" value="true"/>
</context>
</template>
</templateSet> </templateSet>
idea/src/org/jetbrains/jet/plugin/liveTemplates/JetLiveTemplateCompletionContributor.java
-20
View File
@@ -73,8 +73,6 @@ public class JetLiveTemplateCompletionContributor extends CompletionContributor
for (final TemplateImpl possible : templates) { for (final TemplateImpl possible : templates) {
result.addElement(new LiveTemplateLookupElement(possible, false)); result.addElement(new LiveTemplateLookupElement(possible, false));
} }
addSynonym(templates, result, "anonymous", "object");
} }
} }
@@ -97,22 +95,4 @@ public class JetLiveTemplateCompletionContributor extends CompletionContributor
return element instanceof LiveTemplateLookupElement && ((LiveTemplateLookupElement) element).sudden; return element instanceof LiveTemplateLookupElement && ((LiveTemplateLookupElement) element).sudden;
} }
} }
/* custom code start */
private static void addSynonym(List<TemplateImpl> templates, @NotNull CompletionResultSet result, @NotNull String standardName, @NotNull final String synonym) {
for (TemplateImpl t : templates) {
if (standardName.equals(t.getKey())) {
result.addElement(new LiveTemplateLookupElement(t, false) {
@NotNull
@Override
public String getLookupString() {
return synonym;
}
});
return;
}
}
}
} }