Skip to content

Commit b5039f6

Browse files
unv-unvunv-unv
committed
Moving localization of Java Live Templates from platform to new localization yaml. Adding missing localizations.
1 parent baab263 commit b5039f6

6 files changed

Lines changed: 374 additions & 109 deletions

‎plugin/src/main/java/consulo/java/impl/template/JavaIterationsLiveTemplateContributor.java‎

Lines changed: 82 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import com.intellij.java.impl.codeInsight.template.JavaLikeStatementContextType;
55
import com.intellij.java.impl.codeInsight.template.impl.ShortenFQNamesProcessor;
66
import consulo.annotation.component.ExtensionImpl;
7-
import consulo.language.editor.localize.CodeInsightLocalize;
7+
import consulo.java.localize.JavaLiveTemplateLocalize;
88
import consulo.language.editor.template.LiveTemplateContributor;
99
import consulo.localize.LocalizeValue;
1010

@@ -17,14 +17,19 @@ public String groupId() {
1717

1818
@Override
1919
public LocalizeValue groupName() {
20-
return LocalizeValue.localizeTODO("Java Iterations");
20+
return JavaLiveTemplateLocalize.groupNameJavaIterations();
2121
}
2222

2323
@Override
2424
public void contribute(LiveTemplateContributor.Factory factory) {
25-
try (Builder builder = factory.newBuilder("javaiterationsFori", "fori", "for(int $INDEX$ = 0; $INDEX$ < $LIMIT$; $INDEX$++) {\n"
26-
+ " $END$\n"
27-
+ "}", LocalizeValue.localizeTODO("Create iteration loop"))) {
25+
try (Builder builder = factory.newBuilder(
26+
"javaiterationsFori",
27+
"fori",
28+
"for(int $INDEX$ = 0; $INDEX$ < $LIMIT$; $INDEX$++) {\n"
29+
+ " $END$\n"
30+
+ "}",
31+
JavaLiveTemplateLocalize.descriptionFori()
32+
)) {
2833
builder.withReformat();
2934

3035
builder.withOption(ShortenFQNamesProcessor.KEY, true);
@@ -35,10 +40,15 @@ public void contribute(LiveTemplateContributor.Factory factory) {
3540
builder.withContextsOf(JavaLikeStatementContextType.class, true);
3641
}
3742

38-
try (Builder builder = factory.newBuilder("javaiterationsItar", "itar", "for(int $INDEX$ = 0; $INDEX$ < $ARRAY$.length; $INDEX$++) {\n"
39-
+ " $ELEMENT_TYPE$ $VAR$ = $ARRAY$[$INDEX$];\n"
40-
+ " $END$\n"
41-
+ "}", CodeInsightLocalize.livetemplateDescriptionItar())) {
43+
try (Builder builder = factory.newBuilder(
44+
"javaiterationsItar",
45+
"itar",
46+
"for(int $INDEX$ = 0; $INDEX$ < $ARRAY$.length; $INDEX$++) {\n"
47+
+ " $ELEMENT_TYPE$ $VAR$ = $ARRAY$[$INDEX$];\n"
48+
+ " $END$\n"
49+
+ "}",
50+
JavaLiveTemplateLocalize.descriptionItar()
51+
)) {
4252
builder.withReformat();
4353

4454
builder.withOption(ShortenFQNamesProcessor.KEY, true);
@@ -52,10 +62,15 @@ public void contribute(LiveTemplateContributor.Factory factory) {
5262
builder.withContextsOf(JavaLikeStatementContextType.class, true);
5363
}
5464

55-
try (Builder builder = factory.newBuilder("javaiterationsItco", "itco", "for($ITER_TYPE$ $ITER$ = $COLLECTION$.iterator(); $ITER$.hasNext(); ) {\n"
56-
+ " $ELEMENT_TYPE$ $VAR$ =$CAST$ $ITER$.next();\n"
57-
+ " $END$\n"
58-
+ "}", CodeInsightLocalize.livetemplateDescriptionItco())) {
65+
try (Builder builder = factory.newBuilder(
66+
"javaiterationsItco",
67+
"itco",
68+
"for($ITER_TYPE$ $ITER$ = $COLLECTION$.iterator(); $ITER$.hasNext(); ) {\n"
69+
+ " $ELEMENT_TYPE$ $VAR$ =$CAST$ $ITER$.next();\n"
70+
+ " $END$\n"
71+
+ "}",
72+
JavaLiveTemplateLocalize.descriptionItco()
73+
)) {
5974
builder.withReformat();
6075

6176
builder.withOption(ShortenFQNamesProcessor.KEY, true);
@@ -71,10 +86,15 @@ public void contribute(LiveTemplateContributor.Factory factory) {
7186
builder.withContextsOf(JavaLikeStatementContextType.class, true);
7287
}
7388

74-
try (Builder builder = factory.newBuilder("javaiterationsIten", "iten", "while($ENUM$.hasMoreElements()){\n"
75-
+ " $TYPE$ $VAR$ = $CAST$ $ENUM$.nextElement();\n"
76-
+ " $END$\n"
77-
+ "}", CodeInsightLocalize.livetemplateDescriptionIten())) {
89+
try (Builder builder = factory.newBuilder(
90+
"javaiterationsIten",
91+
"iten",
92+
"while($ENUM$.hasMoreElements()){\n"
93+
+ " $TYPE$ $VAR$ = $CAST$ $ENUM$.nextElement();\n"
94+
+ " $END$\n"
95+
+ "}",
96+
JavaLiveTemplateLocalize.descriptionIten()
97+
)) {
7898
builder.withReformat();
7999

80100
builder.withOption(ShortenFQNamesProcessor.KEY, true);
@@ -91,7 +111,7 @@ public void contribute(LiveTemplateContributor.Factory factory) {
91111
try (Builder builder = factory.newBuilder("javaiterationsItit", "itit", "while($ITER$.hasNext()){\n"
92112
+ " $TYPE$ $VAR$ = $CAST$ $ITER$.next();\n"
93113
+ " $END$\n"
94-
+ "}", CodeInsightLocalize.livetemplateDescriptionItit())) {
114+
+ "}", JavaLiveTemplateLocalize.descriptionItit())) {
95115
builder.withReformat();
96116

97117
builder.withOption(ShortenFQNamesProcessor.KEY, true);
@@ -105,10 +125,15 @@ public void contribute(LiveTemplateContributor.Factory factory) {
105125
builder.withContextsOf(JavaLikeStatementContextType.class, true);
106126
}
107127

108-
try (Builder builder = factory.newBuilder("javaiterationsItli", "itli", "for (int $INDEX$ = 0; $INDEX$ < $LIST$.size(); $INDEX$++) {\n"
109-
+ " $ELEMENT_TYPE$ $VAR$ = $CAST$ $LIST$.get($INDEX$);\n"
110-
+ " $END$\n"
111-
+ "}", CodeInsightLocalize.livetemplateDescriptionItli())) {
128+
try (Builder builder = factory.newBuilder(
129+
"javaiterationsItli",
130+
"itli",
131+
"for (int $INDEX$ = 0; $INDEX$ < $LIST$.size(); $INDEX$++) {\n"
132+
+ " $ELEMENT_TYPE$ $VAR$ = $CAST$ $LIST$.get($INDEX$);\n"
133+
+ " $END$\n"
134+
+ "}",
135+
JavaLiveTemplateLocalize.descriptionItli()
136+
)) {
112137
builder.withReformat();
113138

114139
builder.withOption(ShortenFQNamesProcessor.KEY, true);
@@ -123,10 +148,15 @@ public void contribute(LiveTemplateContributor.Factory factory) {
123148
builder.withContextsOf(JavaLikeStatementContextType.class, true);
124149
}
125150

126-
try (Builder builder = factory.newBuilder("javaiterationsIttok", "ittok", "for (java.util.StringTokenizer $TOKENIZER$ = new java.util.StringTokenizer($STRING$); $TOKENIZER$.hasMoreTokens(); ) {\n"
127-
+ " String $VAR$ = $TOKENIZER_COPY$.nextToken();\n"
128-
+ " $END$\n"
129-
+ "}\n", CodeInsightLocalize.livetemplateDescriptionIttok())) {
151+
try (Builder builder = factory.newBuilder(
152+
"javaiterationsIttok",
153+
"ittok",
154+
"for (java.util.StringTokenizer $TOKENIZER$ = new java.util.StringTokenizer($STRING$); $TOKENIZER$.hasMoreTokens(); ) {\n"
155+
+ " String $VAR$ = $TOKENIZER_COPY$.nextToken();\n"
156+
+ " $END$\n"
157+
+ "}\n",
158+
JavaLiveTemplateLocalize.descriptionIttok()
159+
)) {
130160
builder.withReformat();
131161

132162
builder.withOption(ShortenFQNamesProcessor.KEY, true);
@@ -140,10 +170,15 @@ public void contribute(LiveTemplateContributor.Factory factory) {
140170
builder.withContextsOf(JavaLikeStatementContextType.class, true);
141171
}
142172

143-
try (Builder builder = factory.newBuilder("javaiterationsItve", "itve", "for(int $INDEX$ = 0; $INDEX$ < $VECTOR$.size(); $INDEX$++) {\n"
144-
+ " $ELEMENT_TYPE$ $VAR$ = $CAST$ $VECTOR$.elementAt($INDEX$);\n"
145-
+ " $END$\n"
146-
+ "}", CodeInsightLocalize.livetemplateDescriptionItve())) {
173+
try (Builder builder = factory.newBuilder(
174+
"javaiterationsItve",
175+
"itve",
176+
"for(int $INDEX$ = 0; $INDEX$ < $VECTOR$.size(); $INDEX$++) {\n"
177+
+ " $ELEMENT_TYPE$ $VAR$ = $CAST$ $VECTOR$.elementAt($INDEX$);\n"
178+
+ " $END$\n"
179+
+ "}",
180+
JavaLiveTemplateLocalize.descriptionItve()
181+
)) {
147182
builder.withReformat();
148183

149184
builder.withOption(ShortenFQNamesProcessor.KEY, true);
@@ -158,10 +193,15 @@ public void contribute(LiveTemplateContributor.Factory factory) {
158193
builder.withContextsOf(JavaLikeStatementContextType.class, true);
159194
}
160195

161-
try (Builder builder = factory.newBuilder("javaiterationsRitar", "ritar", "for(int $INDEX$ = $ARRAY$.length - 1; $INDEX$ >= 0; $INDEX$--) {\n"
162-
+ " $ELEMENT_TYPE$ $VAR$ = $ARRAY$[$INDEX$];\n"
163-
+ " $END$\n"
164-
+ "}", CodeInsightLocalize.livetemplateDescriptionRitar())) {
196+
try (Builder builder = factory.newBuilder(
197+
"javaiterationsRitar",
198+
"ritar",
199+
"for(int $INDEX$ = $ARRAY$.length - 1; $INDEX$ >= 0; $INDEX$--) {\n"
200+
+ " $ELEMENT_TYPE$ $VAR$ = $ARRAY$[$INDEX$];\n"
201+
+ " $END$\n"
202+
+ "}",
203+
JavaLiveTemplateLocalize.descriptionRitar()
204+
)) {
165205
builder.withReformat();
166206

167207
builder.withOption(ShortenFQNamesProcessor.KEY, true);
@@ -175,9 +215,14 @@ public void contribute(LiveTemplateContributor.Factory factory) {
175215
builder.withContextsOf(JavaLikeStatementContextType.class, true);
176216
}
177217

178-
try (Builder builder = factory.newBuilder("javaiterationsIter", "iter", "for ($ELEMENT_TYPE$ $VAR$ : $ITERABLE_TYPE$) {\n"
179-
+ " $END$\n"
180-
+ "}", CodeInsightLocalize.livetemplateDescriptionIter())) {
218+
try (Builder builder = factory.newBuilder(
219+
"javaiterationsIter",
220+
"iter",
221+
"for ($ELEMENT_TYPE$ $VAR$ : $ITERABLE_TYPE$) {\n"
222+
+ " $END$\n"
223+
+ "}",
224+
JavaLiveTemplateLocalize.descriptionIter()
225+
)) {
181226
builder.withReformat();
182227

183228
builder.withOption(ShortenFQNamesProcessor.KEY, true);

0 commit comments

Comments
 (0)