mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-02-06 20:42:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

ui: extract term_width() helper as static function

Browse source 
I'll add progress output wrapper which will be used in place of ui object.
This commit is contained in:
Yuya Nishihara 2023-06-13 18:39:09 +09:00
parent dbe8d3fcdc
commit dc7f7fb23d
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/ui.rs
View file

@ -278,11 +278,7 @@ impl Ui {
} }
pub fn term_width(&self) -> Option<u16> { pub fn term_width(&self) -> Option<u16> {
if let Some(cols) = env::var("COLUMNS").ok().and_then(|s| s.parse().ok()) { term_width()
Some(cols)
} else {
crossterm::terminal::size().ok().map(|(cols, _)| cols)
}
} }
/// Construct a guard object which writes `data` when dropped. Useful for /// Construct a guard object which writes `data` when dropped. Useful for
@ -337,3 +333,11 @@ impl Drop for OutputGuard {
_ = self.output.flush(); _ = self.output.flush();
} }
} }
fn term_width() -> Option<u16> {
if let Some(cols) = env::var("COLUMNS").ok().and_then(|s| s.parse().ok()) {
Some(cols)
} else {
crossterm::terminal::size().ok().map(|(cols, _)| cols)
}
}