extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-02-17 02:50:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix broken -w param for grid (#4397)

Browse Source
This commit is contained in:
Darren Schroeder 2022-02-10 06:29:53 -06:00 committed by GitHub
parent c2118e7505
commit 28947ff9a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
crates/nu-command/src/viewers/griddle.rs
View File

@ -31,7 +31,7 @@ impl Command for Griddle {
.named( .named(
"width", "width",
SyntaxShape::Int, SyntaxShape::Int,
"number of columns wide", "number of terminal columns wide (not output columns)",
Some('w'), Some('w'),
) )
.switch("color", "draw output with color", Some('c')) .switch("color", "draw output with color", Some('c'))
@ -60,7 +60,7 @@ prints out the list properly."#
call: &Call, call: &Call,
input: PipelineData, input: PipelineData,
) -> Result<nu_protocol::PipelineData, nu_protocol::ShellError> { ) -> Result<nu_protocol::PipelineData, nu_protocol::ShellError> {
let width_param: Option<String> = call.get_flag(engine_state, stack, "width")?; let width_param: Option<i64> = call.get_flag(engine_state, stack, "width")?;
let color_param: bool = call.has_flag("color"); let color_param: bool = call.has_flag("color");
let separator_param: Option<String> = call.get_flag(engine_state, stack, "separator")?; let separator_param: Option<String> = call.get_flag(engine_state, stack, "separator")?;
let config = stack.get_config().unwrap_or_default(); let config = stack.get_config().unwrap_or_default();
@ -156,7 +156,7 @@ fn strip_ansi(string: &str) -> Cow<str> {
fn create_grid_output( fn create_grid_output(
items: Vec<(usize, String, String)>, items: Vec<(usize, String, String)>,
call: &Call, call: &Call,
width_param: Option<String>, width_param: Option<i64>,
color_param: bool, color_param: bool,
separator_param: Option<String>, separator_param: Option<String>,
env_str: Option<String>, env_str: Option<String>,
@ -168,7 +168,7 @@ fn create_grid_output(
}; };
let cols = if let Some(col) = width_param { let cols = if let Some(col) = width_param {
col.parse::<u16>().unwrap_or(80) col as u16
} else if let Some((Width(w), Height(_h))) = terminal_size::terminal_size() { } else if let Some((Width(w), Height(_h))) = terminal_size::terminal_size() {
w w
} else { } else {