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

Renamed 'expression' context to 'statement'.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-01-30 16:08:35 +04:00
parent 963e1606ba
commit 508749e31b
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/resources/liveTemplates/Kotlin.xml
+2 -2
View File
@@ -10,13 +10,13 @@
name="sout" toReformat="true"
ShortenFQNames="true" value="println($END$)">
<context>
<option name="KOTLIN_EXPRESSION" value="true" />
<option name="KOTLIN_STATEMENT" value="true" />
</context>
</template>
<template resource-bundle="org.jetbrains.jet.plugin.JetBundle" key="livetemplate.description.serr"
name="serr" toReformat="true" toShortenFQNames="true" value="System.out?.println($END$)">
<context>
<option name="KOTLIN_EXPRESSION" value="true" />
<option name="KOTLIN_STATEMENT" value="true" />
</context>
</template>
</templateSet>
idea/src/META-INF/plugin.xml
+1 -1
View File
@@ -67,7 +67,7 @@
<liveTemplateContext implementation="org.jetbrains.jet.plugin.liveTemplates.JetTemplateContextType$Generic"/>
<liveTemplateContext implementation="org.jetbrains.jet.plugin.liveTemplates.JetTemplateContextType$Namespace"/>
<liveTemplateContext implementation="org.jetbrains.jet.plugin.liveTemplates.JetTemplateContextType$Expression"/>
<liveTemplateContext implementation="org.jetbrains.jet.plugin.liveTemplates.JetTemplateContextType$Statement"/>
<defaultLiveTemplatesProvider implementation="org.jetbrains.jet.plugin.liveTemplates.JetLiveTemplatesProvider"/>
<annotator language="jet" implementationClass="org.jetbrains.jet.plugin.annotations.SoftKeywordsAnnotator"/>
idea/src/org/jetbrains/jet/plugin/liveTemplates/JetTemplateContextType.java
+4 -4
View File
@@ -26,7 +26,7 @@ public abstract class JetTemplateContextType extends TemplateContextType {
if (PsiUtilBase.getLanguageAtOffset(file, offset).isKindOf(JetLanguage.INSTANCE)) {
PsiElement element = file.findElementAt(offset);
if (element instanceof PsiWhiteSpace) {
return false;
}
return element != null && isInContext(element);
}
@@ -66,9 +66,9 @@ public abstract class JetTemplateContextType extends TemplateContextType {
}
}
public static class Expression extends JetTemplateContextType {
public Expression() {
super("KOTLIN_EXPRESSION", "Expression", Generic.class);
public static class Statement extends JetTemplateContextType {
public Statement() {
super("KOTLIN_STATEMENT", "Statement", Generic.class);
}
@Override