tweaks

Author: Aerijo

lib/snippet-body.pegjs

@@ -25,32 +25,51 @@ regex ::= JS regex value
 
 options ::= JS regex options // NOTE: Unrecognised options should be ignored for the best fault tolerance (can log a warning though)
 
+modifier = '/' var
+
 var ::= [a-zA-Z_][a-zA-Z_0-9]*
 
 int ::= [0-9]+
 
 */
 
+{
+  function coalesce (parts) {
+    const result = [];
+    for (let i = 0; i < parts.length; i++) {
+      const part = parts[i];
+      const ri = result.length - 1;
+      if (typeof part === 'string' && typeof result[ri] === 'string') {
+        result[ri] = result[ri] + part;
+      } else {
+        result.push(part);
+      }
+    }
+    return result;
+  }
+}
+
 // Grab anything that isn't \ or $, then try to build a special node out of it, and (at the top level) if that fails then just accept it as text
-topLevelContent = content:(text / escapedTopLevel / tabStop / choice / variable / any)* { return content; }
+topLevelContent = content:(text / escapedTopLevel / tabStop / choice / variable / any)* { return coalesce(content); }
 
-tabStopContent = content:(text / escapedTabStop / tabStop / choice / variable)* { return content; }
+tabStopContent = content:(tabStopText / escapedTabStop / tabStop / choice / variable)* { return coalesce(content); }
 
 tabStop = tabStopSimple / tabStopWithoutPlaceholder / tabStopWithPlaceholder / tabStopWithTransform
 
-tabStopSimple = '$' n:integer { return { index: n }; }
+tabStopSimple = '$' n:integer { return { index: n, content: [] }; }
 
-tabStopWithoutPlaceholder = '${' n:integer '}' { return { index: n }; }
+tabStopWithoutPlaceholder = '${' n:integer '}' { return { index: n, content: [] }; }
 
 tabStopWithPlaceholder = '${' n:integer ':' content:tabStopContent '}' { return { index: n, content }; }
 
 tabStopWithTransform = '${' n:integer t:transformation '}' { return { index: n, transformation: t }; }
 
 transformation = '/' capture:regexString '/' replace:replace '/' flags:flags { return { capture, flags, replace }; }
 
-regexString = r:[^/]* { return r.join(""); }
+// TODO: enforce this is a valid regex, or fail (can do at transform level where we make regex though)
+regexString = r:([^/\\] / '\\' c:. { return '\\' + c } )* { return r.join(""); }
 
-replace = (format / replaceText)*
+replace = (format / replaceText / replaceModifier / escapedReplace)*
 
 format = formatSimple / formatPlain / formatWithModifier / formatWithIf / formatWithIfElse / formatWithElse
 
@@ -82,7 +101,9 @@ variableWithPlaceholder = '${' v:var ':' content:tabStopContent '}' { return { v
 
 variableWithTransform = '${' v:var t:transformation '}' { return { variable: v, transformation: t }; }
 
-text = t:[^$\\}]+ { return t.join("") }
+text = t:([^$\\}])+ { return t.join("") }
+
+tabStopText = text
 
 choiceText = t:[^,|]+ { return t.join(""); }
 
@@ -95,6 +116,10 @@ escapedTabStop = escapedTopLevel
 
 escapedChoice = '\\' c:[$\\,|] { return c; }
 
+replaceModifier = '\\' m:[uUlL] { return { modifier: m }; }
+
+escapedReplace = '\\' c:[$\\] { return c; }
+
 // Match nonnegative integers like those used for tab stop ordering
 integer = digits:[0-9]+ { return parseInt(digits.join(""), 10); }
 

lib/snippets.js

@@ -45,6 +45,10 @@ module.exports = {
        this.handleDisabledPackagesDidChange(newValue, oldValue)
     }))
 
+    this.subscriptions.add(atom.config.observe('snippets.snippetSyntax', ({newValue, oldValue}) => {
+       this.handleSnippetSyntaxDidChange(newValue, oldValue)
+    }))
+
     const snippets = this
 
     this.subscriptions.add(atom.commands.add('atom-text-editor', {
@@ -439,6 +443,10 @@ module.exports = {
     return this.bodyParser
   },
 
+  handleSnippetSyntaxDidChange(oldValue, newValue) {
+    // TODO: Clear out all snippet parse trees && set the parser to the correct syntax
+  },
+
   // Get an {Object} with these keys:
   // * `snippetPrefix`: the possible snippet prefix text preceding the cursor
   // * `wordPrefix`: the word preceding the cursor

package.json

@@ -32,8 +32,8 @@
   },
   "configSchema": {
     "snippetSyntax": {
-      "type": "enum",
-      "description": "Configures the syntax used for snippets. LSP is mostly a superset of original, with support for more features.",
+      "type": "string",
+      "description": "Configures the syntax used for snippets. LSP is mostly a superset of original, with support for more features (but not all features may be implemented yet).",
       "default": "LSP",
       "enum": [
         "LSP",

spec/body-parser-spec.js

@@ -1,6 +1,10 @@
 const BodyParser = require('../lib/snippet-body-parser');
 
 describe("Snippet Body Parser", () => {
+  function t(snippetBody) {
+    return BodyParser.parse(snippetBody);
+  }
+
   it("breaks a snippet body into lines, with each line containing tab stops at the appropriate position", () => {
     const bodyTree = BodyParser.parse(`\
 the quick brown $1fox \${2:jumped \${3:over}

spec/parsing-todo.txt

@@ -0,0 +1,6 @@
+foo bar
+$1 ${1} ${1:/foo} ${1/foo/bar/baz}
+foo ${1 bar
+\\ \\\\ \\$ \\{ \\} \\, \\| \\: \\/ \\a \\n \\r
+${1:\\ \\\\ \\$ \\{ \\} \\, \\| \\: \\/ \\a \\n \\r}
+${1|\\ \\\\ \\$ \\{ \\} \\, \\| \\: \\/ \\a \\n \\r|}