formatting and tweaks

Author: Aerijo

lib/snippet-body.pegjs

@@ -11,99 +11,99 @@ innerBodyContent = content:(tabstop / choice / variable / nonCloseBraceText)* {
 tabstop = simpleTabstop / tabstopWithoutPlaceholder / tabstopWithPlaceholder / tabstopWithTransform
 
 simpleTabstop = '$' index:int {
-	return { index: makeInteger(index), content: [] }
+  return { index: makeInteger(index), content: [] }
 }
 
 tabstopWithoutPlaceholder = '${' index:int '}' {
-	return { index: makeInteger(index), content: [] }
+  return { index: makeInteger(index), content: [] }
 }
 
 tabstopWithPlaceholder = '${' index:int ':' content:innerBodyContent '}' {
-	return { index: makeInteger(index), content: content }
+  return { index: makeInteger(index), content: content }
 }
 
 tabstopWithTransform = '${' index:int substitution:transform '}' {
-	return {
-    	index: makeInteger(index),
-        content: [],
-        substitution: substitution
-    }
+  return {
+    index: makeInteger(index),
+    content: [],
+    substitution: substitution
+  }
 }
 
 choice = '${' index:int '|' choice:choicecontents '|}' {
-	return { index: makeInteger(index), choice: choice }
+  return { index: makeInteger(index), choice: choice }
 }
 
 choicecontents = elem:choicetext rest:(',' val:choicetext { return val } )* {
-	return [elem, ...rest]
+  return [elem, ...rest]
 }
 
 choicetext = choicetext:(choiceEscaped / [^|,] / barred:('|' &[^}]) { return barred.join('') } )+ {
-	return choicetext.join('')
+  return choicetext.join('')
 }
 
 // Transform is applied when tabbed off
 transform = '/' regex:regex '/' replace:replace '/' flags:flags {
-    return { regex: regex, format: replace, flags: flags }
+  return { regex: regex, format: replace, flags: flags }
 }
 
 regex = regex:(escaped / [^/])* {
-	return new RegExp(regex.join(''))
+  return new RegExp(regex.join(''))
 }
 
 replace = (format / replacetext)*
 
-// TODO: Format with conditionals on match
+// TODO: Support conditionals
 format = simpleFormat / formatWithoutPlaceholder / formatWithCaseTransform
 
 simpleFormat = '$' index:int {
-	return { index: makeInteger(index) }
+  return { index: makeInteger(index) }
 }
 
 formatWithoutPlaceholder = '${' index:int '}' {
-	return { index: makeInteger(index) }
+  return { index: makeInteger(index) }
 }
 
 formatWithCaseTransform = '${' index:int ':' casetransform:casetransform '}' {
-	return { index: makeInteger(index), transform: casetransform }
+  return { index: makeInteger(index), transform: casetransform }
 }
 
 casetransform = '/' type:[a-zA-Z]* {
-	type = type.join('')
-	switch (type) {
-    	case 'upcase':
+  type = type.join('')
+  switch (type) {
+      case 'upcase':
       case 'downcase':
       case 'capitalize':
-      	return type
+        return type
       default:
-      	return 'none'
+        return 'none'
     }
 }
 
 replacetext = replacetext:(escaped / !format char:[^/] { return char })+ {
-	return replacetext.join('')
+  return replacetext.join('')
 }
 
 variable = simpleVariable / variableWithoutPlaceholder / variableWithPlaceholder / variableWithTransform
 
 simpleVariable = '$' name:variableName {
-	return { variable: name }
+  return { variable: name }
 }
 
 variableWithoutPlaceholder = '${' name:variableName '}' {
-	return { variable: name  }
+  return { variable: name  }
 }
 
 variableWithPlaceholder = '${' name:variableName ':' content:innerBodyContent '}' {
     return { variable: name, content: content }
 }
 
 variableWithTransform = '${' name:variableName substitution:transform '}' {
-	return { variable: name, substitution: substitution }
+  return { variable: name, substitution: substitution }
 }
 
 variableName = first:[a-zA-Z_] rest:[a-zA-Z_0-9]* {
-	return first + rest.join('')
+  return first + rest.join('')
 }
 
 int = [0-9]+
@@ -112,7 +112,7 @@ escaped = '\\' char:. {
   switch (char) {
     case '$':
     case '\\':
-    case '\x7D':
+    case '\x7D': // back brace; PEGjs would treat it as the JS scope end though
       return char
     default:
       return '\\' + char
@@ -132,13 +132,13 @@ choiceEscaped = '\\' char:. {
   }
 }
 
-token = escaped / !tabstop !tabstopWithPlaceholder !variable !choice  char:. { return char }
-
 flags = flags:[a-z]* {
-	return flags.join('') + 'g'
+  return flags.join('') + 'g'
 }
 
-text = text:token+ { return text.join('') }
+text = text:(escaped / !tabstop !tabstopWithPlaceholder !variable !choice  char:. { return char })+ {
+  return text.join('')
+}
 
 nonCloseBraceText = text:(escaped / !tabstop !tabstopWithPlaceholder !variable !choice char:[^}] { return char })+ {
     return text.join('')