Merge pull request #4647 from nrenvo/fix/read-line-numbers-tab

fix(read): separate line numbers with a tab

Author: KuSh

scripts/benchmark.sh

@@ -187,10 +187,11 @@ fi
 # read
 # ===================
 section "read"
-bench "read" "cat src/main.rs" "$RTK read src/main.rs"
-bench "read -l minimal" "cat src/main.rs" "$RTK read src/main.rs -l minimal"
-bench "read -l aggressive" "cat src/main.rs" "$RTK read src/main.rs -l aggressive"
-bench "read -n" "cat -n src/main.rs" "$RTK read src/main.rs -n"
+# The CLI lives in src/lib.rs; src/main.rs is a 3-line shim.
+bench "read" "cat src/lib.rs" "$RTK read src/lib.rs"
+bench "read -l minimal" "cat src/lib.rs" "$RTK read src/lib.rs -l minimal"
+bench "read -l aggressive" "cat src/lib.rs" "$RTK read src/lib.rs -l aggressive"
+bench "read -n" "cat -n src/lib.rs" "$RTK read src/lib.rs -n"
 
 # ===================
 # find

src/cmds/system/read.rs

@@ -234,7 +234,7 @@ fn format_with_line_numbers(content: &str) -> String {
     let width = lines.len().to_string().len();
     let mut out = String::new();
     for (i, line) in lines.iter().enumerate() {
-        out.push_str(&format!("{:>width$} │ {}\n", i + 1, line, width = width));
+        out.push_str(&format!("{:>width$}\t{}\n", i + 1, line, width = width));
     }
     out
 }

tests/read_window_bytes_test.rs

@@ -111,11 +111,11 @@ fn read_windows_still_apply_text_filtering_and_line_numbers() {
         ),
         (
             ["--head-lines", "1", "--line-numbers"].as_slice(),
-            "1 │ // comment\n",
+            "1\t// comment\n",
         ),
         (
             ["--tail-lines", "1", "--line-numbers"].as_slice(),
-            "1 │ fn gamma() {}\n",
+            "1\tfn gamma() {}\n",
         ),
     ] {
         let output = read_stdin(input, args);
@@ -124,6 +124,17 @@ fn read_windows_still_apply_text_filtering_and_line_numbers() {
     }
 }
 
+#[test]
+fn read_line_numbers_align_multi_digit_widths_with_a_tab() {
+    let input = b"a\nb\nc\nd\ne\nf\ng\nh\ni\nj\nk\nl\n";
+    let output = read_stdin(input, &["--line-numbers"]);
+    assert!(output.status.success(), "{:?}", output.stderr);
+    assert_eq!(
+        output.stdout,
+        b" 1\ta\n 2\tb\n 3\tc\n 4\td\n 5\te\n 6\tf\n 7\tg\n 8\th\n 9\ti\n10\tj\n11\tk\n12\tl\n"
+    );
+}
+
 #[cfg(unix)]
 #[test]
 fn rewritten_head_spellings_match_native_on_non_utf8_files() {