frank/sharkdp--bat
1
0
Fork 0
mirror of https://github.com/sharkdp/bat synced 2026-07-22 16:53:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Restructure and fix bug in line range module

Browse Source
This commit is contained in:
sharkdp
2020-03-21 17:22:17 +01:00
committed by David Peter
parent 4855a47105
commit fedd32173e
4 changed files with 62 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bin/bat/app.rs
+9 -7
View File
@@ -20,7 +20,7 @@ use bat::{
assets::BAT_THEME_DEFAULT,
errors::*,
inputfile::InputFile,
line_range::{LineRange, LineRanges},
line_range::{HighlightedLineRanges, LineRange, LineRanges},
style::{OutputComponent, OutputComponents, OutputWrap},
syntax_mapping::SyntaxMapping,
Config, PagingMode,
@@ -201,13 +201,14 @@ impl App {
}
})
.unwrap_or_else(|| String::from(BAT_THEME_DEFAULT)),
line_ranges: LineRanges::from(
line_ranges:
self.matches
.values_of("line-range")
.map(|vs| vs.map(LineRange::from).collect())
.transpose()?
.unwrap_or_else(|| vec![]),
),
.map(LineRanges::from)
.unwrap_or_default()
,
output_components,
syntax_mapping,
pager: self.matches.value_of("pager"),
@@ -215,13 +216,14 @@ impl App {
Some("always") => true,
_ => false,
},
highlight_lines: LineRanges::from(
highlighted_lines:
self.matches
.values_of("highlight-line")
.map(|ws| ws.map(LineRange::from).collect())
.transpose()?
.unwrap_or_else(|| vec![LineRange { lower: 0, upper: 0 }]),
),
.map(LineRanges::from)
.map(|lr| HighlightedLineRanges(lr))
.unwrap_or_default()
})
}