extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-04-02 20:27:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Preserve metatdata in where (#618)

Browse Source
This commit is contained in:
JT 2021-12-29 22:17:20 +11:00 committed by GitHub
parent c8330523c8
commit 832a801c11
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
crates/nu-command/src/filters/where_.rs
View File

@ -31,6 +31,8 @@ impl Command for Where {
let cond = &call.positional[0]; let cond = &call.positional[0];
let span = call.head; let span = call.head;
let metadata = input.metadata();
let block_id = cond let block_id = cond
.as_row_condition_block() .as_row_condition_block()
.ok_or_else(|| ShellError::TypeMismatch("expected row condition".to_owned(), span))?; .ok_or_else(|| ShellError::TypeMismatch("expected row condition".to_owned(), span))?;
@ -41,21 +43,24 @@ impl Command for Where {
let block = engine_state.get_block(block_id).clone(); let block = engine_state.get_block(block_id).clone();
let mut stack = stack.collect_captures(&block.captures); let mut stack = stack.collect_captures(&block.captures);
input.filter( input
move |value| { .filter(
if let Some(var) = block.signature.get_positional(0) { move |value| {
if let Some(var_id) = &var.var_id { if let Some(var) = block.signature.get_positional(0) {
stack.add_var(*var_id, value.clone()); if let Some(var_id) = &var.var_id {
stack.add_var(*var_id, value.clone());
}
} }
} let result =
let result = eval_block(&engine_state, &mut stack, &block, PipelineData::new(span)); eval_block(&engine_state, &mut stack, &block, PipelineData::new(span));
match result { match result {
Ok(result) => result.into_value(span).is_true(), Ok(result) => result.into_value(span).is_true(),
_ => false, _ => false,
} }
}, },
ctrlc, ctrlc,
) )
.map(|x| x.set_metadata(metadata))
} }
} }

11
crates/nu-protocol/src/pipeline_data.rs
View File

@ -65,6 +65,17 @@ impl PipelineData {
} }
} }
pub fn set_metadata(mut self, metadata: Option<PipelineMetadata>) -> Self {
match &mut self {
PipelineData::ListStream(_, x) => *x = metadata,
PipelineData::ByteStream(_, _, x) => *x = metadata,
PipelineData::StringStream(_, _, x) => *x = metadata,
PipelineData::Value(_, x) => *x = metadata,
}
self
}
pub fn into_value(self, span: Span) -> Value { pub fn into_value(self, span: Span) -> Value {
match self { match self {
PipelineData::Value(Value::Nothing { .. }, ..) => Value::nothing(span), PipelineData::Value(Value::Nothing { .. }, ..) => Value::nothing(span),