fix: Sort dotted tables (#164)

toml-rs · Sep 3, 2021 · 37b55b7 · 37b55b7
1 parent e00fc9e
commit 37b55b7
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 16 deletions.
diff --git a/src/inline_table.rs b/src/inline_table.rs
@@ -2,7 +2,7 @@ use std::iter::FromIterator;
 
 use crate::key::Key;
 use crate::repr::{Decor, InternalString};
-use crate::table::{sort_key_value_pairs, Iter, KeyValuePairs, TableKeyValue, TableLike};
+use crate::table::{Iter, KeyValuePairs, TableKeyValue, TableLike};
 use crate::value::{DEFAULT_TRAILING_VALUE_DECOR, DEFAULT_VALUE_DECOR};
 use crate::{Item, Value};
 
@@ -212,8 +212,24 @@ impl InlineTable {
     }
 
     /// Sorts the key/value pairs by key.
-    pub fn sort(&mut self) {
-        sort_key_value_pairs(&mut self.items);
+    pub fn sort_values(&mut self) {
+        let mut keys: Vec<InternalString> = self
+            .items
+            .iter_mut()
+            .filter_map(|(key, kv)| match &mut kv.value {
+                Item::Value(Value::InlineTable(table)) if table.is_dotted() => {
+                    table.sort_values();
+                    Some(key)
+                }
+                Item::Value(_) => Some(key),
+                _ => None,
+            })
+            .cloned()
+            .collect();
+        keys.sort();
+        for key in keys {
+            self.items.get_refresh(&key);
+        }
     }
 
     /// Auto formats the table.

diff --git a/src/table.rs b/src/table.rs
@@ -251,7 +251,23 @@ impl Table {
     ///
     /// Doesn't affect subtables or subarrays.
     pub fn sort_values(&mut self) {
-        sort_key_value_pairs(&mut self.items);
+        let mut keys: Vec<InternalString> = self
+            .items
+            .iter_mut()
+            .filter_map(|(key, kv)| match &mut kv.value {
+                Item::Table(table) if table.is_dotted() => {
+                    table.sort_values();
+                    Some(key)
+                }
+                Item::Value(_) => Some(key),
+                _ => None,
+            })
+            .cloned()
+            .collect();
+        keys.sort();
+        for key in keys {
+            self.items.get_refresh(&key);
+        }
     }
 
     /// Auto formats the table.
@@ -323,18 +339,6 @@ impl<'s> IntoIterator for &'s Table {
 
 pub(crate) type KeyValuePairs = LinkedHashMap<InternalString, TableKeyValue>;
 
-pub(crate) fn sort_key_value_pairs(items: &mut LinkedHashMap<InternalString, TableKeyValue>) {
-    let mut keys: Vec<InternalString> = items
-        .iter()
-        .filter_map(|i| (i.1).value.as_value().map(|_| i.0))
-        .cloned()
-        .collect();
-    keys.sort();
-    for key in keys {
-        items.get_refresh(&key);
-    }
-}
-
 fn decorate_table(table: &mut Table) {
     for (key_decor, value) in table
         .items