[nongnu] elpa/web-mode 09e81e3353 1/4: fix issue with block between tag attrs

[ELPA Syncer]

branch: elpa/web-mode
commit 09e81e33531fe13fd5715dad2d12253a63624b26
Author: fxbois <fxbois@gmail.com>
Commit: fxbois <fxbois@gmail.com>

    fix issue with block between tag attrs
---
 issues/1215.heex | 36 +++++++++++++++++++++++++++++++++++-
 issues/test.html |  3 ---
 issues/test.psp  | 11 +++--------
 web-mode.el      | 11 +++++++----
 4 files changed, 45 insertions(+), 16 deletions(-)

diff --git a/issues/1215.heex b/issues/1215.heex
index 2a38936027..20f837c7b5 100644
--- a/issues/1215.heex
+++ b/issues/1215.heex
@@ -1 +1,35 @@
-<.some_component> , </.some_component>
+<.two_column>
+<:title>
+Pipelines
+</:title>
+<:left_content>
+<.card_with_title>
+<:title>
+Listing Pipelines
+</:title>
+<:content>
+<.pipelines_table pipelines={@pipelines} />
+</:content>
+</.card_with_title>
+</:left_content>
+<:right_content>
+<.card_with_title>
+<:title>
+Filters
+</:title>
+<:content>
+<.form let={f} for={@filters_changeset} phx-change="filter-pipelines">
+<.input_label label="Client Name">
+<.text_input form={f} name={:client_name} />
+</.input_label>
+<.input_label label="Pipeline Type">
+<.text input form={f} name={:pipeline_type} />
+</.input_label>
+</.form>
+</:content>
+</.card_with_title>
+</:right_content>
+</.two_column>
+<div>
+  <span>ok</span>
+</div>
diff --git a/issues/test.html b/issues/test.html
deleted file mode 100644
index 14f94e268d..0000000000
--- a/issues/test.html
+++ /dev/null
@@ -1,3 +0,0 @@
-toto <span>
-  toto
-</span> coucou
diff --git a/issues/test.psp b/issues/test.psp
index c2b437a34f..bbadff9bce 100644
--- a/issues/test.psp
+++ b/issues/test.psp
@@ -1,8 +1,3 @@
-<div>
-  <?php
-
-  foreach ($vars as $var)
-    echo 'toto';
-
-  ?>
-</div>
+<ul>
+  <img id="1" <?=$titi?> class="2" />
+</ul>
diff --git a/web-mode.el b/web-mode.el
index c393e357e0..8f2f093d91 100644
--- a/web-mode.el
+++ b/web-mode.el
@@ -2,7 +2,7 @@
 
 ;; Copyright 2011-2023 François-Xavier Bois
 
-;; Version: 17.3.9
+;; Version: 17.3.10
 ;; Author: François-Xavier Bois
 ;; Maintainer: François-Xavier Bois <fxbois@gmail.com>
 ;; Package-Requires: ((emacs "23.1"))
@@ -23,7 +23,7 @@
 
 ;;---- CONSTS 
------------------------------------------------------------------
 
-(defconst web-mode-version "17.3.9"
+(defconst web-mode-version "17.3.10"
   "Web Mode version.")
 
 ;;---- GROUPS 
------------------------------------------------------------------
@@ -1594,7 +1594,7 @@ shouldn't be moved back.)")
       "STR_PAD_LEFT" "STR_PAD_RIGHT"
       "ENT_COMPAT" "ENT_QUOTES" "ENT_NOQUOTES" "ENT_IGNORE"
       "ENT_SUBSTITUTE" "ENT_DISALLOWED" "ENT_HTML401" "ENT_XML1"
-      "ENT_XHTML" "ENT_HTML5" "JSON_PRETTY_PRINT"
+      "ENT_XHTML" "ENT_HTML5" "JSON_PRETTY_PRINT" "JSON_UNESCAPED_SLASHES"
       "LIBXML_NOBLANKS"))))
 
 (defvar web-mode-php-keywords
@@ -5638,6 +5638,9 @@ Also return non-nil if it is the command 
`self-insert-command' is remapped to."
          (setq attrs (+ attrs (web-mode-attr-scan pos state char name-beg 
name-end val-beg attr-flags equal-offset tag-flags)))
          )
 
+        ((and (or (= state 0) (= state 1)) (get-text-property pos 'block-side))
+         )
+
         ((or (and (= state 8) (not (member char '(?\" ?\\))))
              (and (= state 7) (not (member char '(?\' ?\\))))
              (and (= state 9) (not (member char '(?} ?\\))))
@@ -5829,7 +5832,7 @@ Also return non-nil if it is the command 
`self-insert-command' is remapped to."
 
         ) ;cond
 
-      ;;(message "point(%S) end(%S) state(%S) c(%S) name-beg(%S) name-end(%S) 
val-beg(%S) attr-flags(%S) equal-offset(%S)" pos end state char name-beg 
name-end val-beg attr-flags equal-offset tag-flags)
+      ;;(message "point(%S) state(%S) c(%S) name-beg(%S) name-end(%S) 
val-beg(%S) attr-flags(%S) equal-offset(%S)" pos state char name-beg name-end 
val-beg attr-flags equal-offset tag-flags)
 
       (when (and quoted (>= quoted 2))
         (setq quoted nil))