handle set/insert code blocks

Author: ShMcK

parser/index.pegjs

@@ -120,7 +120,6 @@ page_title
   = '##'
     space?
     title: content
-    break?
   { return adjust(title); }
 
 /*** "pegjs/task.pegjs" ***/
@@ -228,14 +227,13 @@ action_open
 
 action_insert
   = 'insert'
-    content: between_brackets
-	{ return `insert(${content})`; }
+    content: ( between_code_block / between_brackets )
+	{ return `insert(\"${content}\")`; }
 
 action_set
   = 'set'
-    content: between_brackets
-	// second: (between_code_block space? ')' space? )
-	{ return `set(${content})`; }
+    content: ( between_code_block / between_brackets )
+	{ return `set(\"${content}\")`; }
 
 action_write
   = 'write'
@@ -292,12 +290,16 @@ between_brackets
   = '('
     content: [^\)]+
     ')'
-  { return adjust(content); }
+  { return trimQuotes(adjust(content)); }
 
 between_code_block
-  = code_block
+  = '('
     break?
-    content: [^\`]+
     code_block
+    break?
+    content: ( [^\`]+ / '`' [^\`]+ )+
+    code_block
+    break?
+    ')'
   { return adjust(content); }
 

parser/pegjs/characters.pegjs

@@ -24,11 +24,15 @@ between_brackets
   = '('
     content: [^\)]+
     ')'
-  { return adjust(content); }
+  { return trimQuotes(adjust(content)); }
 
 between_code_block
-  = code_block
+  = '('
+    break?
+    code_block
     break?
-    content: [^\`]+
+    content: ( [^\`]+ / '`' [^\`]+ )+
     code_block
+    break?
+    ')'
   { return adjust(content); }

parser/pegjs/page.pegjs

@@ -25,5 +25,4 @@ page_title
   = '##'
     space?
     title: content
-    break?
   { return adjust(title); }

parser/pegjs/task-actions.pegjs

@@ -28,14 +28,13 @@ action_open
 
 action_insert
   = 'insert'
-    content: between_brackets
-	{ return `insert(${content})`; }
+    content: ( between_code_block / between_brackets )
+	{ return `insert(\"${content}\")`; }
 
 action_set
   = 'set'
-    content: between_brackets
-	// second: (between_code_block space? ')' space? )
-	{ return `set(${content})`; }
+    content: ( between_code_block / between_brackets )
+	{ return `set(\"${content}\")`; }
 
 action_write
   = 'write'

test/actions/insert.js

@@ -0,0 +1,23 @@
+import test from 'ava';
+const parse = require('../_parser');
+const start = require('./_setup');
+
+test('parses an action: insert (single-line)', t => {
+  const data = `${start}@action(insert('var a = 42;'))
+`;
+  const expected = ["insert(\"var a = 42;\")"];
+  const result = parse(data);
+  t.deepEqual(result.pages[0].tasks[0].actions, expected);
+});
+
+test('parses an action: insert (multi-line, ```)', t => {
+  const data = `${start}@action(insert(\`\`\`
+var a = 42;
+var b = 43;
+\`\`\`
+))
+`;
+  const expected = ["insert(\"var a = 42;\nvar b = 43;\")"];
+  const result = parse(data);
+  t.deepEqual(result.pages[0].tasks[0].actions, expected);
+});

test/actions/set.js

@@ -5,19 +5,19 @@ const start = require('./_setup');
 test('parses an action: set (single-line)', t => {
   const data = `${start}@action(set('var a = 42;'))
 `;
-  const expected = ["set(\'var a = 42;\')"];
+  const expected = ["set(\"var a = 42;\")"];
   const result = parse(data);
   t.deepEqual(result.pages[0].tasks[0].actions, expected);
 });
 
-test.skip('parses an action: set (multi-line, ```)', t => {
-  const data = `${start}@action(set(```
+test('parses an action: set (multi-line, ```)', t => {
+  const data = `${start}@action(set(\`\`\`
 var a = 42;
 var b = 43;
-```
+\`\`\`
 ))
 `;
-  const expected = ["set(\'var a = 42;\nvar b = 43;\')"];
+  const expected = ["set(\"var a = 42;\nvar b = 43;\")"];
   const result = parse(data);
   t.deepEqual(result.pages[0].tasks[0].actions, expected);
 });