Use logical selectors in nest.

CHANGELOG.md

@@ -9,7 +9,11 @@ project adheres to
 
 ## Unreleased
 
-* (Oops: Removed a missing dbg call.)
+* Improve support for the `selector.nest` function (PR #189).
+* Some internal cleanup and improvements in the next-generation css
+  selector implementation (which is currently internal and used only
+  for selector functions, but should replace the old css selector
+  implementation in release 0.29).
 
 
 ## Release 0.28.8

rsass/src/css/mod.rs

@@ -23,5 +23,5 @@ pub use self::selectors::{BadSelector, Selector, SelectorPart, Selectors};
 pub use self::string::CssString;
 pub use self::value::{InvalidCss, Value, ValueMap, ValueToMapError};
 
-pub(crate) use self::selectors::{LogicalSelectorSet, SelectorCtx};
+pub(crate) use self::selectors::{CssSelectorSet, SelectorCtx};
 pub(crate) use self::util::{is_calc_name, is_function_name, is_not};

rsass/src/css/selectors.rs

@@ -14,8 +14,10 @@ use crate::value::ListSeparator;
 use std::fmt;
 use std::io::Write;
 
+mod cssselectorset;
 mod logical;
-pub(crate) use logical::SelectorSet as LogicalSelectorSet;
+pub(crate) use cssselectorset::CssSelectorSet;
+mod pseudo;
 
 /// A full set of selectors.
 #[derive(Clone, Debug, PartialEq, Eq, PartialOrd)]

rsass/src/css/selectors/cssselectorset.rs

@@ -0,0 +1,106 @@
+use crate::{css::Value, parser::input_span, Invalid};
+
+use super::{logical::SelectorSet, BadSelector};
+
+/// A CssSelectorset is like a [Selectorset] but valid in css.
+///
+/// The practical difference is that a CssSelectorset is guaranteed
+/// not to contain backrefs (`&`), which may be present in a
+/// Selectorset.
+pub struct CssSelectorSet {
+    pub(super) s: SelectorSet,
+}
+
+impl CssSelectorSet {
+    pub fn is_superselector(&self, sub: &CssSelectorSet) -> bool {
+        self.s.is_superselector(&sub.s)
+    }
+
+    pub(crate) fn nest(&self, other: SelectorSet) -> Self {
+        let mut parts = other
+            .s
+            .into_iter()
+            .map(|o| {
+                if o.has_backref() {
+                    o.resolve_ref(self)
+                } else {
+                    self.s.s.iter().map(|s| s.nest(&o)).collect()
+                }
+            })
+            .map(Vec::into_iter)
+            .collect::<Vec<_>>();
+
+        let mut result = Vec::new();
+        let mut empty = false;
+        while !empty {
+            empty = true;
+            for i in &mut parts {
+                if let Some(next) = i.next() {
+                    result.push(next);
+                    empty = false;
+                }
+            }
+        }
+
+        CssSelectorSet {
+            s: SelectorSet { s: result },
+        }
+    }
+
+    pub(crate) fn replace(
+        self,
+        original: &Self,
+        replacement: &Self,
+    ) -> Result<Self, Invalid> {
+        self.s
+            .replace(&original.s, &replacement.s)
+            .map(|s| CssSelectorSet { s })
+    }
+
+    pub(crate) fn unify(self, other: Self) -> Self {
+        CssSelectorSet {
+            s: SelectorSet {
+                s: self
+                    .s
+                    .s
+                    .into_iter()
+                    .flat_map(|s| {
+                        other
+                            .s
+                            .s
+                            .iter()
+                            .flat_map(move |o| s.clone().unify(o.clone()))
+                    })
+                    .collect(),
+            },
+        }
+    }
+}
+
+impl TryFrom<SelectorSet> for CssSelectorSet {
+    type Error = BadSelector;
+
+    fn try_from(value: SelectorSet) -> Result<Self, Self::Error> {
+        for s in &value.s {
+            if s.has_backref() {
+                let sel = s.clone().into_string_vec().join(" ");
+                return Err(BadSelector::Backref(input_span(sel)));
+            }
+        }
+        Ok(CssSelectorSet { s: value })
+    }
+}
+
+impl TryFrom<Value> for CssSelectorSet {
+    type Error = BadSelector;
+
+    fn try_from(value: Value) -> Result<Self, Self::Error> {
+        SelectorSet::try_from(value)?.try_into()
+    }
+}
+
+impl From<CssSelectorSet> for Value {
+    fn from(value: CssSelectorSet) -> Self {
+        value.s.into()
+    }
+}