Matthew Martin
48a20d067f
main: Break double-quoted-argument on command substitutions
2018-10-22 07:53:18 -05:00
Daniel Shahaf
6539f0d419
'main': Highlight named fd redirections.
...
Merge remote-tracking branch 'danielsh/i238-named-fd-redirection-v1'
* danielsh/i238-named-fd-redirection-v1:
'main': Tighten condition.
noop: Tweak condition at Matthew's suggestion
'main': Highlight named fd redirections.
2018-10-22 05:00:07 +00:00
Daniel Shahaf
7d961ba1e6
'main': Add a test for issue #237 .
2018-10-22 04:58:57 +00:00
Daniel Shahaf
ad3a6cb3c9
'main': Tighten condition.
...
Should rule out brace expansions such as '{foo,bar}' and '{10..20}'.
2018-10-22 04:56:50 +00:00
Daniel Shahaf
9870ccc505
noop: Tweak condition at Matthew's suggestion
2018-10-22 04:54:11 +00:00
Daniel Shahaf
38c794a978
'main': Highlight named fd redirections.
...
Fixes #238
2018-10-22 04:33:11 +00:00
Daniel Shahaf
de23e75946
minor: Fix the editor braces matching confusion prevention sentinel.
2018-10-22 04:27:18 +00:00
Matthew Martin
a3c9e7ebc7
main: Simplify insane alias checking
2018-10-21 14:59:52 -05:00
Matthew Martin
f71a17c58e
main: Highlight closing brackets
...
Closes #226
2018-10-21 12:10:07 -05:00
Matthew Martin
d0c23a68b3
main: Simplify proc_buf offset calculation
...
Fixes #347
2018-10-20 23:48:39 -05:00
Matthew Martin
7388adf4e8
main: Add alias tests
2018-10-20 20:57:45 -05:00
Matthew Martin
cb8c736a56
main: Run the entirety of aliases through the state machine
...
Fixes #540 #544 #552 #554 #555
2018-10-20 20:57:45 -05:00
Matthew Martin
2d4fe988ba
main: Rename parameters to simplify next diff
2018-10-20 20:18:46 -05:00
Matthew Martin
8f17e4e201
main: Add trivial condition and remove whitespace to simplify next diff
2018-10-20 20:18:46 -05:00
Daniel Shahaf
02f4a6b540
'main': Optionally ignore aliases in __type
2018-10-20 20:18:46 -05:00
Matthew Martin
b9d7fe5a43
main: Shift args rather than iterating over
...
No functional change. Prepares for running a full alias through the
state machine.
2018-10-20 20:18:46 -05:00
Daniel Shahaf
6898f71016
Add a test.
...
Related to https://github.com/zsh-users/zsh-syntax-highlighting/issues/549#issuecomment-431628338 and to #556 .
2018-10-21 00:26:34 +00:00
Daniel Shahaf
df8b2fb867
tests: Fix a failing test.
...
Update the test point for f3410c5862
(#264 ),
which changed the highlighting of aliases to consider what they resolve to.
Now the test file has both ${aliases[alias1]} and ${functions[alias1]},
the expectation is 'alias', and passes; thus:
Fixes #588 .
2018-10-18 23:48:17 +00:00
Daniel Shahaf
9d6ecea21c
Fix a long-standing bug in a unit test. This uncovers a regression.
...
The test never actually defined a function named 'alias1', not even
when zsh 5.4 warned it about this (see 9523d6d49c
,
which was wrong and is hereby reverted).
The test that's now failing has been filed as issue #558 .
2018-10-18 23:45:38 +00:00
Matthew Martin
47c2b7e185
main: Distinguish quoted/unquoted command substitutions
...
Closes #547 .
2018-10-13 09:37:09 -05:00
Matthew Martin
d6586e2a4f
main: Order precommand_options and add '-'
...
Fixes #499 .
2018-10-10 23:23:35 -05:00
Matthew Martin
31276c1b64
main: Avoid empty character classes
...
Avoids an error in pre-5.0.8: bad pattern: -[]#
2018-10-10 23:02:33 -05:00
Matthew Martin
07f259f653
main: Avoid null elision in _check_path
...
This could be triggered if BUFFER='\'.
2018-10-10 22:30:53 -05:00
Matthew Martin
e27e53b1ef
main: Highlight unknown precommand option as unknown-token
2018-10-10 22:30:51 -05:00
Matthew Martin
c6e3d216ec
main: Consolidate TOKENS_COMMANDSEPARATOR handling
...
No functional change.
2018-10-10 22:26:49 -05:00
Matthew Martin
5bb5703b0d
main: Move TOKENS_CONTROL_FLOW handling into command word branch
...
No functional change.
2018-10-10 22:26:49 -05:00
Matthew Martin
dea05e44e6
main: Recognize more redirection and array assignment parse errors
...
() ) } are invalid as a redirection target.
() } are invalid in an array assignment.
2018-10-10 22:26:49 -05:00
Matthew Martin
2f03b6d704
main: Do not highlight a redirection target as an option
2018-10-10 22:26:49 -05:00
Matthew Martin
b075147888
main: Consolidate conditionals together.
...
No functional change.
2018-10-10 22:26:49 -05:00
Matthew Martin
9289a57de0
main: Remove already_assigned
2018-10-10 22:26:49 -05:00
Matthew Martin
c76daac095
main: Move start_pos=$end_pos to the beginning of the loop
...
This allows for use of continue.
2018-10-10 22:26:49 -05:00
Matthew Martin
de28e20fbc
main: Simplify this_word next_word updating
2018-10-10 22:26:49 -05:00
Matthew Martin
c05ebf762c
main: Do not recognize always as a reserved word in a redirection
2018-10-10 22:26:49 -05:00
Matthew Martin
ae5b9b2dc9
main: Set redirection style when recognizing the redirection
2018-10-10 22:26:49 -05:00
Matthew Martin
df431eeee8
main: Recognize repeat with the other reserved words
2018-10-10 22:26:49 -05:00
Matthew Martin
3ddb974a3d
main: Remove needless code
...
The below code handles this case.
2018-10-10 22:26:49 -05:00
Matthew Martin
b6e0aeb380
main: Use unknown-token when the token type is unknown
2018-10-10 22:26:49 -05:00
Matthew Martin
4748f9bd3d
main: Add alias tests
2018-10-10 22:26:47 -05:00
Matthew Martin
e3edddd8ec
main: alias style overrides precommand style
2018-10-10 22:20:19 -05:00
Matthew Martin
c138123397
main: Move alias handling up.
...
This will set style=alias before the great fork.
2018-10-10 22:20:19 -05:00
Matthew Martin
57386f30ae
main: Recursively expand aliases
2018-10-10 22:20:19 -05:00
Matthew Martin
e1ecf950e2
main: Do path expanstion after alias expansion
2018-10-10 22:20:19 -05:00
Matthew Martin
f46b148c52
main: Only expand aliases in command position
2018-10-10 22:20:19 -05:00
Matthew Martin
99d7235c2b
main: Add test for an alias to a redirection
2018-10-10 22:20:19 -05:00
Matthew Martin
05a55108c9
main: Expand aliases before looking for redirections
2018-10-10 22:20:19 -05:00
Daniel Shahaf
e43e4fd2c7
'main': Fix $flags_sans_argument for 'nice'.
...
Follow-up to 2c15b0e996
("Learn $flags_sans_arguments…").
2018-10-10 22:20:19 -05:00
Daniel Shahaf
a56c33c3be
Bump copyright years.
2018-10-10 22:20:19 -05:00
Daniel Shahaf
005179ed8e
'main': Update $this_word state with our inferences.
...
Found by code inspection.
2018-10-10 22:20:19 -05:00
Daniel Shahaf
0709520597
No functional change.
...
Follow-up to 1fee620e62
.
2018-10-10 22:20:19 -05:00
Daniel Shahaf
f7ac43cd49
'main': Unify $ZSH_HIGHLIGHT_TOKENS_PRECOMMANDS and $precommand_options.
2018-10-10 22:20:19 -05:00
Daniel Shahaf
31ceaed4f4
'main': Highlight array parameters in command position.
2018-10-10 22:20:18 -05:00
Daniel Shahaf
ad6261fbca
'main': Use a more robust way of testing for $parameters' availability.
2018-10-10 22:19:41 -05:00
Daniel Shahaf
3a33ac1d20
'main': Break out a new helper function for readability.
2018-10-10 22:19:41 -05:00
Daniel Shahaf
f3425e18fe
'main': Let _zsh_highlight_main__type return false on failure.
2018-10-10 22:19:41 -05:00
Daniel Shahaf
82c39716eb
'main': Write the "remainder" of the sentence in a comment. No functional change.
2018-10-10 22:19:41 -05:00
Daniel Shahaf
a2e993c59f
'main': Learn $flags_sans_arguments and use that to parse '-xy foo' correctly where -x takes no argument and -y does.
2018-10-10 22:19:41 -05:00
Daniel Shahaf
bee115f797
'main': Correct a comment.
2018-10-10 22:19:41 -05:00
Daniel Shahaf
7f5e11e38b
'main': Remove superfluous variable. No functional change.
2018-10-10 22:19:41 -05:00
Daniel Shahaf
78be8f611f
'main': Highlight 'doas'.
...
Fixes #365 .
2018-10-10 22:19:41 -05:00
Daniel Shahaf
8b11ca087e
'main': Highlight 'nice'.
...
Fixes #168 .
2018-10-10 22:19:41 -05:00
Daniel Shahaf
5694221939
'main': Highlight the 'command' precommand.
...
Fixes #343 .
2018-10-10 22:19:41 -05:00
Daniel Shahaf
4c7db4e886
'main': Update state machine docs. No functional change.
2018-10-10 22:19:41 -05:00
Daniel Shahaf
add2ac59fc
'main': Permit $flags_with_argument to be empty.
2018-10-10 22:19:41 -05:00
Daniel Shahaf
6e8984e2ec
'main': Make sudo handling more generic.
...
Part of issue #343 .
2018-10-10 22:19:41 -05:00
Daniel Shahaf
dbdebfaaa5
'main': Following up to the last commit, also highlight braced parameter expansions: «${foo}».
2018-10-10 22:19:41 -05:00
Daniel Shahaf
bf055f7df2
'main': Fix the last commit's issue concerning parameter expansion at command word.
2018-10-10 22:19:36 -05:00
Daniel Shahaf
76d61360a7
'main': New XFail test for parameter expansion at command word.
2018-10-09 23:28:54 -05:00
Daniel Shahaf
f3410c5862
'main': Expand aliases first. (Issue #264.)
...
This commit causes an alias to an invalid command to be highlighted as an error
(unknown-token).
2018-10-09 23:28:54 -05:00
Daniel Shahaf
565463ca8f
'main': Add regression test for an unclosed backtick substitution
2018-09-30 16:26:01 -04:00
Matthew Martin
e86f75a840
main: Highlight {command,process} substitution delimiters
2018-09-30 16:26:01 -04:00
Matthew Martin
22839d08ef
main: Return 0 if braces_stack is empty
...
This allows a caller to know if the command or process substitution is
complete.
2018-09-30 15:32:21 -04:00
Matthew Martin
472c71c1fa
main: Support the glob_assign option
2018-09-30 15:32:21 -04:00
Matthew Martin
9616bfdb20
main: Ignore zsh 5.0.8 off by one bug in tests
2018-09-30 15:32:21 -04:00
Matthew Martin
8a93b852ca
main: Add test for command substitution in assignment
2018-09-30 15:32:21 -04:00
Matthew Martin
932eb380e2
main: Highlight the value of an assignment
2018-09-30 15:32:19 -04:00
Matthew Martin
c06e5e95dc
main: Correct array assignment check
2018-09-30 15:31:48 -04:00
Matthew Martin
12e01336f1
main: Start _highlight_argument at $1
...
No functional change.
2018-09-30 15:21:20 -04:00
Matthew Martin
13d332af95
main: Make _check_path's argument explicit
...
No functional change.
2018-09-30 15:21:20 -04:00
Matthew Martin
57e451b531
main: Add test for unclosed command substitution
2018-09-30 15:21:20 -04:00
Matthew Martin
49dbb05791
main: Add test for =( ) process substitution
2018-09-30 15:21:20 -04:00
Matthew Martin
c0e64fe131
main: Highlight =( ) process substitutions
2018-09-30 15:21:19 -04:00
Matthew Martin
73640b79ea
main: Change conditional to a switch
...
Prepares for next commit. No functional change.
2018-09-30 14:59:59 -04:00
Matthew Martin
beae08776a
main: Add test for embedded process substitution
2018-09-30 14:59:59 -04:00
Matthew Martin
08d4401fae
main: Highlight <( ) and >( ) process substitutions
...
Fixes #494
2018-09-30 14:59:57 -04:00
Matthew Martin
3ac7d1c785
main: Add test for nested backticks; summon Cthulhu
2018-09-30 14:59:38 -04:00
Matthew Martin
9db393309e
main: Recurse into backtick command substitutions
2018-09-30 14:59:36 -04:00
Matthew Martin
c40c72c386
main: Track if $buf has the end of $BUFFER
...
This will allow for correct path_prefix highlighting in backticks.
2018-09-30 14:59:04 -04:00
Matthew Martin
b75169597e
main: Highlight command substitutions
2018-09-30 14:58:08 -04:00
Matthew Martin
ce592bd5c7
main: Move highlighting to _main_paint
...
This allows for callees to prepend highlights before $reply after the
length of the feature (e.g. command substution) is known.
2018-09-30 14:57:21 -04:00
Matthew Martin
ead8f8a1fc
main: Split highlighting code into another function
...
This will allow for highlighting $( ) and similar.
2018-09-30 14:55:28 -04:00
Matthew Martin
81e89a8800
main: Reorder declarations for next commit
...
No functional change.
2018-09-30 14:35:52 -04:00
Matthew Martin
dbce7317c7
main: Add buf_offset variable
...
No functional change.
2018-09-30 14:35:52 -04:00
Matthew Martin
49cc5e25b8
main: Simplify interface to __stack_pop
2018-09-30 14:35:52 -04:00
Matthew Martin
b1eb0358fa
main: Move fallback calculation to a function
...
No functional change.
2018-09-30 14:35:52 -04:00
Matthew Martin
8a0ffe1c43
main: Allow for patterned fallbacks
2018-09-30 14:35:52 -04:00
Matthew Martin
2fd7fbc3c2
main: Do not skip over backslash floowed by space or tab
...
Fixes #539 .
2018-09-29 21:33:39 -04:00
Matthew Martin
1eedb23c65
main: Fix blacklist dirs check when there is more than one element
2018-09-24 07:09:08 -05:00
Sam Jorna (wraeth)
47d6dac133
main-highlighter: Probe dirs after blacklist
...
Move tests on the highlight path until after the blacklist is checked so
that blacklisted paths are not tested. This should prevent hangs on dead
remote filesystems provided the path is blacklisted in
X_ZSH_HIGHLIGHT_DIRS_BLACKLIST.
Updated tests to 'default' highlight as the blacklist is now checked
before the path is tested.
Bug: https://github.com/zsh-users/zsh-syntax-highlighting/issues/528
2018-08-31 13:04:52 +10:00
Daniel Shahaf
5b539663c0
Add a regression test for a problem seen during development.
...
The «=(<foo)» construct was highlighted in blue (globbing?) from the '>' to the ')'.
2018-05-12 00:04:19 +00:00
Matthew Martin
e4fffa4de5
main: Correct dollar-quoted-argument-unclosed fallback typo
2018-03-16 17:18:31 -05:00