Skip to content

Commit 14e7754

Browse files
sylvestresylvestre
authored
Merge pull request #28 from oSoMoN/implement-expand-tabs-option
Implement `-t`/`--expand-tabs` option (fixes #26) and `--tabsize=NUM` option (fixes #27)
2 parents a304ac0 + f2fd212 commit 14e7754

File tree

13 files changed

+429
-36
lines changed

13 files changed

+429
-36
lines changed

‎Cargo.lock‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ path = "src/main.rs"
1616

1717
[dependencies]
1818
diff = "0.1.10"
19+
regex = "1.10.3"
1920
same-file = "1.0.6"
21+
unicode-width = "0.1.11"
2022

2123
[dev-dependencies]
2224
pretty_assertions = "1"

‎fuzz/fuzz_targets/fuzz_ed.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use std::io::Write;
88
use std::process::Command;
99

1010
fn diff_w(expected: &[u8], actual: &[u8], filename: &str) -> Result<Vec<u8>, DiffError> {
11-
let mut output = ed_diff::diff(expected, actual)?;
11+
let mut output = ed_diff::diff(expected, actual, false, false, 8)?;
1212
writeln!(&mut output, "w {filename}").unwrap();
1313
Ok(output)
1414
}

‎fuzz/fuzz_targets/fuzz_normal.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ fuzz_target!(|x: (Vec<u8>, Vec<u8>)| {
2121
} else {
2222
return
2323
}*/
24-
let diff = normal_diff::diff(&from, &to);
24+
let diff = normal_diff::diff(&from, &to, false, false, 8);
2525
File::create("target/fuzz.file.original")
2626
.unwrap()
2727
.write_all(&from)

‎fuzz/fuzz_targets/fuzz_patch.rs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ fuzz_target!(|x: (Vec<u8>, Vec<u8>, u8)| {
2626
&to,
2727
"target/fuzz.file",
2828
context as usize,
29+
false,
30+
false,
31+
8,
2932
);
3033
File::create("target/fuzz.file.original")
3134
.unwrap()

‎src/context_diff.rs‎

Lines changed: 33 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
use std::collections::VecDeque;
77
use std::io::Write;
88

9+
use crate::utils::do_write_line;
10+
911
#[derive(Debug, PartialEq)]
1012
pub enum DiffLine {
1113
Context(Vec<u8>),
@@ -263,13 +265,16 @@ fn make_diff(
263265
}
264266

265267
#[must_use]
268+
#[allow(clippy::too_many_arguments)]
266269
pub fn diff(
267270
expected: &[u8],
268271
expected_filename: &str,
269272
actual: &[u8],
270273
actual_filename: &str,
271274
context_size: usize,
272275
stop_early: bool,
276+
expand_tabs: bool,
277+
tabsize: usize,
273278
) -> Vec<u8> {
274279
let mut output = format!("*** {expected_filename}\t\n--- {actual_filename}\t\n").into_bytes();
275280
let diff_results = make_diff(expected, actual, context_size, stop_early);
@@ -314,17 +319,20 @@ pub fn diff(
314319
match line {
315320
DiffLine::Context(e) => {
316321
write!(output, " ").expect("write to Vec is infallible");
317-
output.write_all(&e).expect("write to Vec is infallible");
322+
do_write_line(&mut output, &e, expand_tabs, tabsize)
323+
.expect("write to Vec is infallible");
318324
writeln!(output).unwrap();
319325
}
320326
DiffLine::Change(e) => {
321327
write!(output, "! ").expect("write to Vec is infallible");
322-
output.write_all(&e).expect("write to Vec is infallible");
328+
do_write_line(&mut output, &e, expand_tabs, tabsize)
329+
.expect("write to Vec is infallible");
323330
writeln!(output).unwrap();
324331
}
325332
DiffLine::Add(e) => {
326333
write!(output, "- ").expect("write to Vec is infallible");
327-
output.write_all(&e).expect("write to Vec is infallible");
334+
do_write_line(&mut output, &e, expand_tabs, tabsize)
335+
.expect("write to Vec is infallible");
328336
writeln!(output).unwrap();
329337
}
330338
}
@@ -341,17 +349,20 @@ pub fn diff(
341349
match line {
342350
DiffLine::Context(e) => {
343351
write!(output, " ").expect("write to Vec is infallible");
344-
output.write_all(&e).expect("write to Vec is infallible");
352+
do_write_line(&mut output, &e, expand_tabs, tabsize)
353+
.expect("write to Vec is infallible");
345354
writeln!(output).unwrap();
346355
}
347356
DiffLine::Change(e) => {
348357
write!(output, "! ").expect("write to Vec is infallible");
349-
output.write_all(&e).expect("write to Vec is infallible");
358+
do_write_line(&mut output, &e, expand_tabs, tabsize)
359+
.expect("write to Vec is infallible");
350360
writeln!(output).unwrap();
351361
}
352362
DiffLine::Add(e) => {
353363
write!(output, "+ ").expect("write to Vec is infallible");
354-
output.write_all(&e).expect("write to Vec is infallible");
364+
do_write_line(&mut output, &e, expand_tabs, tabsize)
365+
.expect("write to Vec is infallible");
355366
writeln!(output).unwrap();
356367
}
357368
}
@@ -424,6 +435,8 @@ mod tests {
424435
&format!("{target}/alef"),
425436
2,
426437
false,
438+
false,
439+
8,
427440
);
428441
File::create(&format!("{target}/ab.diff"))
429442
.unwrap()
@@ -503,6 +516,8 @@ mod tests {
503516
&format!("{target}/alef_"),
504517
2,
505518
false,
519+
false,
520+
8,
506521
);
507522
File::create(&format!("{target}/ab_.diff"))
508523
.unwrap()
@@ -585,6 +600,8 @@ mod tests {
585600
&format!("{target}/alefx"),
586601
2,
587602
false,
603+
false,
604+
8,
588605
);
589606
File::create(&format!("{target}/abx.diff"))
590607
.unwrap()
@@ -670,6 +687,8 @@ mod tests {
670687
&format!("{target}/alefr"),
671688
2,
672689
false,
690+
false,
691+
8,
673692
);
674693
File::create(&format!("{target}/abr.diff"))
675694
.unwrap()
@@ -715,6 +734,8 @@ mod tests {
715734
to_filename,
716735
context_size,
717736
false,
737+
false,
738+
8,
718739
);
719740
let expected_full = [
720741
"*** foo\t",
@@ -740,6 +761,8 @@ mod tests {
740761
to_filename,
741762
context_size,
742763
true,
764+
false,
765+
8,
743766
);
744767
let expected_brief = ["*** foo\t", "--- bar\t", ""].join("\n");
745768
assert_eq!(diff_brief, expected_brief.as_bytes());
@@ -751,6 +774,8 @@ mod tests {
751774
to_filename,
752775
context_size,
753776
false,
777+
false,
778+
8,
754779
);
755780
assert!(nodiff_full.is_empty());
756781

@@ -761,6 +786,8 @@ mod tests {
761786
to_filename,
762787
context_size,
763788
true,
789+
false,
790+
8,
764791
);
765792
assert!(nodiff_brief.is_empty());
766793
}

‎src/ed_diff.rs‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55

66
use std::io::Write;
77

8+
use crate::utils::do_write_line;
9+
810
#[derive(Debug, PartialEq)]
911
struct Mismatch {
1012
pub line_number_expected: usize,
@@ -107,7 +109,13 @@ fn make_diff(expected: &[u8], actual: &[u8], stop_early: bool) -> Result<Vec<Mis
107109
Ok(results)
108110
}
109111

110-
pub fn diff(expected: &[u8], actual: &[u8], stop_early: bool) -> Result<Vec<u8>, DiffError> {
112+
pub fn diff(
113+
expected: &[u8],
114+
actual: &[u8],
115+
stop_early: bool,
116+
expand_tabs: bool,
117+
tabsize: usize,
118+
) -> Result<Vec<u8>, DiffError> {
111119
let mut output = Vec::new();
112120
let diff_results = make_diff(expected, actual, stop_early)?;
113121
if stop_early && !diff_results.is_empty() {
@@ -145,7 +153,7 @@ pub fn diff(expected: &[u8], actual: &[u8], stop_early: bool) -> Result<Vec<u8>,
145153
if actual == b"." {
146154
writeln!(&mut output, "..\n.\ns/.//\na").unwrap();
147155
} else {
148-
output.write_all(actual).unwrap();
156+
do_write_line(&mut output, actual, expand_tabs, tabsize).unwrap();
149157
writeln!(&mut output).unwrap();
150158
}
151159
}
@@ -160,7 +168,7 @@ mod tests {
160168
use super::*;
161169
use pretty_assertions::assert_eq;
162170
pub fn diff_w(expected: &[u8], actual: &[u8], filename: &str) -> Result<Vec<u8>, DiffError> {
163-
let mut output = diff(expected, actual, false)?;
171+
let mut output = diff(expected, actual, false, false, 8)?;
164172
writeln!(&mut output, "w {filename}").unwrap();
165173
Ok(output)
166174
}
@@ -169,7 +177,7 @@ mod tests {
169177
fn test_basic() {
170178
let from = b"a\n";
171179
let to = b"b\n";
172-
let diff = diff(from, to, false).unwrap();
180+
let diff = diff(from, to, false, false, 8).unwrap();
173181
let expected = ["1c", "b", ".", ""].join("\n");
174182
assert_eq!(diff, expected.as_bytes());
175183
}
@@ -404,18 +412,18 @@ mod tests {
404412
let from = ["a", "b", "c", ""].join("\n");
405413
let to = ["a", "d", "c", ""].join("\n");
406414

407-
let diff_full = diff(from.as_bytes(), to.as_bytes(), false).unwrap();
415+
let diff_full = diff(from.as_bytes(), to.as_bytes(), false, false, 8).unwrap();
408416
let expected_full = ["2c", "d", ".", ""].join("\n");
409417
assert_eq!(diff_full, expected_full.as_bytes());
410418

411-
let diff_brief = diff(from.as_bytes(), to.as_bytes(), true).unwrap();
419+
let diff_brief = diff(from.as_bytes(), to.as_bytes(), true, false, 8).unwrap();
412420
let expected_brief = "\0".as_bytes();
413421
assert_eq!(diff_brief, expected_brief);
414422

415-
let nodiff_full = diff(from.as_bytes(), from.as_bytes(), false).unwrap();
423+
let nodiff_full = diff(from.as_bytes(), from.as_bytes(), false, false, 8).unwrap();
416424
assert!(nodiff_full.is_empty());
417425

418-
let nodiff_brief = diff(from.as_bytes(), from.as_bytes(), true).unwrap();
426+
let nodiff_brief = diff(from.as_bytes(), from.as_bytes(), true, false, 8).unwrap();
419427
assert!(nodiff_brief.is_empty());
420428
}
421429
}

‎src/lib.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ pub mod context_diff;
22
pub mod ed_diff;
33
pub mod normal_diff;
44
pub mod unified_diff;
5+
pub mod utils;
56

67
// Re-export the public functions/types you need
78
pub use context_diff::diff as context_diff;

‎src/main.rs‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ mod ed_diff;
1515
mod normal_diff;
1616
mod params;
1717
mod unified_diff;
18+
mod utils;
1819

1920
// Exit codes are documented at
2021
// https://www.gnu.org/software/diffutils/manual/html_node/Invoking-diff.html.
@@ -30,6 +31,8 @@ fn main() -> ExitCode {
3031
format,
3132
report_identical_files,
3233
brief,
34+
expand_tabs,
35+
tabsize,
3336
} = parse_params(opts).unwrap_or_else(|error| {
3437
eprintln!("{error}");
3538
exit(2);
@@ -65,14 +68,18 @@ fn main() -> ExitCode {
6568
};
6669
// run diff
6770
let result: Vec<u8> = match format {
68-
Format::Normal => normal_diff::diff(&from_content, &to_content, brief),
71+
Format::Normal => {
72+
normal_diff::diff(&from_content, &to_content, brief, expand_tabs, tabsize)
73+
}
6974
Format::Unified => unified_diff::diff(
7075
&from_content,
7176
&from.to_string_lossy(),
7277
&to_content,
7378
&to.to_string_lossy(),
7479
context_count,
7580
brief,
81+
expand_tabs,
82+
tabsize,
7683
),
7784
Format::Context => context_diff::diff(
7885
&from_content,
@@ -81,11 +88,14 @@ fn main() -> ExitCode {
8188
&to.to_string_lossy(),
8289
context_count,
8390
brief,
91+
expand_tabs,
92+
tabsize,
8493
),
85-
Format::Ed => ed_diff::diff(&from_content, &to_content, brief).unwrap_or_else(|error| {
86-
eprintln!("{error}");
87-
exit(2);
88-
}),
94+
Format::Ed => ed_diff::diff(&from_content, &to_content, brief, expand_tabs, tabsize)
95+
.unwrap_or_else(|error| {
96+
eprintln!("{error}");
97+
exit(2);
98+
}),
8999
};
90100
if brief && !result.is_empty() {
91101
println!(

0 commit comments

Comments
 (0)