Fix bug in extracting variable values containing | #81
Conversation
| @@ -6,17 +6,17 @@ function __fzf_extract_var_info --argument-names variable_name set_show_output - | |||
| # $variable_name[ | |||
| string match --entire --regex "^\\\$$variable_name(?:: set|\[)" <$set_show_output | | |||
There was a problem hiding this comment.
Self-note for later: why are 3 \s necessary to escape the first $? Well, the last one is needed to prevent fish from starting a variable substitution. Then, to prevent the regex library from interpreting the $ as an anchor, we need to prefix it with a \. But to prevent that \ from applying to the now-literal $, we need to escape it as well with another \.
|
|
||
| # From the lines of values, keep only the index and value, replacing... | ||
| # $variable_name[1]: length=14 value=|variable_value| | ||
| # ...with... | ||
| # [1] variable_value | ||
| string replace --regex "^\\\$$variable_name(\[.+\]).+\|(.+)\|\$" '\$1 \$2' | ||
| string replace --regex "^\\\$$variable_name(\[\d+\]).+?\|(.+)\|\$" '\$1 \$2' |
There was a problem hiding this comment.
The bug fix is here: make the .+ that comes after the first capturing group non-greedy by appending a ?.
A minor unrelated change is using \d to match inside the [ ] to make it more obvious that it's supposed to be index numbers.
|
Just noticed this in the release notes. I remember using non-greedy matching sometime in the original PR, but it seems to be lost. Anyway, thanks for fixing it! |
The bug happens whenever the variable being previewed contains a |. What happens is that the third regex used in __fzf_extract_var_info is greedy and will over-remove text up to the second to last |. For example: $ set variable "a | b | c | d" $ __fzf_extract_var_info variable (set --show | psub) set in global scope, unexported, with 1 elements [1] d By making the third regex lazy, it now works properly: $ set variable "a | b | c | d" $ __fzf_extract_var_info variable (set --show | psub) set in global scope, unexported, with 1 elements [1] a | b | c | d Additionally, I've added a Fishtape test to make debugging these tricky regexes more easily in the future, which I expect to need to do as the master branch of Fish has already changed the output of set --show.
The bug happens whenever the variable being previewed contains
|. What happens is that the third regex used in__fzf_extract_var_infois greedy and will over-remove text up to the second to last|. For example:By making the third regex lazy, it now works properly:
Additionally, I've added a Fishtape test to make debugging these tricky regexes more easily in the future, which I expect to need to do as the master branch of Fish has already changed the output of
set --show.