use variable value instead of name if name is digits

denofevil · Jul 21, 2017 · cc315e6 · cc315e6
1 parent ccf127d
commit cc315e6
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/index.js b/index.js
@@ -34,17 +34,18 @@ function convertSnippet(snippet, context) {
 
   let body = snippet.body.join("\n");
   body = body.replace(/\\t/, '');
-  let replacement = (str, name, value) => {
+  let replacement = (str, match, name, value) => {
     const shortMatch = typeof value === "number";
+    name = !name.match(/\d*/) || shortMatch ? name : value;
     value = shortMatch ? undefined : value;
     const original = name;
     name = name === "0" ? "END" : name;
     name = name.replace("-", "_");
     vars[name] = value || (!shortMatch ? original : "");
     return "$" + name + "$";
   };
-  body = body.replace(/\$([_a-zA-Z0-9\-]+)/g, replacement);
-  body = body.replace(/\${([_a-zA-Z0-9\-]+(?:\s*:\s*([_a-zA-Z][_a-zA-Z0-9]*))?)}/g, replacement);
+  body = body.replace(/\$(([_a-zA-Z0-9\-]+))/g, replacement);
+  body = body.replace(/\${(([_a-zA-Z0-9\-]+)(?:\s*:\s*([_a-zA-Z0-9\-]+))?)}/g, replacement);
 
   let templateText = `
   <template name="${xmlEscape(snippet.prefix)}" value="${xmlEscape(body)}" description="${xmlEscape(snippet.description)}" toReformat="true" toShortenFQNames="true">`;