Changeset 57264 for trunk/src/wp-includes/html-api/class-wp-html-open-elements.php

Timestamp:

01/10/2024 02:03:57 PM (8 months ago)

Author:

dmsnell

Message:

HTML API: Add support for list elements.

Adds support for the following HTML elements to the HTML Processor:

• LI, OL, UL.
• DD, DL, DT.

Previously, these elements were not supported and the HTML Processor would bail when encountering them.
With this patch it will proceed to parse an HTML document when encountering those tags as long as other normal conditions don't cause it to bail (such as complicated format reconstruction).

Props audrasjb, jonsurrell, bernhard-reiter.
Fixes #60215.

File:

• trunk/src/wp-includes/html-api/class-wp-html-open-elements.php (modified) (4 diffs)

trunk/src/wp-includes/html-api/class-wp-html-open-elements.php

@@ -130 +130 @@
 
             if ( in_array( $node->node_name, $termination_list, true ) ) {
-                return true;
+                return false;
             }
         }
@@ -167 +167 @@
      *
      * @since 6.4.0
+     * @since 6.5.0 Implemented: no longer throws on every invocation.
      *
      * @see https://html.spec.whatwg.org/#has-an-element-in-list-item-scope
-     *
-     * @throws WP_HTML_Unsupported_Exception Always until this function is implemented.
      *
      * @param string $tag_name Name of tag to check.
@@ -176 +175 @@
      */
     public function has_element_in_list_item_scope( $tag_name ) {
-        throw new WP_HTML_Unsupported_Exception( 'Cannot process elements depending on list item scope.' );
-
-        return false; // The linter requires this unreachable code until the function is implemented and can return.
+        return $this->has_element_in_specific_scope(
+            $tag_name,
+            array(
+                // There are more elements that belong here which aren't currently supported.
+                'OL',
+                'UL',
+            )
+        );
     }
 
@@ -376 +380 @@
      *
      * @since 6.4.0
-     */
-    public function walk_up() {
+     * @since 6.5.0 Accepts $above_this_node to start traversal above a given node, if it exists.
+     *
+     * @param ?WP_HTML_Token $above_this_node Start traversing above this node, if provided and if the node exists.
+     */
+    public function walk_up( $above_this_node = null ) {
+        $has_found_node = null === $above_this_node;
+
         for ( $i = count( $this->stack ) - 1; $i >= 0; $i-- ) {
-            yield $this->stack[ $i ];
+            $node = $this->stack[ $i ];
+
+            if ( ! $has_found_node ) {
+                $has_found_node = $node === $above_this_node;
+                continue;
+            }
+
+            yield $node;
         }
     }