Merge branch 'stable' into next

sass · Jun 16, 2017 · d7d4949 · d7d4949
2 parents ec18762 + 2e20c35
commit d7d4949
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/doc-src/SASS_CHANGELOG.md b/doc-src/SASS_CHANGELOG.md
@@ -75,6 +75,8 @@
 
 ## 3.4.25 (Unreleased)
 
+* Fix a bug where `*` wouldn't always be eliminated during selector unification.
+
 ### Deprecations -- Must Read!
 
 * Extending compound selectors such as `.a.b` is deprecated. This never followed

diff --git a/lib/sass/selector/simple.rb b/lib/sass/selector/simple.rb
@@ -80,6 +80,7 @@ def eql?(other)
       #   by the time extension and unification happen,
       #   this exception will only ever be raised as a result of programmer error
       def unify(sels)
+        return sels.first.unify([self]) if sels.length == 1 && sels.first.is_a?(Universal)
         return sels if sels.any? {|sel2| eql?(sel2)}
         if !is_a?(Pseudo) || (sels.last.is_a?(Pseudo) && sels.last.type == :element)
           _, i = sels.each_with_index.find {|sel, _| sel.is_a?(Pseudo)}