diff --git a/plugin/src/main/java/consulo/java/impl/template/JavaIterationsLiveTemplateContributor.java b/plugin/src/main/java/consulo/java/impl/template/JavaIterationsLiveTemplateContributor.java index 3f7f5f4875..8fb8bcbd94 100644 --- a/plugin/src/main/java/consulo/java/impl/template/JavaIterationsLiveTemplateContributor.java +++ b/plugin/src/main/java/consulo/java/impl/template/JavaIterationsLiveTemplateContributor.java @@ -4,7 +4,7 @@ import com.intellij.java.impl.codeInsight.template.JavaLikeStatementContextType; import com.intellij.java.impl.codeInsight.template.impl.ShortenFQNamesProcessor; import consulo.annotation.component.ExtensionImpl; -import consulo.language.editor.localize.CodeInsightLocalize; +import consulo.java.localize.JavaLiveTemplateLocalize; import consulo.language.editor.template.LiveTemplateContributor; import consulo.localize.LocalizeValue; @@ -17,14 +17,19 @@ public String groupId() { @Override public LocalizeValue groupName() { - return LocalizeValue.localizeTODO("Java Iterations"); + return JavaLiveTemplateLocalize.groupNameJavaIterations(); } @Override public void contribute(LiveTemplateContributor.Factory factory) { - try (Builder builder = factory.newBuilder("javaiterationsFori", "fori", "for(int $INDEX$ = 0; $INDEX$ < $LIMIT$; $INDEX$++) {\n" - + " $END$\n" - + "}", LocalizeValue.localizeTODO("Create iteration loop"))) { + try (Builder builder = factory.newBuilder( + "javaiterationsFori", + "fori", + "for(int $INDEX$ = 0; $INDEX$ < $LIMIT$; $INDEX$++) {\n" + + " $END$\n" + + "}", + JavaLiveTemplateLocalize.descriptionFori() + )) { builder.withReformat(); builder.withOption(ShortenFQNamesProcessor.KEY, true); @@ -35,10 +40,15 @@ public void contribute(LiveTemplateContributor.Factory factory) { builder.withContextsOf(JavaLikeStatementContextType.class, true); } - try (Builder builder = factory.newBuilder("javaiterationsItar", "itar", "for(int $INDEX$ = 0; $INDEX$ < $ARRAY$.length; $INDEX$++) {\n" - + " $ELEMENT_TYPE$ $VAR$ = $ARRAY$[$INDEX$];\n" - + " $END$\n" - + "}", CodeInsightLocalize.livetemplateDescriptionItar())) { + try (Builder builder = factory.newBuilder( + "javaiterationsItar", + "itar", + "for(int $INDEX$ = 0; $INDEX$ < $ARRAY$.length; $INDEX$++) {\n" + + " $ELEMENT_TYPE$ $VAR$ = $ARRAY$[$INDEX$];\n" + + " $END$\n" + + "}", + JavaLiveTemplateLocalize.descriptionItar() + )) { builder.withReformat(); builder.withOption(ShortenFQNamesProcessor.KEY, true); @@ -52,10 +62,15 @@ public void contribute(LiveTemplateContributor.Factory factory) { builder.withContextsOf(JavaLikeStatementContextType.class, true); } - try (Builder builder = factory.newBuilder("javaiterationsItco", "itco", "for($ITER_TYPE$ $ITER$ = $COLLECTION$.iterator(); $ITER$.hasNext(); ) {\n" - + " $ELEMENT_TYPE$ $VAR$ =$CAST$ $ITER$.next();\n" - + " $END$\n" - + "}", CodeInsightLocalize.livetemplateDescriptionItco())) { + try (Builder builder = factory.newBuilder( + "javaiterationsItco", + "itco", + "for($ITER_TYPE$ $ITER$ = $COLLECTION$.iterator(); $ITER$.hasNext(); ) {\n" + + " $ELEMENT_TYPE$ $VAR$ =$CAST$ $ITER$.next();\n" + + " $END$\n" + + "}", + JavaLiveTemplateLocalize.descriptionItco() + )) { builder.withReformat(); builder.withOption(ShortenFQNamesProcessor.KEY, true); @@ -71,10 +86,15 @@ public void contribute(LiveTemplateContributor.Factory factory) { builder.withContextsOf(JavaLikeStatementContextType.class, true); } - try (Builder builder = factory.newBuilder("javaiterationsIten", "iten", "while($ENUM$.hasMoreElements()){\n" - + " $TYPE$ $VAR$ = $CAST$ $ENUM$.nextElement();\n" - + " $END$\n" - + "}", CodeInsightLocalize.livetemplateDescriptionIten())) { + try (Builder builder = factory.newBuilder( + "javaiterationsIten", + "iten", + "while($ENUM$.hasMoreElements()){\n" + + " $TYPE$ $VAR$ = $CAST$ $ENUM$.nextElement();\n" + + " $END$\n" + + "}", + JavaLiveTemplateLocalize.descriptionIten() + )) { builder.withReformat(); builder.withOption(ShortenFQNamesProcessor.KEY, true); @@ -91,7 +111,7 @@ public void contribute(LiveTemplateContributor.Factory factory) { try (Builder builder = factory.newBuilder("javaiterationsItit", "itit", "while($ITER$.hasNext()){\n" + " $TYPE$ $VAR$ = $CAST$ $ITER$.next();\n" + " $END$\n" - + "}", CodeInsightLocalize.livetemplateDescriptionItit())) { + + "}", JavaLiveTemplateLocalize.descriptionItit())) { builder.withReformat(); builder.withOption(ShortenFQNamesProcessor.KEY, true); @@ -105,10 +125,15 @@ public void contribute(LiveTemplateContributor.Factory factory) { builder.withContextsOf(JavaLikeStatementContextType.class, true); } - try (Builder builder = factory.newBuilder("javaiterationsItli", "itli", "for (int $INDEX$ = 0; $INDEX$ < $LIST$.size(); $INDEX$++) {\n" - + " $ELEMENT_TYPE$ $VAR$ = $CAST$ $LIST$.get($INDEX$);\n" - + " $END$\n" - + "}", CodeInsightLocalize.livetemplateDescriptionItli())) { + try (Builder builder = factory.newBuilder( + "javaiterationsItli", + "itli", + "for (int $INDEX$ = 0; $INDEX$ < $LIST$.size(); $INDEX$++) {\n" + + " $ELEMENT_TYPE$ $VAR$ = $CAST$ $LIST$.get($INDEX$);\n" + + " $END$\n" + + "}", + JavaLiveTemplateLocalize.descriptionItli() + )) { builder.withReformat(); builder.withOption(ShortenFQNamesProcessor.KEY, true); @@ -123,10 +148,15 @@ public void contribute(LiveTemplateContributor.Factory factory) { builder.withContextsOf(JavaLikeStatementContextType.class, true); } - try (Builder builder = factory.newBuilder("javaiterationsIttok", "ittok", "for (java.util.StringTokenizer $TOKENIZER$ = new java.util.StringTokenizer($STRING$); $TOKENIZER$.hasMoreTokens(); ) {\n" - + " String $VAR$ = $TOKENIZER_COPY$.nextToken();\n" - + " $END$\n" - + "}\n", CodeInsightLocalize.livetemplateDescriptionIttok())) { + try (Builder builder = factory.newBuilder( + "javaiterationsIttok", + "ittok", + "for (java.util.StringTokenizer $TOKENIZER$ = new java.util.StringTokenizer($STRING$); $TOKENIZER$.hasMoreTokens(); ) {\n" + + " String $VAR$ = $TOKENIZER_COPY$.nextToken();\n" + + " $END$\n" + + "}\n", + JavaLiveTemplateLocalize.descriptionIttok() + )) { builder.withReformat(); builder.withOption(ShortenFQNamesProcessor.KEY, true); @@ -140,10 +170,15 @@ public void contribute(LiveTemplateContributor.Factory factory) { builder.withContextsOf(JavaLikeStatementContextType.class, true); } - try (Builder builder = factory.newBuilder("javaiterationsItve", "itve", "for(int $INDEX$ = 0; $INDEX$ < $VECTOR$.size(); $INDEX$++) {\n" - + " $ELEMENT_TYPE$ $VAR$ = $CAST$ $VECTOR$.elementAt($INDEX$);\n" - + " $END$\n" - + "}", CodeInsightLocalize.livetemplateDescriptionItve())) { + try (Builder builder = factory.newBuilder( + "javaiterationsItve", + "itve", + "for(int $INDEX$ = 0; $INDEX$ < $VECTOR$.size(); $INDEX$++) {\n" + + " $ELEMENT_TYPE$ $VAR$ = $CAST$ $VECTOR$.elementAt($INDEX$);\n" + + " $END$\n" + + "}", + JavaLiveTemplateLocalize.descriptionItve() + )) { builder.withReformat(); builder.withOption(ShortenFQNamesProcessor.KEY, true); @@ -158,10 +193,15 @@ public void contribute(LiveTemplateContributor.Factory factory) { builder.withContextsOf(JavaLikeStatementContextType.class, true); } - try (Builder builder = factory.newBuilder("javaiterationsRitar", "ritar", "for(int $INDEX$ = $ARRAY$.length - 1; $INDEX$ >= 0; $INDEX$--) {\n" - + " $ELEMENT_TYPE$ $VAR$ = $ARRAY$[$INDEX$];\n" - + " $END$\n" - + "}", CodeInsightLocalize.livetemplateDescriptionRitar())) { + try (Builder builder = factory.newBuilder( + "javaiterationsRitar", + "ritar", + "for(int $INDEX$ = $ARRAY$.length - 1; $INDEX$ >= 0; $INDEX$--) {\n" + + " $ELEMENT_TYPE$ $VAR$ = $ARRAY$[$INDEX$];\n" + + " $END$\n" + + "}", + JavaLiveTemplateLocalize.descriptionRitar() + )) { builder.withReformat(); builder.withOption(ShortenFQNamesProcessor.KEY, true); @@ -175,9 +215,14 @@ public void contribute(LiveTemplateContributor.Factory factory) { builder.withContextsOf(JavaLikeStatementContextType.class, true); } - try (Builder builder = factory.newBuilder("javaiterationsIter", "iter", "for ($ELEMENT_TYPE$ $VAR$ : $ITERABLE_TYPE$) {\n" - + " $END$\n" - + "}", CodeInsightLocalize.livetemplateDescriptionIter())) { + try (Builder builder = factory.newBuilder( + "javaiterationsIter", + "iter", + "for ($ELEMENT_TYPE$ $VAR$ : $ITERABLE_TYPE$) {\n" + + " $END$\n" + + "}", + JavaLiveTemplateLocalize.descriptionIter() + )) { builder.withReformat(); builder.withOption(ShortenFQNamesProcessor.KEY, true); diff --git a/plugin/src/main/java/consulo/java/impl/template/JavaOtherLiveTemplateContributor.java b/plugin/src/main/java/consulo/java/impl/template/JavaOtherLiveTemplateContributor.java index 47ba3ea5bc..d573f5c3f5 100644 --- a/plugin/src/main/java/consulo/java/impl/template/JavaOtherLiveTemplateContributor.java +++ b/plugin/src/main/java/consulo/java/impl/template/JavaOtherLiveTemplateContributor.java @@ -1,9 +1,12 @@ package consulo.java.impl.template; -import com.intellij.java.impl.codeInsight.template.*; +import com.intellij.java.impl.codeInsight.template.JavaCommentContextType; +import com.intellij.java.impl.codeInsight.template.JavaLikeCodeContextType; +import com.intellij.java.impl.codeInsight.template.JavaLikeDeclarationContextType; +import com.intellij.java.impl.codeInsight.template.JavaLikeStatementContextType; import com.intellij.java.impl.codeInsight.template.impl.ShortenFQNamesProcessor; import consulo.annotation.component.ExtensionImpl; -import consulo.language.editor.localize.CodeInsightLocalize; +import consulo.java.localize.JavaLiveTemplateLocalize; import consulo.language.editor.template.LiveTemplateContributor; import consulo.localize.LocalizeValue; @@ -16,12 +19,17 @@ public String groupId() { @Override public LocalizeValue groupName() { - return LocalizeValue.localizeTODO("Java Other"); + return JavaLiveTemplateLocalize.groupNameJavaOther(); } @Override public void contribute(LiveTemplateContributor.Factory factory) { - try (Builder builder = factory.newBuilder("javaT", "t", "<$TAG$>$END$", CodeInsightLocalize.livetemplateDescriptionTagPair())) { + try (Builder builder = factory.newBuilder( + "javaT", + "t", + "<$TAG$>$END$", + JavaLiveTemplateLocalize.descriptionTagPair() + )) { builder.withReformat(); builder.withVariable("TAG", "", "", true); @@ -31,10 +39,15 @@ public void contribute(LiveTemplateContributor.Factory factory) { builder.withContext(JavaCommentContextType.class, true); } - try (Builder builder = factory.newBuilder("javaotherInst", "inst", "if ($EXPR$ instanceof $TYPE$) {\r\n" - + " $TYPE$ $VAR1$ = ($TYPE$)$EXPR$;\r\n" - + " $END$\r\n" - + "}", CodeInsightLocalize.livetemplateDescriptionInst())) { + try (Builder builder = factory.newBuilder( + "javaotherInst", + "inst", + "if ($EXPR$ instanceof $TYPE$) {\r\n" + + " $TYPE$ $VAR1$ = ($TYPE$)$EXPR$;\r\n" + + " $END$\r\n" + + "}", + JavaLiveTemplateLocalize.descriptionInst() + )) { builder.withReformat(); builder.withOption(ShortenFQNamesProcessor.KEY, true); @@ -47,7 +60,12 @@ public void contribute(LiveTemplateContributor.Factory factory) { builder.withContextsOf(JavaLikeStatementContextType.class, true); } - try (Builder builder = factory.newBuilder("javaotherLst", "lst", "$ARRAY$[$ARRAY$.length - 1]", CodeInsightLocalize.livetemplateDescriptionLst())) { + try (Builder builder = factory.newBuilder( + "javaotherLst", + "lst", + "$ARRAY$[$ARRAY$.length - 1]", + JavaLiveTemplateLocalize.descriptionLst() + )) { builder.withReformat(); builder.withOption(ShortenFQNamesProcessor.KEY, true); @@ -58,7 +76,12 @@ public void contribute(LiveTemplateContributor.Factory factory) { builder.withContextsOf(JavaLikeStatementContextType.class, true); } - try (Builder builder = factory.newBuilder("javaotherMn", "mn", "$VAR$ = Math.min($VAR$, $END$);", CodeInsightLocalize.livetemplateDescriptionMn())) { + try (Builder builder = factory.newBuilder( + "javaotherMn", + "mn", + "$VAR$ = Math.min($VAR$, $END$);", + JavaLiveTemplateLocalize.descriptionMn() + )) { builder.withReformat(); builder.withOption(ShortenFQNamesProcessor.KEY, true); @@ -69,7 +92,12 @@ public void contribute(LiveTemplateContributor.Factory factory) { builder.withContextsOf(JavaLikeStatementContextType.class, true); } - try (Builder builder = factory.newBuilder("javaotherMx", "mx", "$VAR$ = Math.max($VAR$, $END$);", CodeInsightLocalize.livetemplateDescriptionMx())) { + try (Builder builder = factory.newBuilder( + "javaotherMx", + "mx", + "$VAR$ = Math.max($VAR$, $END$);", + JavaLiveTemplateLocalize.descriptionMx() + )) { builder.withReformat(); builder.withOption(ShortenFQNamesProcessor.KEY, true); @@ -80,19 +108,28 @@ public void contribute(LiveTemplateContributor.Factory factory) { builder.withContextsOf(JavaLikeStatementContextType.class, true); } - try (Builder builder = factory.newBuilder("javaotherPsvm", "psvm", "public static void main(String[] args){\r\n" - + " $END$\r\n" - + "}", CodeInsightLocalize.livetemplateDescriptionPsvm())) { + try (Builder builder = factory.newBuilder( + "javaotherPsvm", + "psvm", + "public static void main(String[] args){\r\n" + + " $END$\r\n" + + "}", + JavaLiveTemplateLocalize.descriptionPsvm() + )) { builder.withReformat(); builder.withOption(ShortenFQNamesProcessor.KEY, true); - builder.withContextsOf(JavaLikeCodeContextType.class, true); builder.withContextsOf(JavaLikeStatementContextType.class, false); } - try (Builder builder = factory.newBuilder("javaotherToar", "toar", "$COLLECTION$.toArray(new $COMPONENT_TYPE$[$COLLECTION$.size()])$END$", CodeInsightLocalize.livetemplateDescriptionToar())) { + try (Builder builder = factory.newBuilder( + "javaotherToar", + "toar", + "$COLLECTION$.toArray(new $COMPONENT_TYPE$[$COLLECTION$.size()])$END$", + JavaLiveTemplateLocalize.descriptionToar() + )) { builder.withReformat(); builder.withOption(ShortenFQNamesProcessor.KEY, true); @@ -104,9 +141,14 @@ public void contribute(LiveTemplateContributor.Factory factory) { builder.withContextsOf(JavaLikeStatementContextType.class, true); } - try (Builder builder = factory.newBuilder("javaotherLazy", "lazy", "if ($VAR$ == null) {\n" - + " $VAR$ = new $TYPE$($END$);\n" - + "}", CodeInsightLocalize.livetemplateDescriptionLazy())) { + try (Builder builder = factory.newBuilder( + "javaotherLazy", + "lazy", + "if ($VAR$ == null) {\n" + + " $VAR$ = new $TYPE$($END$);\n" + + "}", + JavaLiveTemplateLocalize.descriptionLazy() + )) { builder.withReformat(); builder.withOption(ShortenFQNamesProcessor.KEY, true); @@ -118,9 +160,14 @@ public void contribute(LiveTemplateContributor.Factory factory) { builder.withContextsOf(JavaLikeStatementContextType.class, true); } - try (Builder builder = factory.newBuilder("javaotherInn", "inn", "if ($VAR$ != null) {\n" - + "$END$\n" - + "}", CodeInsightLocalize.livetemplateDescriptionIfNotNull())) { + try (Builder builder = factory.newBuilder( + "javaotherInn", + "inn", + "if ($VAR$ != null) {\n" + + "$END$\n" + + "}", + JavaLiveTemplateLocalize.descriptionIfNotNull() + )) { builder.withReformat(); builder.withOption(ShortenFQNamesProcessor.KEY, true); @@ -131,9 +178,14 @@ public void contribute(LiveTemplateContributor.Factory factory) { builder.withContextsOf(JavaLikeStatementContextType.class, true); } - try (Builder builder = factory.newBuilder("javaotherIfn", "ifn", "if ($VAR$ == null) {\n" - + "$END$\n" - + "}", CodeInsightLocalize.livetemplateDescriptionIfNull())) { + try (Builder builder = factory.newBuilder( + "javaotherIfn", + "ifn", + "if ($VAR$ == null) {\n" + + "$END$\n" + + "}", + JavaLiveTemplateLocalize.descriptionIfNull() + )) { builder.withReformat(); builder.withOption(ShortenFQNamesProcessor.KEY, true); @@ -144,9 +196,14 @@ public void contribute(LiveTemplateContributor.Factory factory) { builder.withContextsOf(JavaLikeStatementContextType.class, true); } - try (Builder builder = factory.newBuilder("javaotherGeti", "geti", "public static $CLASS_NAME$ getInstance() {\r\n" - + " return $VALUE$;\r\n" - + "}", CodeInsightLocalize.livetemplateDescriptionGeti())) { + try (Builder builder = factory.newBuilder( + "javaotherGeti", + "geti", + "public static $CLASS_NAME$ getInstance() {\r\n" + + " return $VALUE$;\r\n" + + "}", + JavaLiveTemplateLocalize.descriptionGeti() + )) { builder.withReformat(); builder.withOption(ShortenFQNamesProcessor.KEY, true); @@ -157,6 +214,5 @@ public void contribute(LiveTemplateContributor.Factory factory) { builder.withContextsOf(JavaLikeCodeContextType.class, false); builder.withContextsOf(JavaLikeDeclarationContextType.class, true); } - } } diff --git a/plugin/src/main/java/consulo/java/impl/template/JavaOutputLiveTemplateContributor.java b/plugin/src/main/java/consulo/java/impl/template/JavaOutputLiveTemplateContributor.java index 9e94c49270..83421a0c91 100644 --- a/plugin/src/main/java/consulo/java/impl/template/JavaOutputLiveTemplateContributor.java +++ b/plugin/src/main/java/consulo/java/impl/template/JavaOutputLiveTemplateContributor.java @@ -4,7 +4,7 @@ import com.intellij.java.impl.codeInsight.template.JavaLikeStatementContextType; import com.intellij.java.impl.codeInsight.template.impl.ShortenFQNamesProcessor; import consulo.annotation.component.ExtensionImpl; -import consulo.language.editor.localize.CodeInsightLocalize; +import consulo.java.localize.JavaLiveTemplateLocalize; import consulo.language.editor.template.LiveTemplateContributor; import consulo.localize.LocalizeValue; @@ -17,12 +17,17 @@ public String groupId() { @Override public LocalizeValue groupName() { - return LocalizeValue.localizeTODO("Java Output"); + return JavaLiveTemplateLocalize.groupNameJavaOutput(); } @Override public void contribute(LiveTemplateContributor.Factory factory) { - try (Builder builder = factory.newBuilder("javaoutputSerr", "serr", "System.err.println(\"$END$\");", CodeInsightLocalize.livetemplateDescriptionSerr())) { + try (Builder builder = factory.newBuilder( + "javaoutputSerr", + "serr", + "System.err.println(\"$END$\");", + JavaLiveTemplateLocalize.descriptionSerr() + )) { builder.withReformat(); builder.withOption(ShortenFQNamesProcessor.KEY, true); @@ -31,7 +36,12 @@ public void contribute(LiveTemplateContributor.Factory factory) { builder.withContextsOf(JavaLikeStatementContextType.class, true); } - try (Builder builder = factory.newBuilder("javaoutputSout", "sout", "System.out.println($END$);", CodeInsightLocalize.livetemplateDescriptionSout())) { + try (Builder builder = factory.newBuilder( + "javaoutputSout", + "sout", + "System.out.println($END$);", + JavaLiveTemplateLocalize.descriptionSout() + )) { builder.withReformat(); builder.withOption(ShortenFQNamesProcessor.KEY, true); @@ -40,7 +50,12 @@ public void contribute(LiveTemplateContributor.Factory factory) { builder.withContextsOf(JavaLikeStatementContextType.class, true); } - try (Builder builder = factory.newBuilder("javaoutputSouf", "souf", "System.out.printf(\"$END$\");", CodeInsightLocalize.livetemplateDescriptionSouf())) { + try (Builder builder = factory.newBuilder( + "javaoutputSouf", + "souf", + "System.out.printf(\"$END$\");", + JavaLiveTemplateLocalize.descriptionSouf() + )) { builder.withReformat(); builder.withOption(ShortenFQNamesProcessor.KEY, true); @@ -49,7 +64,12 @@ public void contribute(LiveTemplateContributor.Factory factory) { builder.withContextsOf(JavaLikeStatementContextType.class, true); } - try (Builder builder = factory.newBuilder("javaoutputSoutm", "soutm", "System.out.println(\"$CLASS_NAME$.$METHOD_NAME$\");", CodeInsightLocalize.livetemplateDescriptionSoutm())) { + try (Builder builder = factory.newBuilder( + "javaoutputSoutm", + "soutm", + "System.out.println(\"$CLASS_NAME$.$METHOD_NAME$\");", + JavaLiveTemplateLocalize.descriptionSoutm() + )) { builder.withReformat(); builder.withOption(ShortenFQNamesProcessor.KEY, true); @@ -61,18 +81,33 @@ public void contribute(LiveTemplateContributor.Factory factory) { builder.withContextsOf(JavaLikeStatementContextType.class, true); } - try (Builder builder = factory.newBuilder("javaoutputSoutp", "soutp", "System.out.println($FORMAT$);", CodeInsightLocalize.livetemplateDescriptionSoutp())) { + try (Builder builder = factory.newBuilder( + "javaoutputSoutp", + "soutp", + "System.out.println($FORMAT$);", + JavaLiveTemplateLocalize.descriptionSoutp() + )) { builder.withReformat(); builder.withOption(ShortenFQNamesProcessor.KEY, true); - builder.withVariable("FORMAT", "groovyScript(\"'\\\"' + _1.collect { it + ' = [\\\" + ' + it + ' + \\\"]'}.join(', ') + '\\\"'\", methodParameters())", "", false); + builder.withVariable( + "FORMAT", + "groovyScript(\"'\\\"' + _1.collect { it + ' = [\\\" + ' + it + ' + \\\"]'}.join(', ') + '\\\"'\", methodParameters())", + "", + false + ); builder.withContextsOf(JavaLikeCodeContextType.class, false); builder.withContextsOf(JavaLikeStatementContextType.class, true); } - try (Builder builder = factory.newBuilder("javaoutputSoutv", "soutv", "System.out.println(\"$EXPR_COPY$ = \" + $EXPR$);", CodeInsightLocalize.livetemplateDescriptionSoutv())) { + try (Builder builder = factory.newBuilder( + "javaoutputSoutv", + "soutv", + "System.out.println(\"$EXPR_COPY$ = \" + $EXPR$);", + JavaLiveTemplateLocalize.descriptionSoutv() + )) { builder.withReformat(); builder.withOption(ShortenFQNamesProcessor.KEY, true); diff --git a/plugin/src/main/java/consulo/java/impl/template/JavaPlainLiveTemplateContributor.java b/plugin/src/main/java/consulo/java/impl/template/JavaPlainLiveTemplateContributor.java index 016d4a7592..34ef457043 100644 --- a/plugin/src/main/java/consulo/java/impl/template/JavaPlainLiveTemplateContributor.java +++ b/plugin/src/main/java/consulo/java/impl/template/JavaPlainLiveTemplateContributor.java @@ -1,9 +1,12 @@ package consulo.java.impl.template; -import com.intellij.java.impl.codeInsight.template.*; +import com.intellij.java.impl.codeInsight.template.JavaLikeCodeContextType; +import com.intellij.java.impl.codeInsight.template.JavaLikeDeclarationContextType; +import com.intellij.java.impl.codeInsight.template.JavaLikeExpressionContextType; +import com.intellij.java.impl.codeInsight.template.JavaLikeStatementContextType; import com.intellij.java.impl.codeInsight.template.impl.ShortenFQNamesProcessor; import consulo.annotation.component.ExtensionImpl; -import consulo.language.editor.localize.CodeInsightLocalize; +import consulo.java.localize.JavaLiveTemplateLocalize; import consulo.language.editor.template.LiveTemplateContributor; import consulo.localize.LocalizeValue; @@ -16,12 +19,12 @@ public String groupId() { @Override public LocalizeValue groupName() { - return LocalizeValue.localizeTODO("Java Plain"); + return JavaLiveTemplateLocalize.groupNameJavaPlain(); } @Override public void contribute(LiveTemplateContributor.Factory factory) { - try (Builder builder = factory.newBuilder("javaplainSt", "St", "String ", CodeInsightLocalize.livetemplateDescriptionSt())) { + try (Builder builder = factory.newBuilder("javaplainSt", "St", "String ", JavaLiveTemplateLocalize.descriptionSt())) { builder.withOption(ShortenFQNamesProcessor.KEY, true); builder.withContextsOf(JavaLikeCodeContextType.class, false); @@ -30,28 +33,43 @@ public void contribute(LiveTemplateContributor.Factory factory) { builder.withContextsOf(JavaLikeExpressionContextType.class, true); } - try (Builder builder = factory.newBuilder("javaplainPsf", "psf", "public static final ", CodeInsightLocalize.livetemplateDescriptionPsf())) { + try (Builder builder = factory.newBuilder( + "javaplainPsf", + "psf", + "public static final ", + JavaLiveTemplateLocalize.descriptionPsf() + )) { builder.withOption(ShortenFQNamesProcessor.KEY, true); builder.withContextsOf(JavaLikeCodeContextType.class, false); builder.withContextsOf(JavaLikeStatementContextType.class, true); } - try (Builder builder = factory.newBuilder("javaplainPsfi", "psfi", "public static final int ", CodeInsightLocalize.livetemplateDescriptionPsfi())) { + try (Builder builder = factory.newBuilder( + "javaplainPsfi", + "psfi", + "public static final int ", + JavaLiveTemplateLocalize.descriptionPsfi() + )) { builder.withOption(ShortenFQNamesProcessor.KEY, true); builder.withContextsOf(JavaLikeCodeContextType.class, false); builder.withContextsOf(JavaLikeStatementContextType.class, true); } - try (Builder builder = factory.newBuilder("javaplainPsfs", "psfs", "public static final String ", CodeInsightLocalize.livetemplateDescriptionPsfs())) { + try (Builder builder = factory.newBuilder( + "javaplainPsfs", + "psfs", + "public static final String ", + JavaLiveTemplateLocalize.descriptionPsfs() + )) { builder.withOption(ShortenFQNamesProcessor.KEY, true); builder.withContextsOf(JavaLikeCodeContextType.class, false); builder.withContextsOf(JavaLikeStatementContextType.class, true); } - try (Builder builder = factory.newBuilder("javaplainThr", "thr", "throw new ", CodeInsightLocalize.livetemplateDescriptionThr())) { + try (Builder builder = factory.newBuilder("javaplainThr", "thr", "throw new ", JavaLiveTemplateLocalize.descriptionThr())) { builder.withOption(ShortenFQNamesProcessor.KEY, true); builder.withContextsOf(JavaLikeCodeContextType.class, false); diff --git a/plugin/src/main/java/consulo/java/impl/template/JavaSurroundLiveTemplateContributor.java b/plugin/src/main/java/consulo/java/impl/template/JavaSurroundLiveTemplateContributor.java index 2fc92d2c6b..7791349e0b 100644 --- a/plugin/src/main/java/consulo/java/impl/template/JavaSurroundLiveTemplateContributor.java +++ b/plugin/src/main/java/consulo/java/impl/template/JavaSurroundLiveTemplateContributor.java @@ -4,7 +4,7 @@ import com.intellij.java.impl.codeInsight.template.JavaLikeStatementContextType; import com.intellij.java.impl.codeInsight.template.impl.ShortenFQNamesProcessor; import consulo.annotation.component.ExtensionImpl; -import consulo.language.editor.localize.CodeInsightLocalize; +import consulo.java.localize.JavaLiveTemplateLocalize; import consulo.language.editor.template.LiveTemplateContributor; import consulo.localize.LocalizeValue; @@ -17,12 +17,17 @@ public String groupId() { @Override public LocalizeValue groupName() { - return LocalizeValue.localizeTODO("Java Surround"); + return JavaLiveTemplateLocalize.groupNameJavaSurround(); } @Override public void contribute(LiveTemplateContributor.Factory factory) { -// try (Builder builder = factory.newBuilder("javasurroundB", "B", "{$SELECTION$}", CodeInsightLocalize.livetemplateDescriptionSurroundBraces())) { +// try (Builder builder = factory.newBuilder( +// "javasurroundB", +// "B", +// "{$SELECTION$}", +// JavaLiveTemplateLocalize.descriptionSurroundBraces() +// )) { // builder.withReformat(); // // builder.withOption(ShortenFQNamesProcessor.KEY, true); @@ -41,7 +46,12 @@ public void contribute(LiveTemplateContributor.Factory factory) { // builder.withContext(OTHER.class, true); // } // -// try (Builder builder = factory.newBuilder("javasurroundP", "P", "($SELECTION$)", CodeInsightLocalize.livetemplateDescriptionSurroundParens())) { +// try (Builder builder = factory.newBuilder( +// "javasurroundP", +// "P", +// "($SELECTION$)", +// JavaLiveTemplateLocalize.descriptionSurroundParens() +// )) { // builder.withOption(ShortenFQNamesProcessor.KEY, true); // // builder.withVariable("SELECTION", "", "", false); @@ -58,12 +68,17 @@ public void contribute(LiveTemplateContributor.Factory factory) { // builder.withContext(OTHER.class, true); // } - try (Builder builder = factory.newBuilder("javasurroundC", "C", "java.util.concurrent.Callable<$RET$> callable = new java.util.concurrent.Callable<$RET$>() {\n" - + " public $RET$ call() throws Exception {\n" - + " $SELECTION$\n" - + " $END$ \n" - + " }\n" - + "};", CodeInsightLocalize.livetemplateDescriptionSurroundWithCallable())) { + try (Builder builder = factory.newBuilder( + "javasurroundC", + "C", + "java.util.concurrent.Callable<$RET$> callable = new java.util.concurrent.Callable<$RET$>() {\n" + + " public $RET$ call() throws Exception {\n" + + " $SELECTION$\n" + + " $END$ \n" + + " }\n" + + "};", + JavaLiveTemplateLocalize.descriptionSurroundWithCallable() + )) { builder.withReformat(); builder.withOption(ShortenFQNamesProcessor.KEY, true); @@ -75,12 +90,17 @@ public void contribute(LiveTemplateContributor.Factory factory) { builder.withContextsOf(JavaLikeStatementContextType.class, true); } - try (Builder builder = factory.newBuilder("javasurroundRL", "RL", "$LOCK$.readLock().lock();\n" - + "try { \n" - + " $SELECTION$\n" - + "} finally {\n" - + " $LOCK$.readLock().unlock();\n" - + "}\n", CodeInsightLocalize.livetemplateDescriptionSurroundWithReadLock())) { + try (Builder builder = factory.newBuilder( + "javasurroundRL", + "RL", + "$LOCK$.readLock().lock();\n" + + "try { \n" + + " $SELECTION$\n" + + "} finally {\n" + + " $LOCK$.readLock().unlock();\n" + + "}\n", + JavaLiveTemplateLocalize.descriptionSurroundWithReadLock() + )) { builder.withReformat(); builder.withOption(ShortenFQNamesProcessor.KEY, true); @@ -92,12 +112,17 @@ public void contribute(LiveTemplateContributor.Factory factory) { builder.withContextsOf(JavaLikeStatementContextType.class, true); } - try (Builder builder = factory.newBuilder("javasurroundWL", "WL", "$LOCK$.writeLock().lock();\n" - + "try { \n" - + " $SELECTION$\n" - + "} finally {\n" - + " $LOCK$.writeLock().unlock();\n" - + "}\n", CodeInsightLocalize.livetemplateDescriptionSurroundWithWriteLock())) { + try (Builder builder = factory.newBuilder( + "javasurroundWL", + "WL", + "$LOCK$.writeLock().lock();\n" + + "try { \n" + + " $SELECTION$\n" + + "} finally {\n" + + " $LOCK$.writeLock().unlock();\n" + + "}\n", + JavaLiveTemplateLocalize.descriptionSurroundWithWriteLock() + )) { builder.withReformat(); builder.withOption(ShortenFQNamesProcessor.KEY, true); @@ -109,9 +134,14 @@ public void contribute(LiveTemplateContributor.Factory factory) { builder.withContextsOf(JavaLikeStatementContextType.class, true); } - try (Builder builder = factory.newBuilder("javasurroundI", "I", "for ($ELEMENT_TYPE$ $VAR$ : $SELECTION$) {\n" - + " $END$\n" - + "}\n", CodeInsightLocalize.livetemplateDescriptionIter())) { + try (Builder builder = factory.newBuilder( + "javasurroundI", + "I", + "for ($ELEMENT_TYPE$ $VAR$ : $SELECTION$) {\n" + + " $END$\n" + + "}\n", + JavaLiveTemplateLocalize.descriptionItover() + )) { builder.withReformat(); builder.withOption(ShortenFQNamesProcessor.KEY, true); @@ -123,6 +153,5 @@ public void contribute(LiveTemplateContributor.Factory factory) { builder.withContextsOf(JavaLikeCodeContextType.class, false); builder.withContextsOf(JavaLikeStatementContextType.class, true); } - } } diff --git a/plugin/src/main/resources/LOCALIZE-LIB/en_US/consulo.java.JavaLiveTemplateLocalize.yaml b/plugin/src/main/resources/LOCALIZE-LIB/en_US/consulo.java.JavaLiveTemplateLocalize.yaml new file mode 100644 index 0000000000..e7032aaf55 --- /dev/null +++ b/plugin/src/main/resources/LOCALIZE-LIB/en_US/consulo.java.JavaLiveTemplateLocalize.yaml @@ -0,0 +1,82 @@ +description.fori: + text: Create iteration loop +description.geti: + text: Inserts singleton method getInstance +description.if.not.null: + text: Inserts ''if not null'' statement +description.if.null: + text: Inserts ''if null'' statement +description.inst: + text: Checks object type with instanceof and down-casts it +description.itar: + text: Iterate elements of array +description.itco: + text: Iterate elements of java.util.Collection +description.iten: + text: Iterate java.util.Enumeration +description.iter: + text: Iterate Iterable with foreach +description.itit: + text: Iterate java.util.Iterator +description.itli: + text: Iterate elements of java.util.List +description.itover: + text: Iterate over an Iterable or Array selection with foreach +description.ittok: + text: Iterate tokens from String +description.itve: + text: Iterate elements of java.util.Vector +description.lazy: + text: Performs lazy initialization +description.lst: + text: Fetches last element of an array +description.mn: + text: Sets lesser value to a variable +description.mx: + text: Sets greater value to a variable +description.psf: + text: public static final +description.psfi: + text: public static final int +description.psfs: + text: public static final String +description.psvm: + text: main() method declaration +description.ritar: + text: Iterate elements of array in reverse order +description.serr: + text: Prints a string to System.err +description.souf: + text: Prints a formatted string to System.out +description.sout: + text: Prints a string to System.out +description.soutm: + text: Prints current class and method names to System.out +description.soutp: + text: Prints method parameter names and values to System.out +description.soutv: + text: Prints a value to System.out +description.st: + text: String +description.surround.with.callable: + text: Surround with Callable +description.surround.with.read.lock: + text: Surround with ReadWriteLock.readLock +description.surround.with.write.lock: + text: Surround with ReadWriteLock.writeLock +description.tag.pair: + text: Tag pair +description.thr: + text: throw new +description.toar: + text: Stores elements of java.util.Collection into array +group.name.java.iterations: + text: Java Iterations +group.name.java.other: + text: Java Other +group.name.java.output: + text: Java Output +group.name.java.plain: + text: Java Plain +group.name.java.surround: + text: Java Surround