Merge pull request #22 from adamzapasnik/fix-form-fors

Fix formatting of regular form_for expressions
adamzapasnik · Feb 24, 2021 · c9d6d50 · c9d6d50
2 parents 3d1026a + ac98e9a
commit c9d6d50
Show file tree

Hide file tree

Showing 6 changed files with 58 additions and 3 deletions.
diff --git a/lib/liveview.js b/lib/liveview.js
@@ -3,8 +3,10 @@ const liveViewFormForPlaceholder = '<form>';
 const encodeFormForExpressions = (text) => {
   const liveViewFormExpressions = [];
   const textWithPlaceholders = text.replace(/(<%=?[^%>]*=\s+form_for[\s\S]*?%>|<form>)/gm, (match) => {
+    if (match.match(/->\s*%>$/gm)) {
+      return match;
+    }
     liveViewFormExpressions.push(match);
-
     return liveViewFormForPlaceholder;
   });
 

diff --git a/lib/parser.js b/lib/parser.js
@@ -3,7 +3,12 @@ const expressionTypeMatcher = require('./expression_type_matcher');
 const { encodeFormForExpressions } = require('./liveview');
 
 function parse(text, parsers, options) {
-  const { liveViewFormExpressions, textWithPlaceholders } = encodeFormForExpressions(text);
+  let liveViewFormExpressions = [];
+  let textWithPlaceholders = text;
+
+  if (options.filepath.endsWith('.leex') && text.includes('</form>')) {
+    ({ liveViewFormExpressions, textWithPlaceholders } = encodeFormForExpressions(text));
+  }
 
   return {
     tokens: tokenizeHTML(textWithPlaceholders, /<%[\s\S]*?%>/gm, expressionTypeMatcher),

diff --git a/lib/printers.js b/lib/printers.js
@@ -22,7 +22,7 @@ function embed(path, _print, textToDoc, options) {
   const callback = decodeExpressions(expressionMap);
   return mapDoc(htmlDoc, (doc) => {
     let newDoc = doc;
-    if (doc === liveViewFormForPlaceholder) {
+    if (doc === liveViewFormForPlaceholder && liveViewFormExpressions.length) {
       newDoc = liveViewFormExpressions.shift();
     }
 

diff --git a/tests/expressions/__snapshots__/jsfmt.spec.js.snap b/tests/expressions/__snapshots__/jsfmt.spec.js.snap
@@ -1,5 +1,33 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`form_for.html.eex 1`] = `
+====================================options=====================================
+parsers: ["eex"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+<div>
+  <%= f = form_for a, fn -> %>
+     <%= text_input f, :name %>
+  <% end %>
+  <div>
+     <form></form>
+  </div>
+</div>
+
+=====================================output=====================================
+<div>
+  <%= f = form_for a, fn -> %>
+    <%= text_input f, :name %>
+  <% end %>
+  <div>
+    <form></form>
+  </div>
+</div>
+
+================================================================================
+`;
+
 exports[`liveview_form_for.html.leex 1`] = `
 ====================================options=====================================
 parsers: ["eex"]
@@ -23,6 +51,10 @@ printWidth: 80
       </form>
     </div>
   </div>
+
+    <%= f = form_for a, fn -> %>
+     <%= text_input f, :name %>
+  <% end %>
 </div>
 
 =====================================output=====================================
@@ -43,6 +75,10 @@ printWidth: 80
       </form>
     </div>
   </div>
+
+  <%= f = form_for a, fn -> %>
+    <%= text_input f, :name %>
+  <% end %>
 </div>
 
 ================================================================================

diff --git a/tests/expressions/form_for.html.eex b/tests/expressions/form_for.html.eex
@@ -0,0 +1,8 @@
+<div>
+  <%= f = form_for a, fn -> %>
+     <%= text_input f, :name %>
+  <% end %>
+  <div>
+     <form></form>
+  </div>
+</div>
diff --git a/tests/expressions/liveview_form_for.html.leex b/tests/expressions/liveview_form_for.html.leex
@@ -15,4 +15,8 @@
       </form>
     </div>
   </div>
+
+    <%= f = form_for a, fn -> %>
+     <%= text_input f, :name %>
+  <% end %>
 </div>