eaf0b99 · bat · git.iko.soy

git.iko.soy/bat

update

commiteaf0b99d256351ab72f537aeac1088fa05647340 authorTaylor <tskinn12@gmail.com> dateMon 11 Jun 2018, 22:10 (8 years ago) parent3b1dcca

2 files changed+46−49

compare with master

unifiedsplit

src/app.rs+27−10 src/features.rs+19−39

src/app.rs+27−10

@@ -282,7 +282,7 @@ impl App {

282282 term_width: Term::stdout().size().1 as usize,

283283 files,

284284 theme: self.matches.value_of("theme"),

285− line_range: self.matches.value_of("line-range").map(LineRange::from),

285+ line_range: transpose(self.matches.value_of("line-range").map(LineRange::from))?,

286286 })

287287 }

288288

@@ -351,12 +351,12 @@ pub struct LineRange {

351351}

352352

353353impl LineRange {

354− pub fn from(range_raw: &str) -> LineRange {

355− LineRange::parse_range(range_raw).unwrap_or(LineRange::new())

354+ pub fn from(range_raw: &str) -> Result<LineRange> {

355+ LineRange::parse_range(range_raw)

356356 }

357357

358358 pub fn new() -> LineRange {

359− LineRange{

359+ LineRange {

360360 lower: usize::min_value(),

361361 upper: usize::max_value(),

362362 }

@@ -365,10 +365,10 @@ impl LineRange {

365365 pub fn parse_range(range_raw: &str) -> Result<LineRange> {

366366 let mut new_range = LineRange::new();

367367

368− if range_raw.bytes().nth(0).ok_or("No first byte")? == b':' {

368+ if range_raw.bytes().nth(0).ok_or("Empty line range")? == b':' {

369369 new_range.upper = range_raw[1..].parse()?;

370370 return Ok(new_range);

371− } else if range_raw.bytes().last().ok_or("No last byte")? == b':' {

371+ } else if range_raw.bytes().last().ok_or("Empty line range")? == b':' {

372372 new_range.lower = range_raw[..range_raw.len() - 1].parse()?;

373373 return Ok(new_range);

374374 }

@@ -377,28 +377,45 @@ impl LineRange {

377377 if line_numbers.len() == 2 {

378378 new_range.lower = line_numbers[0].parse()?;

379379 new_range.upper = line_numbers[1].parse()?;

380+ return Ok(new_range);

380381 }

381− Ok(new_range)

382+ Err("expected single ':' character".into())

382383 }

383384}

384385

385386#[test]

386387fn test_parse_line_range_full() {

387− let range = LineRange::from(Some("40:50")).expect("Shouldn't fail on test!");

388+ let range = LineRange::from("40:50").expect("Shouldn't fail on test!");

388389 assert_eq!(40, range.lower);

389390 assert_eq!(50, range.upper);

390391}

391392

392393#[test]

393394fn test_parse_line_range_partial_min() {

394− let range = LineRange::from(Some(":50")).expect("Shouldn't fail on test!");

395+ let range = LineRange::from(":50").expect("Shouldn't fail on test!");

395396 assert_eq!(usize::min_value(), range.lower);

396397 assert_eq!(50, range.upper);

397398}

398399

399400#[test]

400401fn test_parse_line_range_partial_max() {

401− let range = LineRange::from(Some("40:")).expect("Shouldn't fail on test!");

402+ let range = LineRange::from("40:").expect("Shouldn't fail on test!");

402403 assert_eq!(40, range.lower);

403404 assert_eq!(usize::max_value(), range.upper);

404405}

406+

407+#[test]

408+fn test_parse_line_range_fail() {

409+ let range = LineRange::from("40:50:80");

410+ assert!(range.is_err());

411+ let range = LineRange::from("40::80");

412+ assert!(range.is_err());

413+ let range = LineRange::from(":40:");

414+ assert!(range.is_err());

415+ let range = LineRange::from("40");

416+ assert!(range.is_err());

417+}

418+

419+fn transpose<T>(opt: Option<Result<T>>) -> Result<Option<T>> {

420+ opt.map_or(Ok(None), |res| res.map(Some))

421+}

src/features.rs+19−39

@@ -1,5 +1,5 @@

11use ansi_term::Colour::Green;

2−use app::{Config,LineRange};

2+use app::{Config, LineRange};

33use assets::HighlightingAssets;

44use diff::get_git_diff;

55use errors::*;

@@ -94,15 +94,7 @@ fn print_file(

9494 let highlighter = HighlightLines::new(syntax, theme);

9595

9696 printer.print_header(filename)?;

97−

98− match printer.config.line_range.as_ref() {

99− Some(range) => {

100− print_file_ranges(printer, reader, highlighter, range)?;

101− },

102− None => {

103− print_file_no_ranges(printer, reader, highlighter)?;

104− }

105− }

97+ print_file_ranges(printer, reader, highlighter, &printer.config.line_range)?;

10698 printer.print_footer()?;

10799 }

108100 Ok(())

@@ -112,8 +104,8 @@ fn print_file_ranges<'a>(

112104 printer: &mut Printer,

113105 mut reader: Box<BufRead + 'a>,

114106 mut highlighter: HighlightLines,

115− ranges: &LineRange

116−) -> Result<()>{

107+ line_ranges: &Option<LineRange>,

108+) -> Result<()> {

117109 let mut buffer = Vec::new();

118110

119111 while reader.read_until(b'\n', &mut buffer)? > 0 {

@@ -121,36 +113,24 @@ fn print_file_ranges<'a>(

121113 let line = String::from_utf8_lossy(&buffer);

122114 let regions = highlighter.highlight(line.as_ref());

123115

124− if printer.line_number + 1 < ranges.lower {

125− // skip line

126− printer.line_number += 1;

127− } else if printer.line_number >= ranges.upper {

128− // no more lines in range

129− break;

130− } else {

131− printer.print_line(&regions)?;

116+ match line_ranges {

117+ &Some(ref range) => {

118+ if printer.line_number + 1 < range.lower {

119+ // skip line

120+ printer.line_number += 1;

121+ } else if printer.line_number >= range.upper {

122+ // no more lines in range

123+ break;

124+ } else {

125+ printer.print_line(&regions)?;

126+ }

127+ }

128+ &None => {

129+ printer.print_line(&regions)?;

130+ }

132131 }

133132 }

134133 buffer.clear();

135134 }

136135 Ok(())

137136}

138−

139−fn print_file_no_ranges<'a>(

140− printer: &mut Printer,

141− mut reader: Box<BufRead + 'a>,

142− mut highlighter: HighlightLines

143−) -> Result<()>{

144− let mut buffer = Vec::new();

145−

146− while reader.read_until(b'\n', &mut buffer)? > 0 {

147− {

148− let line = String::from_utf8_lossy(&buffer);

149− let regions = highlighter.highlight(line.as_ref());

150− printer.print_line(&regions)?;

151− }

152− buffer.clear();

153− }

154−

155− Ok(())

156−}