Skip to content

Commit 2c22ebb

Browse files
author
zkaplan
committed
Final cleannup of snippets
1 parent de7ce25 commit 2c22ebb

7 files changed

Lines changed: 31 additions & 3 deletions

File tree

‎src/main/java/com/hubspot/jinjava/doc/JinjavaDocFactory.java‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -308,19 +308,31 @@ private String getTagSnippet(Tag tag) {
308308
snippet.append(tag.getName());
309309
int i = 1;
310310
for (JinjavaParam param : docAnnotation.input()) {
311-
snippet.append(" ${" + i + ":" + param.value() + "}");
311+
String inputValue = "${" + i + ":" + param.value() + "}";
312+
if (param.value().equalsIgnoreCase("path")) {
313+
inputValue = "'" + inputValue + "'";
314+
} else if (param.value().equalsIgnoreCase("argument_names")) {
315+
inputValue = "(" + inputValue + ")";
316+
}
317+
snippet.append(" " + inputValue);
312318
i++;
313319
}
314320

315321
for (JinjavaParam param : docAnnotation.params()) {
316-
snippet.append(" ${" + i + ":" + param.value() + "}");
322+
String paramValue = "${" + i + ":" + param.value() + "}";
323+
if (param.value().equalsIgnoreCase("path")) {
324+
paramValue = "'" + paramValue + "'";
325+
} else if (param.value().equalsIgnoreCase("argument_names")) {
326+
paramValue = "(" + paramValue + ")";
327+
}
328+
snippet.append(" " + paramValue);
317329
i++;
318330
}
319331

320332
snippet.append(" %}");
321333

322334
if (tag.getClass().getAnnotation(JinjavaHasCodeBody.class) != null) {
323-
snippet.append("\n${" + i + ":Code}");
335+
snippet.append("\n$0");
324336
}
325337
if (tag.getEndTagName() != null) {
326338
snippet.append("\n{% " + tag.getEndTagName() + " %}");

‎src/main/java/com/hubspot/jinjava/lib/tag/BlockTag.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
package com.hubspot.jinjava.lib.tag;
1717

1818
import com.hubspot.jinjava.doc.annotations.JinjavaDoc;
19+
import com.hubspot.jinjava.doc.annotations.JinjavaHasCodeBody;
1920
import com.hubspot.jinjava.doc.annotations.JinjavaParam;
2021
import com.hubspot.jinjava.doc.annotations.JinjavaSnippet;
2122
import com.hubspot.jinjava.interpret.JinjavaInterpreter;
@@ -48,6 +49,7 @@
4849
)
4950
}
5051
)
52+
@JinjavaHasCodeBody
5153
public class BlockTag implements Tag {
5254
public static final String TAG_NAME = "block";
5355

‎src/main/java/com/hubspot/jinjava/lib/tag/CallTag.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import com.hubspot.jinjava.doc.annotations.JinjavaDoc;
44
import com.hubspot.jinjava.doc.annotations.JinjavaSnippet;
5+
import com.hubspot.jinjava.doc.annotations.JinjavaTextMateSnippet;
56
import com.hubspot.jinjava.interpret.JinjavaInterpreter;
67
import com.hubspot.jinjava.interpret.JinjavaInterpreter.InterpreterScopeClosable;
78
import com.hubspot.jinjava.lib.fn.MacroFunction;
@@ -48,6 +49,9 @@
4849
)
4950
}
5051
)
52+
@JinjavaTextMateSnippet(
53+
code = "{% call ${1:macro_name}(${2:argument_names}) %}\n" + "$0\n" + "{% endcall %}"
54+
)
5155
public class CallTag implements Tag {
5256
public static final String TAG_NAME = "call";
5357

‎src/main/java/com/hubspot/jinjava/lib/tag/DoTag.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import com.hubspot.jinjava.doc.annotations.JinjavaDoc;
44
import com.hubspot.jinjava.doc.annotations.JinjavaSnippet;
5+
import com.hubspot.jinjava.doc.annotations.JinjavaTextMateSnippet;
56
import com.hubspot.jinjava.interpret.JinjavaInterpreter;
67
import com.hubspot.jinjava.interpret.TemplateSyntaxException;
78
import com.hubspot.jinjava.tree.TagNode;
@@ -11,6 +12,7 @@
1112
value = "Evaluates expression without printing out result.",
1213
snippets = { @JinjavaSnippet(code = "{% do list.append('value 2') %}") }
1314
)
15+
@JinjavaTextMateSnippet(code = "{% do ${1:expr} %}")
1416
public class DoTag implements Tag {
1517
public static final String TAG_NAME = "do";
1618

‎src/main/java/com/hubspot/jinjava/lib/tag/ForTag.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import com.hubspot.jinjava.doc.annotations.JinjavaHasCodeBody;
2121
import com.hubspot.jinjava.doc.annotations.JinjavaParam;
2222
import com.hubspot.jinjava.doc.annotations.JinjavaSnippet;
23+
import com.hubspot.jinjava.doc.annotations.JinjavaTextMateSnippet;
2324
import com.hubspot.jinjava.interpret.DeferredValueException;
2425
import com.hubspot.jinjava.interpret.InterpretException;
2526
import com.hubspot.jinjava.interpret.JinjavaInterpreter;
@@ -81,6 +82,9 @@
8182
}
8283
)
8384
@JinjavaHasCodeBody
85+
@JinjavaTextMateSnippet(
86+
code = "{% for ${1:items} in ${2:list} %}\n" + "{{ ${1} }}$0\n" + "{% endfor %}"
87+
)
8488
public class ForTag implements Tag {
8589
public static final String TAG_NAME = "for";
8690

‎src/main/java/com/hubspot/jinjava/lib/tag/FromTag.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import com.hubspot.jinjava.doc.annotations.JinjavaDoc;
77
import com.hubspot.jinjava.doc.annotations.JinjavaParam;
88
import com.hubspot.jinjava.doc.annotations.JinjavaSnippet;
9+
import com.hubspot.jinjava.doc.annotations.JinjavaTextMateSnippet;
910
import com.hubspot.jinjava.interpret.Context;
1011
import com.hubspot.jinjava.interpret.DeferredValue;
1112
import com.hubspot.jinjava.interpret.DeferredValueException;
@@ -55,6 +56,7 @@
5556
)
5657
}
5758
)
59+
@JinjavaTextMateSnippet(code = "{% from '${1:path}' import ${2:macro_name} %}")
5860
public class FromTag implements Tag {
5961
public static final String TAG_NAME = "from";
6062

‎src/main/java/com/hubspot/jinjava/lib/tag/ImportTag.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import com.hubspot.jinjava.doc.annotations.JinjavaDoc;
55
import com.hubspot.jinjava.doc.annotations.JinjavaParam;
66
import com.hubspot.jinjava.doc.annotations.JinjavaSnippet;
7+
import com.hubspot.jinjava.doc.annotations.JinjavaTextMateSnippet;
78
import com.hubspot.jinjava.interpret.Context;
89
import com.hubspot.jinjava.interpret.DeferredValue;
910
import com.hubspot.jinjava.interpret.DeferredValueException;
@@ -61,6 +62,7 @@
6162
)
6263
}
6364
)
65+
@JinjavaTextMateSnippet(code = "{% import '${1:path}' ${2: as ${3:import_name}} %}")
6466
public class ImportTag implements Tag {
6567
public static final String TAG_NAME = "import";
6668

0 commit comments

Comments
 (0)