extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-08-09 22:47:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Consolidate suggestions code (#2597)

Browse Source
This commit is contained in:
Chris Gillespie
2020-09-24 20:44:24 -07:00
committed by GitHub
parent bd9e598bf0
commit a8b65e35ec
9 changed files with 39 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
crates/nu-value-ext/src/lib.rs
View File

@ -238,7 +238,9 @@ where
let suggestions: IndexSet<_> = rows
.iter()
.filter_map(|r| nu_protocol::did_you_mean(&r, &column_path_tried))
.filter_map(|r| {
nu_protocol::did_you_mean(&r, column_path_tried.as_string())
})
.map(|s| s[0].to_owned())
.collect();
let mut existing_columns: IndexSet<_> = IndexSet::default();
@ -308,7 +310,7 @@ where
let primary_label = format!("There isn't a column named '{}'", &column);
if let Some(suggestions) =
nu_protocol::did_you_mean(&obj_source, &column_path_tried)
nu_protocol::did_you_mean(&obj_source, column_path_tried.as_string())
{
return ShellError::labeled_error_with_secondary(
"Unknown column",
@ -342,7 +344,9 @@ where
_ => {}
}
if let Some(suggestions) = nu_protocol::did_you_mean(&obj_source, &column_path_tried) {
if let Some(suggestions) =
nu_protocol::did_you_mean(&obj_source, column_path_tried.as_string())
{
return ShellError::labeled_error(
"Unknown column",
format!("did you mean '{}'?", suggestions[0]),