Merge pull request #2423 from sparklemotion/backport-2419-css-at-attr…

…ibute-syntax Backport #2422: fix: regression with XPath attributes in CSS selectors branch created by cherry-picking 3240a07..538e11d
sparklemotion · Jan 13, 2022 · a770d97 · a770d97
2 parents 9a705f4 + fd252a2
commit a770d97
Show file tree

Hide file tree

Showing 11 changed files with 1,098 additions and 960 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,7 +8,8 @@ Nokogiri follows [Semantic Versioning](https://semver.org/), please see the [REA
 
 ### Fixed
 
-* Fix `Nokogiri::XSLT.quote_params` regression in v1.13.0 which raised an exception when non-string stylesheet parameters were passed. Non-string parameters (e.g., integers and symbols) are now explicitly supported and both keys and values will be stringified with `#to_s`. [[#2418](https://github.com/sparklemotion/nokogiri/issues/2418)]
+* Fix `Nokogiri::XSLT.quote_params` regression in v1.13.0 that raised an exception when non-string stylesheet parameters were passed. Non-string parameters (e.g., integers and symbols) are now explicitly supported and both keys and values will be stringified with `#to_s`. [[#2418](https://github.com/sparklemotion/nokogiri/issues/2418)]
+* Fix CSS selector query regression in v1.13.0 that raised an `Nokogiri::XML::XPath::SyntaxError` when parsing XPath attributes mixed into the CSS query. Although this mash-up of XPath and CSS syntax previously worked unintentionally, it is now an officially supported feature and is documented as such. [[#2419](https://github.com/sparklemotion/nokogiri/issues/2419)]
 
 
 ## 1.13.0 / 2022-01-06

diff --git a/lib/nokogiri/css/parser.rb b/lib/nokogiri/css/parser.rb