Fix incorrect handling of boolean flags for builtin commands (#11492)

# Description
Possible fix of #11456
This PR fixes a bug where builtin commands did not respect the logic of
dynamically passed boolean flags. The reason is
[has_flag](6f59abaf43/crates/nu-protocol/src/ast/call.rs (L204C5-L212C6))
method did not evaluate and take into consideration expression used with
flag.

To address this issue a solution is proposed:
1. `has_flag` method is moved to `CallExt` and new logic to evaluate
expression and check if it is a boolean value is added
2. `has_flag_const` method is added to `CallExt` which is a constant
version of `has_flag`
3. `has_named` method is added to `Call` which is basically the old
logic of `has_flag`
4. All usages of `has_flag` in code are updated, mostly to pass
`engine_state` and `stack` to new `has_flag`. In `run_const` commands it
is replaced with `has_flag_const`. And in a few select places: parser,
`to nuon` and `into string` old logic via `has_named` is used.

# User-Facing Changes
Explicit values of boolean flags are now respected in builtin commands.
Before:

![image](https://github.com/nushell/nushell/assets/17511668/f9fbabb2-3cfd-43f9-ba9e-ece76d80043c)
After:

![image](https://github.com/nushell/nushell/assets/17511668/21867596-2075-437f-9c85-45563ac70083)

Another example:
Before:

![image](https://github.com/nushell/nushell/assets/17511668/efdbc5ca-5227-45a4-ac5b-532cdc2bbf5f)
After:

![image](https://github.com/nushell/nushell/assets/17511668/2907d5c5-aa93-404d-af1c-21cdc3d44646)


# Tests + Formatting
Added test reproducing some variants of original issue.
This commit is contained in:
Artemiy
2024-01-11 18:19:48 +03:00
committed by GitHub
parent 62272975f2
commit 1867bb1a88
149 changed files with 771 additions and 504 deletions

View File

@ -267,12 +267,17 @@ fn limit_to_value(limit: rlim_t, multiplier: rlim_t, span: Span) -> Result<Value
}
/// Get maximum length of all flag descriptions
fn max_desc_len(call: &Call, print_all: bool) -> usize {
fn max_desc_len(
call: &Call,
engine_state: &EngineState,
stack: &mut Stack,
print_all: bool,
) -> Result<usize, ShellError> {
let mut desc_len = 0;
let mut unit_len = 0;
for res in RESOURCE_ARRAY.iter() {
if !print_all && !call.has_flag(res.name) {
if !print_all && !call.has_flag(engine_state, stack, res.name)? {
continue;
}
@ -288,7 +293,7 @@ fn max_desc_len(call: &Call, print_all: bool) -> usize {
}
// desc.len() + unit.len() + '-X)'.len()
desc_len + unit_len + 3
Ok(desc_len + unit_len + 3)
}
/// Fill `ResourceInfo` to the record entry
@ -359,18 +364,20 @@ fn set_limits(
/// Print limits
fn print_limits(
call: &Call,
engine_state: &EngineState,
stack: &mut Stack,
print_all: bool,
soft: bool,
hard: bool,
) -> Result<PipelineData, ShellError> {
let mut output = Vec::new();
let mut print_default_limit = true;
let max_len = max_desc_len(call, print_all);
let max_len = max_desc_len(call, engine_state, stack, print_all)?;
for res in RESOURCE_ARRAY.iter() {
if !print_all {
// Print specified limit.
if !call.has_flag(res.name) {
if !call.has_flag(engine_state, stack, res.name)? {
continue;
}
}
@ -527,9 +534,9 @@ impl Command for ULimit {
call: &Call,
_input: PipelineData,
) -> Result<PipelineData, ShellError> {
let mut soft = call.has_flag("soft");
let mut hard = call.has_flag("hard");
let all = call.has_flag("all");
let mut soft = call.has_flag(engine_state, stack, "soft")?;
let mut hard = call.has_flag(engine_state, stack, "hard")?;
let all = call.has_flag(engine_state, stack, "all")?;
if !hard && !soft {
// Set both hard and soft limits if neither was specified.
@ -541,7 +548,7 @@ impl Command for ULimit {
let mut set_default_limit = true;
for res in RESOURCE_ARRAY.iter() {
if call.has_flag(res.name) {
if call.has_flag(engine_state, stack, res.name)? {
set_limits(&limit_value, res, soft, hard, call.head)?;
if set_default_limit {
@ -558,7 +565,7 @@ impl Command for ULimit {
Ok(PipelineData::Empty)
} else {
print_limits(call, all, soft, hard)
print_limits(call, engine_state, stack, all, soft, hard)
}
}