Change default udiff context radius to 3
This commit is contained in:
parent
bce4191356
commit
4459c5ee3a
1 changed files with 17 additions and 2 deletions
|
|
@ -89,12 +89,15 @@ impl<'diff, 'old, 'new, 'bufs> UnifiedDiff<'diff, 'old, 'new, 'bufs> {
|
||||||
pub fn from_text_diff(diff: &'diff TextDiff<'old, 'new, 'bufs>) -> Self {
|
pub fn from_text_diff(diff: &'diff TextDiff<'old, 'new, 'bufs>) -> Self {
|
||||||
UnifiedDiff {
|
UnifiedDiff {
|
||||||
diff,
|
diff,
|
||||||
context_radius: 5,
|
context_radius: 3,
|
||||||
header: None,
|
header: None,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Changes the context radius. Defaults to `5`.
|
/// Changes the context radius.
|
||||||
|
///
|
||||||
|
/// The context radius is the number of lines between changes that should
|
||||||
|
/// be emitted. This defaults to `3`.
|
||||||
pub fn context_radius(&mut self, n: usize) -> &mut Self {
|
pub fn context_radius(&mut self, n: usize) -> &mut Self {
|
||||||
self.context_radius = n;
|
self.context_radius = n;
|
||||||
self
|
self
|
||||||
|
|
@ -208,6 +211,9 @@ impl<'diff, 'old, 'new, 'bufs> fmt::Display for UnifiedDiff<'diff, 'old, 'new, '
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Quick way to get a unified diff as string.
|
/// Quick way to get a unified diff as string.
|
||||||
|
///
|
||||||
|
/// `n` configures [`UnifiedDiff::context_radius`] and
|
||||||
|
/// `header` configures [`UnifiedDiff::header`] when not `None`.
|
||||||
pub fn unified_diff<'old, 'new>(
|
pub fn unified_diff<'old, 'new>(
|
||||||
alg: Algorithm,
|
alg: Algorithm,
|
||||||
old: &'old str,
|
old: &'old str,
|
||||||
|
|
@ -223,3 +229,12 @@ pub fn unified_diff<'old, 'new>(
|
||||||
.header_opt(header)
|
.header_opt(header)
|
||||||
.to_string()
|
.to_string()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_unified_diff() {
|
||||||
|
let diff = TextDiff::from_lines(
|
||||||
|
"a\nb\nc\nd\ne\nf\ng\nh\ni\nj\nk\nl\nm\nn\no\np\nq\nr\ns\nt\nu\nv\nw\nx\ny\nz\nA\nB\nC\nD\nE\nF\nG\nH\nI\nJ\nK\nL\nM\nN\nO\nP\nQ\nR\nS\nT\nU\nV\nW\nX\nY\nZ",
|
||||||
|
"a\nb\nc\nd\ne\nf\ng\nh\ni\nj\nk\nl\nm\nn\no\np\nq\nr\nS\nt\nu\nv\nw\nx\ny\nz\nA\nB\nC\nD\nE\nF\nG\nH\nI\nJ\nK\nL\nM\nN\no\nP\nQ\nR\nS\nT\nU\nV\nW\nX\nY\nZ",
|
||||||
|
);
|
||||||
|
insta::assert_snapshot!(&diff.unified_diff().header("a.txt", "b.txt").to_string());
|
||||||
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue