WIP: Parse multi-word parameters in command position #675
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…already do for aliases. Fixes zsh-users#674. WIP: One test fails: # commmand-parameter 1..8 ok 1 - [1,2] «$x» ok 2 - [4,13] «"argument"» ok 3 - [4,13] «"argument"» ok 4 - [14,14] «;» not ok 5 - [16,17] «$y» - expected (16 17 "precommand"), observed (16 17 "command"). ok 6 - [18,18] «;» ok 7 - [20,21] «$z» ok 8 - cardinality check
They fail as follows: # commmand-parameter 1..8 ok 1 - [1,2] «$x» ok 2 - [4,13] «"argument"» ok 3 - [4,13] «"argument"» ok 4 - [14,14] «;» not ok 5 - [16,17] «$y» - expected (16 17 "precommand"), observed (16 17 "command"). ok 6 - [18,18] «;» ok 7 - [20,21] «$z» ok 8 - cardinality check # parameter-value-contains-command-position1 1..2 not ok 1 - [1,7] «$foobar» - expected (1 7 "assign"), observed (1 7 "unknown_token"). ok 2 - cardinality check # parameter-value-contains-command-position2 1..2 not ok 1 - [1,2] «$y» - expected (1 2 "assign"), observed (1 2 "unknown_token"). ok 2 - cardinality check
Current test failures: Running test main # parameter-value-contains-command-position1 1..2 ok 1 - [1,7] «$foobar» not ok 2 - have 1 expectations and 2 region_highlight entries: «expected_region_highlight=( '1 7 assign' )» «region_highlight=( '0 7 assign' '0 7 assign' )» # parameter-value-contains-command-position2 1..2 ok 1 - [1,2] «$y» not ok 2 - have 1 expectations and 2 region_highlight entries: «expected_region_highlight=( '1 2 assign' )» «region_highlight=( '0 2 assign' '0 2 assign' )»
|
Pushed a few more commits. Now it passes tests except that it adds the style twice in the two new tests for #670. I still don't know if the patch is correct or not, though… |
|
I've pushed a revised version of the branch to danielsh/parameters-multi-word-machinery-v2. The changes are:
|
This was referenced Feb 20, 2020
Closed
That's #684, now merged. It supersedes this PR. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #674. Improves the behaviour for #670: there's no longer a
BUG:message on stderr, but the tests don't pass (the error is recorded in the log message). Conflicts with #667.The code is based on the aliases code. Some edge cases are probably missing.
In particular, I think what's happening is that in aliases
alias_styleis initialized toaliasbut in parameters,param_styleisn't analogously initialized, so that's why theassignstyle never gets set. Thereturnin_zsh_highlight_main_add_region_highlightmakesassignnot be recorded anywhere.Hints welcome.