Mirrors/nushell
2
0
Fork 0
mirror of https://github.com/nushell/nushell synced 2024-12-27 05:23:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Don't compute 'did you mean' suggestions unless showing them to user (#6540)

Browse source
This commit is contained in:
Dan Davison 2022-09-11 12:58:19 -04:00 committed by GitHub
parent 4926865c4e
commit 367f79cb4f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
crates/nu-engine/src/env.rs
View file

@ -336,7 +336,7 @@ fn get_converted_value(
val: block_id, val: block_id,
span: from_span, span: from_span,
.. ..
}) = env_conversions.follow_cell_path(path_members, false) }) = env_conversions.follow_cell_path_not_from_user_input(path_members, false)
{ {
let block = engine_state.get_block(block_id); let block = engine_state.get_block(block_id);

24
crates/nu-protocol/src/value/mod.rs
View file

@ -609,6 +609,23 @@ impl Value {
self, self,
cell_path: &[PathMember], cell_path: &[PathMember],
insensitive: bool, insensitive: bool,
) -> Result<Value, ShellError> {
self.follow_cell_path_helper(cell_path, insensitive, true)
}
pub fn follow_cell_path_not_from_user_input(
self,
cell_path: &[PathMember],
insensitive: bool,
) -> Result<Value, ShellError> {
self.follow_cell_path_helper(cell_path, insensitive, false)
}
fn follow_cell_path_helper(
self,
cell_path: &[PathMember],
insensitive: bool,
from_user_input: bool,
) -> Result<Value, ShellError> { ) -> Result<Value, ShellError> {
let mut current = self; let mut current = self;
for member in cell_path { for member in cell_path {
@ -673,9 +690,12 @@ impl Value {
} }
}) { }) {
current = found.1.clone(); current = found.1.clone();
} else if let Some(suggestion) = did_you_mean(&cols, column_name) {
return Err(ShellError::DidYouMean(suggestion, *origin_span));
} else { } else {
if from_user_input {
if let Some(suggestion) = did_you_mean(&cols, column_name) {
return Err(ShellError::DidYouMean(suggestion, *origin_span));
}
}
return Err(ShellError::CantFindColumn(*origin_span, span)); return Err(ShellError::CantFindColumn(*origin_span, span));
} }
} }