haml-edge 2.3.217 → 2.3.218

data/EDGE_GEM_VERSION

@@ -1 +1 @@
-2.3.217
+2.3.218

data/VERSION

@@ -1 +1 @@
-2.3.217
+2.3.218

data/lib/sass/selector/simple.rb

@@ -75,10 +75,15 @@ module Sass
       #   this exception will only ever be raised as a result of programmer error
       def unify(sels)
         return sels if sels.any? {|sel2| eql?(sel2)}
-        if sels.last.is_a?(Pseudo) && sels.last.type == :element
-          return sels[0...-1] + [self, sels.last]
-        end
-        sels + [self]
+        sels_with_ix = Haml::Util.enum_with_index(sels)
+        _, i =
+          if self.is_a?(Pseudo) || self.is_a?(Negation)
+            sels_with_ix.find {|sel, _| sel.is_a?(Pseudo) && sels.last.type == :element}
+          else
+            sels_with_ix.find {|sel, _| sel.is_a?(Pseudo) || sel.is_a?(Negation)}
+          end
+        return sels + [self] unless i
+        return sels[0...i] + [self] + sels[i..-1]
       end
 
       protected

data/test/sass/extend_test.rb

@@ -770,6 +770,70 @@ a.foo::bar {a: b}
 SCSS
   end
 
+  def test_pseudoclass_remains_at_end_of_selector
+    assert_equal <<CSS, render(<<SCSS)
+.foo:bar, .baz:bar {
+  a: b; }
+CSS
+.foo:bar {a: b}
+.baz {@extend .foo}
+SCSS
+
+    assert_equal <<CSS, render(<<SCSS)
+a.foo:bar, a.baz:bar {
+  a: b; }
+CSS
+a.foo:bar {a: b}
+.baz {@extend .foo}
+SCSS
+  end
+
+  def test_not_remains_at_end_of_selector
+    assert_equal <<CSS, render(<<SCSS)
+.foo:not(.bar), .baz:not(.bar) {
+  a: b; }
+CSS
+.foo:not(.bar) {a: b}
+.baz {@extend .foo}
+SCSS
+  end
+
+  def test_pseudoelement_goes_lefter_than_pseudoclass
+    assert_equal <<CSS, render(<<SCSS)
+.foo::bar, .baz:bang::bar {
+  a: b; }
+CSS
+.foo::bar {a: b}
+.baz:bang {@extend .foo}
+SCSS
+
+    assert_equal <<CSS, render(<<SCSS)
+.foo:bar, .baz:bar::bang {
+  a: b; }
+CSS
+.foo:bar {a: b}
+.baz::bang {@extend .foo}
+SCSS
+  end
+
+  def test_pseudoelement_goes_lefter_than_not
+    assert_equal <<CSS, render(<<SCSS)
+.foo::bar, .baz:not(.bang)::bar {
+  a: b; }
+CSS
+.foo::bar {a: b}
+.baz:not(.bang) {@extend .foo}
+SCSS
+
+    assert_equal <<CSS, render(<<SCSS)
+.foo:not(.bang), .baz:not(.bang)::bar {
+  a: b; }
+CSS
+.foo:not(.bang) {a: b}
+.baz::bar {@extend .foo}
+SCSS
+  end
+
   def test_negation_unification
     assert_equal <<CSS, render(<<SCSS)
 :not(.foo).baz, :not(.foo):not(.bar) {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: haml-edge
 version: !ruby/object:Gem::Version 
-  version: 2.3.217
+  version: 2.3.218
 platform: ruby
 authors: 
 - Nathan Weizenbaum