MirroredRepos/bat
1
0
Fork 0
mirror of https://github.com/sharkdp/bat.git synced 2025-09-04 04:12:31 +01:00
Code Issues Releases Wiki Activity

Adds range syntax for line highlights

Browse Source
This commit is contained in:
Liam Kalir
2020-01-22 22:26:21 -05:00
committed by David Peter
parent 87776ae07e
commit 93881d9a64
5 changed files with 40 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/line_range.rs
View File

@@ -30,13 +30,19 @@ impl LineRange {
}
let line_numbers: Vec<&str> = range_raw.split(':').collect();
if line_numbers.len() == 2 {
new_range.lower = line_numbers[0].parse()?;
new_range.upper = line_numbers[1].parse()?;
return Ok(new_range);
match line_numbers.len() {
1 => {
new_range.lower = line_numbers[0].parse()?;
new_range.upper = new_range.lower;
Ok(new_range)
},
2 => {
new_range.lower = line_numbers[0].parse()?;
new_range.upper = line_numbers[1].parse()?;
Ok(new_range)
},
_ => Err("expected at most single ':' character".into()),
}
Err("expected single ':' character".into())
}
pub fn is_inside(&self, line: usize) -> bool {
@@ -65,6 +71,13 @@ fn test_parse_partial_max() {
assert_eq!(usize::max_value(), range.upper);
}
#[test]
fn test_parse_single() {
let range = LineRange::from("40").expect("Shouldn't fail on test!");
assert_eq!(40, range.lower);
assert_eq!(40, range.upper);
}
#[test]
fn test_parse_fail() {
let range = LineRange::from("40:50:80");
@@ -73,8 +86,6 @@ fn test_parse_fail() {
assert!(range.is_err());
let range = LineRange::from(":40:");
assert!(range.is_err());
let range = LineRange::from("40");
assert!(range.is_err());
}
#[derive(Copy, Clone, Debug, PartialEq)]