Merge pull request #5 from doits/fix_block_braces

allow braces in block arguments

Author: Nilkee

src/parser.js

@@ -5,6 +5,8 @@ const PLACEHOLDER = {
   end: "~#",
 };
 
+const BLOCK_REGEX = /do(?: \|[\w_, ()]+\|)?$/;
+
 const placeholderGenerator = (text) => {
   let id = 0;
 
@@ -93,7 +95,7 @@ export const parse = (text) => {
         },
       };
 
-      const expressionIsBlock = expression.match(/do( \|[\w_, ]+\|)?$/) != null;
+      const expressionIsBlock = expression.match(BLOCK_REGEX) != null;
       if (expressionIsBlock) {
         // If a expression is opening a block, we'll treat that expression as a statement to
         // simplify the logic of blocks
@@ -129,7 +131,7 @@ export const parse = (text) => {
           const hasValidKeyword = ["if", "unless", "case"].includes(
             start.keyword,
           );
-          const hasBlock = start.content.match(/do( \|[\w_, ]+\|)?$/) != null;
+          const hasBlock = start.content.match(BLOCK_REGEX) != null;
           // If the statement is not matching, replace the content with the placeholder
           if (!hasValidKeyword && !hasBlock) {
             root.content = replaceAt(

test/cases/block_with_val_3/expected.html

@@ -0,0 +1,5 @@
+<ul>
+  <% @values.each.with_index do |(a, b), i| %>
+    <li><%= i %>: <%= a %> <%= b %></li>
+  <% end %>
+</ul>

test/cases/block_with_val_3/input.html

@@ -0,0 +1,5 @@
+<ul>
+<% @values.each.with_index do |(a, b), i| %>
+<li><%= i %>: <%= a %> <%= b %></li>
+<% end %>
+</ul>