Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

WP_HTML_Tag_Processor: Rename attribute_updates to lexical_updates #47053

Merged
merged 2 commits into from
Jan 16, 2023
Merged

WP_HTML_Tag_Processor: Rename attribute_updates to lexical_updates #47053

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4ea8fa6
WP_HTML_Tag_Processor: Rename attribute_updates to lexical_updates
ockham Jan 11, 2023
b24d6c7
Revert renames in method names and comments
ockham Jan 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions lib/experimental/html/class-wp-html-tag-processor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,7 +422,7 @@ class WP_HTML_Tag_Processor {
* @since 6.2.0
* @var WP_HTML_Text_Replacement[]
*/
private $attribute_updates = array();
private $lexical_updates = array();

/**
* Tracks how many times we've performed a `seek()`
Expand Down Expand Up @@ -1123,10 +1123,10 @@ private function after_tag() {
* @since 6.2.0
*
* @see $classname_updates
* @see $attribute_updates
* @see $lexical_updates
*/
private function class_name_updates_to_attributes_updates() {
if ( count( $this->classname_updates ) === 0 || isset( $this->attribute_updates['class'] ) ) {
if ( count( $this->classname_updates ) === 0 || isset( $this->lexical_updates['class'] ) ) {
$this->classname_updates = array();
return;
}
Expand Down Expand Up @@ -1247,7 +1247,7 @@ private function class_name_updates_to_attributes_updates() {
* @since 6.2.0
*/
private function apply_attributes_updates() {
if ( ! count( $this->attribute_updates ) ) {
if ( ! count( $this->lexical_updates ) ) {
return;
}

Expand All @@ -1261,25 +1261,25 @@ private function apply_attributes_updates() {
* out of order, which could otherwise lead to mangled output,
* partially-duplicate attributes, and overwritten attributes.
*/
usort( $this->attribute_updates, array( self::class, 'sort_start_ascending' ) );
usort( $this->lexical_updates, array( self::class, 'sort_start_ascending' ) );

foreach ( $this->attribute_updates as $diff ) {
foreach ( $this->lexical_updates as $diff ) {
$this->updated_html .= substr( $this->html, $this->updated_bytes, $diff->start - $this->updated_bytes );
$this->updated_html .= $diff->text;
$this->updated_bytes = $diff->end;
}

foreach ( $this->bookmarks as $bookmark ) {
/**
* As we loop through $this->attribute_updates, we keep comparing
* As we loop through $this->lexical_updates, we keep comparing
* $bookmark->start and $bookmark->end to $diff->start. We can't
* change it and still expect the correct result, so let's accumulate
* the deltas separately and apply them all at once after the loop.
*/
$head_delta = 0;
$tail_delta = 0;

foreach ( $this->attribute_updates as $diff ) {
foreach ( $this->lexical_updates as $diff ) {
$update_head = $bookmark->start >= $diff->start;
$update_tail = $bookmark->end >= $diff->start;

Expand All @@ -1302,7 +1302,7 @@ private function apply_attributes_updates() {
$bookmark->end += $tail_delta;
}

$this->attribute_updates = array();
$this->lexical_updates = array();
}

/**
Expand Down Expand Up @@ -1604,8 +1604,8 @@ public function set_attribute( $name, $value ) {
*
* Result: <div id="new"/>
*/
$existing_attribute = $this->attributes[ $comparable_name ];
$this->attribute_updates[ $name ] = new WP_HTML_Text_Replacement(
$existing_attribute = $this->attributes[ $comparable_name ];
$this->lexical_updates[ $name ] = new WP_HTML_Text_Replacement(
$existing_attribute->start,
$existing_attribute->end,
$updated_attribute
Expand All @@ -1622,7 +1622,7 @@ public function set_attribute( $name, $value ) {
*
* Result: <div id="new"/>
*/
$this->attribute_updates[ $comparable_name ] = new WP_HTML_Text_Replacement(
$this->lexical_updates[ $comparable_name ] = new WP_HTML_Text_Replacement(
$this->tag_name_starts_at + $this->tag_name_length,
$this->tag_name_starts_at + $this->tag_name_length,
' ' . $updated_attribute
Expand Down Expand Up @@ -1662,7 +1662,7 @@ public function remove_attribute( $name ) {
*
* Result: <div />
*/
$this->attribute_updates[ $name ] = new WP_HTML_Text_Replacement(
$this->lexical_updates[ $name ] = new WP_HTML_Text_Replacement(
$this->attributes[ $name ]->start,
$this->attributes[ $name ]->end,
''
Expand Down Expand Up @@ -1724,7 +1724,7 @@ public function __toString() {
*/
public function get_updated_html() {
// Short-circuit if there are no new updates to apply.
if ( ! count( $this->classname_updates ) && ! count( $this->attribute_updates ) ) {
if ( ! count( $this->classname_updates ) && ! count( $this->lexical_updates ) ) {
return $this->updated_html . substr( $this->html, $this->updated_bytes );
}

Expand Down