From 3c0cbec9933c710e05c9288c19b99a841306647d Mon Sep 17 00:00:00 2001
From: WindSoilder <WindSoilder@outlook.com>
Date: Tue, 14 Jun 2022 19:41:45 +0800
Subject: [PATCH] sort not change shape (#5778)

---
 crates/nu-command/src/filters/sort.rs | 46 +++++++++++++++++++--------
 1 file changed, 32 insertions(+), 14 deletions(-)

diff --git a/crates/nu-command/src/filters/sort.rs b/crates/nu-command/src/filters/sort.rs
index 7e0c4f91e4..780930147c 100644
--- a/crates/nu-command/src/filters/sort.rs
+++ b/crates/nu-command/src/filters/sort.rs
@@ -1,8 +1,8 @@
 use nu_protocol::{
     ast::Call,
     engine::{Command, EngineState, Stack},
-    Category, Example, IntoInterruptiblePipelineData, PipelineData, ShellError, Signature, Span,
-    Value,
+    Category, Example, IntoInterruptiblePipelineData, IntoPipelineData, PipelineData, ShellError,
+    Signature, Span, Value,
 };
 use std::cmp::Ordering;
 
@@ -95,6 +95,15 @@ impl Command for Sort {
                     span: Span::test_data(),
                 }),
             },
+            Example {
+                description: "Sort doesn't change input shape",
+                example: "{a: 3, b: 4} | sort",
+                result: Some(Value::Record {
+                    cols: vec!["a".to_string(), "b".to_string()],
+                    vals: vec![Value::test_int(3), Value::test_int(4)],
+                    span: Span::test_data(),
+                }),
+            },
         ]
     }
 
@@ -108,20 +117,29 @@ impl Command for Sort {
         let reverse = call.has_flag("reverse");
         let insensitive = call.has_flag("insensitive");
         let metadata = &input.metadata();
-        let mut vec: Vec<_> = input.into_iter().collect();
 
-        sort(&mut vec, call.head, insensitive)?;
-
-        if reverse {
-            vec.reverse()
-        }
-
-        let iter = vec.into_iter();
-        match &*metadata {
-            Some(m) => {
-                Ok(iter.into_pipeline_data_with_metadata(m.clone(), engine_state.ctrlc.clone()))
+        match input {
+            PipelineData::Value(v, ..)
+                if !matches!(v, Value::List { .. } | Value::Range { .. }) =>
+            {
+                Ok(v.into_pipeline_data())
+            }
+            pipe_data => {
+                let mut vec: Vec<_> = pipe_data.into_iter().collect();
+
+                sort(&mut vec, call.head, insensitive)?;
+
+                if reverse {
+                    vec.reverse()
+                }
+
+                let iter = vec.into_iter();
+                match &*metadata {
+                    Some(m) => Ok(iter
+                        .into_pipeline_data_with_metadata(m.clone(), engine_state.ctrlc.clone())),
+                    None => Ok(iter.into_pipeline_data(engine_state.ctrlc.clone())),
+                }
             }
-            None => Ok(iter.into_pipeline_data(engine_state.ctrlc.clone())),
         }
     }
 }