Commit 581f6d3
committed
fix attrTokenRe splitting attributes with template actions containing quotes
The attrTokenRe regex used [^"]* for double-quoted attribute values, which stopped at the first quote inside a template action. For attributes like aria-sort="{{if eq .SortBy "check_in"}}...", the regex matched only up to the inner quote, splitting the attribute and corrupting formatted output.
Updated the regex to match {{...}} template actions atomically before individual characters, so inner quotes within actions are consumed as part of the action.
Also replaced the allOverflow wrapping bailout with a simpler len(attrs)<=1 check. The previous logic incorrectly abandoned wrapping when a long template-containing attribute was the last attr on a continuation line, even though wrapping still reduced the first line's width.1 parent 2db01e4 commit 581f6d3
4 files changed
Lines changed: 45 additions & 10 deletions
File tree
- .beans
- internal/template
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
25 | 25 | | |
26 | 26 | | |
27 | 27 | | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
28 | 34 | | |
29 | 35 | | |
30 | 36 | | |
| |||
72 | 78 | | |
73 | 79 | | |
74 | 80 | | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
75 | 87 | | |
76 | 88 | | |
77 | 89 | | |
Lines changed: 11 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
36 | 36 | | |
37 | 37 | | |
38 | 38 | | |
39 | | - | |
| 39 | + | |
40 | 40 | | |
41 | 41 | | |
42 | 42 | | |
| |||
325 | 325 | | |
326 | 326 | | |
327 | 327 | | |
328 | | - | |
329 | | - | |
330 | | - | |
331 | | - | |
332 | | - | |
333 | | - | |
334 | | - | |
335 | | - | |
336 | | - | |
| 328 | + | |
| 329 | + | |
| 330 | + | |
337 | 331 | | |
338 | 332 | | |
339 | 333 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
739 | 739 | | |
740 | 740 | | |
741 | 741 | | |
| 742 | + | |
| 743 | + | |
| 744 | + | |
| 745 | + | |
| 746 | + | |
| 747 | + | |
| 748 | + | |
| 749 | + | |
| 750 | + | |
| 751 | + | |
| 752 | + | |
| 753 | + | |
| 754 | + | |
| 755 | + | |
| 756 | + | |
| 757 | + | |
| 758 | + | |
| 759 | + | |
742 | 760 | | |
743 | 761 | | |
744 | 762 | | |
| |||
0 commit comments