- sort: fix for - numeric sort (-n) incorrectly parses '+' as a number sign

Author: undali

src/uu/sort/src/sort.rs

@@ -600,11 +600,12 @@ impl<'a> Line<'a> {
             tokenize(line, settings.separator, token_buffer);
         }
         if settings.mode == SortMode::Numeric {
-            // exclude inf, nan, scientific notation
-            let line_num_float = (!line.iter().any(u8::is_ascii_alphabetic))
-                .then(|| std::str::from_utf8(line).ok())
-                .flatten()
-                .and_then(|s| s.parse::<f64>().ok());
+            // exclude inf, nan, scientific notation, '+' sign
+            let line_num_float = (!line.starts_with(&[*POSITIVE])
+                && !line.iter().any(u8::is_ascii_alphabetic))
+            .then(|| std::str::from_utf8(line).ok())
+            .flatten()
+            .and_then(|s| s.parse::<f64>().ok());
             line_data.line_num_floats.push(line_num_float);
         }
         for (selector, selection) in settings

tests/by-util/test_sort.rs

@@ -414,6 +414,14 @@ fn test_numeric_unsorted_ints() {
     );
 }
 
+#[test]
+fn test_numeric_with_prefix() {
+    test_helper(
+        "numeric_with_prefix",
+        &["-n", "--numeric-sort", "--sort=numeric"],
+    );
+}
+
 #[test]
 fn test_human_block_sizes() {
     test_helper(

tests/fixtures/sort/numeric_with_prefix.expected

@@ -0,0 +1,10 @@
+-10
+-2
+-1
++1
++10
++2
+hello
+world
+10
+50

tests/fixtures/sort/numeric_with_prefix.expected.debug

@@ -0,0 +1,30 @@
+-10
+___
+___
+-2
+__
+__
+-1
+__
+__
++1
+^ no match for key
+__
++10
+^ no match for key
+___
++2
+^ no match for key
+__
+hello
+^ no match for key
+_____
+world
+^ no match for key
+_____
+10
+__
+__
+50
+__
+__

tests/fixtures/sort/numeric_with_prefix.txt

@@ -0,0 +1,10 @@
++10
++2
++1
+-10
+-1
+-2
+world
+50
+10
+hello