c6e3d216ec
main: Consolidate TOKENS_COMMANDSEPARATOR handling
...
No functional change.
2018-10-10 22:26:49 -05:00
5bb5703b0d
main: Move TOKENS_CONTROL_FLOW handling into command word branch
...
No functional change.
2018-10-10 22:26:49 -05:00
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
2f03b6d704
main: Do not highlight a redirection target as an option
2018-10-10 22:26:49 -05:00
b075147888
main: Consolidate conditionals together.
...
No functional change.
2018-10-10 22:26:49 -05:00
9289a57de0
main: Remove already_assigned
2018-10-10 22:26:49 -05:00
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
de28e20fbc
main: Simplify this_word next_word updating
2018-10-10 22:26:49 -05:00
c05ebf762c
main: Do not recognize always as a reserved word in a redirection
2018-10-10 22:26:49 -05:00
ae5b9b2dc9
main: Set redirection style when recognizing the redirection
2018-10-10 22:26:49 -05:00
df431eeee8
main: Recognize repeat with the other reserved words
2018-10-10 22:26:49 -05:00
3ddb974a3d
main: Remove needless code
...
The below code handles this case.
2018-10-10 22:26:49 -05:00
b6e0aeb380
main: Use unknown-token when the token type is unknown
2018-10-10 22:26:49 -05:00
4748f9bd3d
main: Add alias tests
2018-10-10 22:26:47 -05:00
e3edddd8ec
main: alias style overrides precommand style
2018-10-10 22:20:19 -05:00
c138123397
main: Move alias handling up.
...
This will set style=alias before the great fork.
2018-10-10 22:20:19 -05:00
57386f30ae
main: Recursively expand aliases
2018-10-10 22:20:19 -05:00
e1ecf950e2
main: Do path expanstion after alias expansion
2018-10-10 22:20:19 -05:00
f46b148c52
main: Only expand aliases in command position
2018-10-10 22:20:19 -05:00
99d7235c2b
main: Add test for an alias to a redirection
2018-10-10 22:20:19 -05:00
05a55108c9
main: Expand aliases before looking for redirections
2018-10-10 22:20:19 -05:00
e43e4fd2c7
'main': Fix $flags_sans_argument for 'nice'.
...
Follow-up to 2c15b0e996
2018-10-10 22:20:19 -05:00
a56c33c3be
Bump copyright years.
2018-10-10 22:20:19 -05:00
005179ed8e
'main': Update $this_word state with our inferences.
...
Found by code inspection.
2018-10-10 22:20:19 -05:00
0709520597
No functional change.
...
Follow-up to 1fee620e62
2018-10-10 22:20:19 -05:00
f7ac43cd49
'main': Unify $ZSH_HIGHLIGHT_TOKENS_PRECOMMANDS and $precommand_options.
2018-10-10 22:20:19 -05:00
31ceaed4f4
'main': Highlight array parameters in command position.
2018-10-10 22:20:18 -05:00
ad6261fbca
'main': Use a more robust way of testing for $parameters' availability.
2018-10-10 22:19:41 -05:00
3a33ac1d20
'main': Break out a new helper function for readability.
2018-10-10 22:19:41 -05:00
f3425e18fe
'main': Let _zsh_highlight_main__type return false on failure.
2018-10-10 22:19:41 -05:00
82c39716eb
'main': Write the "remainder" of the sentence in a comment. No functional change.
2018-10-10 22:19:41 -05:00
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
bee115f797
'main': Correct a comment.
2018-10-10 22:19:41 -05:00
7f5e11e38b
'main': Remove superfluous variable. No functional change.
2018-10-10 22:19:41 -05:00
78be8f611f
'main': Highlight 'doas'.
...
Fixes #365 .
2018-10-10 22:19:41 -05:00
8b11ca087e
'main': Highlight 'nice'.
...
Fixes #168 .
2018-10-10 22:19:41 -05:00
5694221939
'main': Highlight the 'command' precommand.
...
Fixes #343 .
2018-10-10 22:19:41 -05:00
4c7db4e886
'main': Update state machine docs. No functional change.
2018-10-10 22:19:41 -05:00
add2ac59fc
'main': Permit $flags_with_argument to be empty.
2018-10-10 22:19:41 -05:00
6e8984e2ec
'main': Make sudo handling more generic.
...
Part of issue #343 .
2018-10-10 22:19:41 -05:00
dbdebfaaa5
'main': Following up to the last commit, also highlight braced parameter expansions: «${foo}».
2018-10-10 22:19:41 -05:00
bf055f7df2
'main': Fix the last commit's issue concerning parameter expansion at command word.
2018-10-10 22:19:36 -05:00
76d61360a7
'main': New XFail test for parameter expansion at command word.
2018-10-09 23:28:54 -05:00
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
565463ca8f
'main': Add regression test for an unclosed backtick substitution
2018-09-30 16:26:01 -04:00
e86f75a840
main: Highlight {command,process} substitution delimiters
2018-09-30 16:26:01 -04:00
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
472c71c1fa
main: Support the glob_assign option
2018-09-30 15:32:21 -04:00
9616bfdb20
main: Ignore zsh 5.0.8 off by one bug in tests
2018-09-30 15:32:21 -04:00
8a93b852ca
main: Add test for command substitution in assignment
2018-09-30 15:32:21 -04:00
932eb380e2
main: Highlight the value of an assignment
2018-09-30 15:32:19 -04:00
c06e5e95dc
main: Correct array assignment check
2018-09-30 15:31:48 -04:00
12e01336f1
main: Start _highlight_argument at $1
...
No functional change.
2018-09-30 15:21:20 -04:00
13d332af95
main: Make _check_path's argument explicit
...
No functional change.
2018-09-30 15:21:20 -04:00
57e451b531
main: Add test for unclosed command substitution
2018-09-30 15:21:20 -04:00
49dbb05791
main: Add test for =( ) process substitution
2018-09-30 15:21:20 -04:00
c0e64fe131
main: Highlight =( ) process substitutions
2018-09-30 15:21:19 -04:00
73640b79ea
main: Change conditional to a switch
...
Prepares for next commit. No functional change.
2018-09-30 14:59:59 -04:00
beae08776a
main: Add test for embedded process substitution
2018-09-30 14:59:59 -04:00
08d4401fae
main: Highlight <( ) and >( ) process substitutions
...
Fixes #494
2018-09-30 14:59:57 -04:00
3ac7d1c785
main: Add test for nested backticks; summon Cthulhu
2018-09-30 14:59:38 -04:00
9db393309e
main: Recurse into backtick command substitutions
2018-09-30 14:59:36 -04:00
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
b75169597e
main: Highlight command substitutions
2018-09-30 14:58:08 -04:00
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
ead8f8a1fc
main: Split highlighting code into another function
...
This will allow for highlighting $( ) and similar.
2018-09-30 14:55:28 -04:00
81e89a8800
main: Reorder declarations for next commit
...
No functional change.
2018-09-30 14:35:52 -04:00
dbce7317c7
main: Add buf_offset variable
...
No functional change.
2018-09-30 14:35:52 -04:00
49cc5e25b8
main: Simplify interface to __stack_pop
2018-09-30 14:35:52 -04:00
b1eb0358fa
main: Move fallback calculation to a function
...
No functional change.
2018-09-30 14:35:52 -04:00
8a0ffe1c43
main: Allow for patterned fallbacks
2018-09-30 14:35:52 -04:00
2fd7fbc3c2
main: Do not skip over backslash floowed by space or tab
...
Fixes #539 .
2018-09-29 21:33:39 -04:00
1eedb23c65
main: Fix blacklist dirs check when there is more than one element
2018-09-24 07:09:08 -05:00
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
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
e4fffa4de5
main: Correct dollar-quoted-argument-unclosed fallback typo
2018-03-16 17:18:31 -05:00
5e9b7c4650
main: Add test for previous
2018-03-10 10:25:18 -06:00
d2c8f3a56d
main: Fix end of buffer check for path_prefix with non-null PREBUFFER
2018-03-10 10:25:18 -06:00
2c0c75a8ee
driver, main: Add -z to autoload calls
2018-03-06 11:35:40 -06:00
15e288a25c
main: Mark ZSH_HIGHLIGHT_DIRS_BLACKLIST experimental
2018-02-17 20:29:30 -06:00
6713727742
main: Add ZSH_HIGHLIGHT_DIRS_BLACKLIST
...
Closes #379 .
2018-02-17 20:29:30 -06:00
90b09f88ee
main: Move - to end of character class
...
Closes #472
2018-02-11 11:10:09 -06:00
9706af4b81
main: Simplify for next commit; no functional change
2018-02-11 11:10:08 -06:00
be26017e39
regexp: Add test for subexpression match
...
Closes #497
2018-02-11 09:58:00 -06:00
a9be0975c8
tests: Directly diff expected_region_highlight against region_highlight
2018-02-10 14:49:07 -06:00
622358f32d
main: Test suffix aliases if zsh/parameter is available
2018-02-10 14:20:25 -06:00
fdca2ef714
main: Fix off by one errors in quote helper functions
2018-02-10 14:20:25 -06:00
e13074528f
main: Do not highlight for regions that end before the start of BUFFER
2018-02-10 14:20:25 -06:00
cc662371b1
main: Update test for issue #501 XFAIL
2018-02-10 13:23:42 -06:00
1f1e629290
regexp: Add missing local for arrays match mbegin mend
...
See #497 .
2018-01-22 21:42:14 -06:00
03692831ad
'main': Don't highlight bare '$foo' as a filename, as it's a parameter expansion.
...
Fixes #474 .
2018-01-21 06:55:31 +00:00
382be9096d
main: Add XFAIL to redirections2 for process-substitution #494
2018-01-20 20:32:34 -06:00
8046c33b54
'main': Do not expand special parameters. Fixes #489 .
...
Adding «(e)» to the first subscript is a no-op: the subscript is known
to be safe due to the previous line.
2018-01-20 00:36:16 +00:00
f16e858f0c
main: Highlight backticks in double quotes
2018-01-19 18:19:07 -06:00
8d2955f51a
main: Consolidate } handling
...
No functional change.
2018-01-19 18:19:07 -06:00
18e214ee5b
main: Add test for quotes in options
2018-01-19 18:19:07 -06:00
6d133a0eb0
main: Highlight options as base_style
...
This means --foo="bar" will have quotes highlighted.
2018-01-19 18:19:07 -06:00
a65a07fae4
main: Correct typos
2018-01-19 08:00:25 -06:00
e48af35753
main: Only highlight characters special to globbing as globbing
2018-01-18 20:16:05 -06:00
604075aa90
main: Use =~ for globbing test
...
This will set MATCH as needed for the next commit
2018-01-18 20:08:14 -06:00
c1a048a084
main: Only highlight one base_style in _highlight_arguments
...
Closes #481
2018-01-18 19:37:41 -06:00
6835121eaf
main: Have helper functions return highlights in reply
...
This allows _highlight_arguments to put things in region_highlight prior
to the highlights decided by the helper functions, but decide on what
that prior highlight should be after the helpers have run.
2018-01-18 19:36:36 -06:00
6cc861fbad
main: Explicitly pass $style to _highlight_path_separators
2018-01-18 19:36:36 -06:00
0458b0c16f
'main': Don't match redirection operators in command substitutions as <-> number range globs. Fixes #483 .
2018-01-19 01:26:34 +00:00
901063aa0f
'main': Add a regression test for issue #483 , concerning «: $(<foo)».
2018-01-15 22:31:59 +00:00
f064b17d25
'main': Add an explicit test for escaped single quotes within single quotes, «'foo'\''bar'».
2018-01-13 15:45:41 +00:00
d17417ec1b
main: Highlight unclosed backtick subshells
2018-01-07 23:18:25 -06:00
987b743646
'main': Fix highlighting of «<->»-style numeric globs.
...
Found-by: Matthew Martin
2018-01-08 05:13:52 +00:00
df0f448586
main: Highlight path after globbing checks
...
Closes #468 .
2018-01-05 00:04:17 -06:00
2181247ae1
'main': Add a regression test for issue #474 .
2018-01-01 05:05:10 +00:00
8652a8f4e4
Bump copyright years.
2017-12-25 08:42:30 +00:00
bdbe214453
main: Add *-quoted-argument-unclosed styles
...
Closes #277 .
2017-12-24 00:03:55 -06:00
ff61a496b5
'main': Add a regression test for issue #468 .
2017-12-23 23:04:32 +00:00
572ca51b1f
main: Add tests
2017-12-23 14:45:49 -06:00
dc1b2f6fa4
main: Highlight partially quoted arguments correctly
...
Closes #130
2017-12-23 14:45:49 -06:00
25ae1c0121
main: Add ' helper function
2017-12-23 14:45:47 -06:00
dcb115c74c
main: Make " and $' helper functions responsible for highlighting quote
2017-12-20 15:52:03 -06:00
f623b07fb0
main: Remove trailing whitespace
2017-12-20 15:52:03 -06:00
ab1013ae0d
main: A redirection token is an invalid redirection target
...
Closes #466 .
2017-12-19 23:01:42 -06:00
b07ada1255
driver: Run under emulate -L zsh and add zsyh_user_options
2017-12-16 09:33:51 -06:00
3e56294543
tests: Avoid using new zmodload flags
...
Unbreaks build on pre-5.4.
2017-12-14 20:58:32 -06:00
2919679ee8
tests: Skip when zsh/pcre is not available
2017-12-14 20:44:54 -06:00
ce1be4153d
'main': Add tests for «ls \~» and for not performing parameter expansion on the command word.
...
This is a followup to the last commit, which was about issue #328 .
These tests are taken from the original #328 pull request, with updated
expectations where applicable.
Review-by: Matthew Martin
2017-12-15 02:35:10 +00:00
2411195c20
main: Expand paths before removing quoting
...
Fixes highlighting of `ls \~`. Closes #328 .
2017-12-12 07:58:35 -06:00
6a6d40208c
main: Add fallback for useroptions if zsh/parameter is absent
2017-12-11 07:26:54 -06:00
4e6f60063f
Add regexp highlighter
2017-12-09 16:17:22 -06:00
fb948f5331
noop: Add comments.
2017-12-07 03:06:56 +00:00
1ad5c1f40f
Followup to parents: Restore sudo-* tests on platforms that don't have sudo.
...
Travis (as currently configured) is one such platform.
2017-12-07 01:16:02 +00:00
8d37377644
Followup to last: Don't require 'sudo' to test prefix redirections.
2017-12-07 01:04:13 +00:00
d04c62a224
tests: Add skips for tests that require sudo
2017-12-06 18:34:56 -06:00
26a82113b0
'main': Highlight 'sudo' correctly when it's not installed.
...
No test because _zsh_highlight_main__type() falls back to 'type -w' which runs
'rehash' implicitly, so on systems where 'sudo' is installed it's not possible
to simulate its being absent.
Test by forcing _zsh_highlight_main__type() to return 'none' when the
argument is [[ $1 == 'sudo' ]], and: (1) Run 'make test' and confirm
that all tests either pass, or fail and the first test point that fails
is one that expects "sudo" at command position to be highlighted as
'command'; (2) In an interactive zsh, 'sudo' at command position is
highlighted as an error.
2017-12-07 00:00:13 +00:00
ecdda36ef5
brackets: Ignore quotes
...
Closes #112 . Closes #138 .
2017-11-24 16:39:31 -06:00
7177ba005f
main: Split declaration and assignment
...
Unbreak build for 5.0.8 and earlier.
2017-11-24 16:35:25 -06:00
2a50614579
main: Save user options in a single variable
2017-11-24 16:07:44 -06:00
749b30221d
'main': Skip tests that break on msys2
...
Closes #382 .
2017-11-06 07:11:55 -06:00
038409c10d
tests: Run tests with WARN_CREATE_GLOBAL
2017-11-05 15:04:49 -06:00
1f77ed8369
brackets: Use idiomatic set check
2017-11-02 20:08:28 -05:00
9dcfacc4a5
brackets: Disallow negative nesting level
2017-11-02 20:08:28 -05:00
ac90970edc
brackets: Don't call _zsh_highlight_add_highlight with empty style
2017-11-02 20:08:28 -05:00
f547f7768c
brackets: Add test for highlighting errors with no styles
2017-11-02 20:08:28 -05:00
5436d3e5fc
tests: Remove superfluous comment.
...
The functions can remain defined because, nowadays, the test harness
runs each test in a subshell; but that's a well-known property of the
test harness so need not be mentioned explicitly.
Inspired by discussion on issue #443 .
2017-09-11 18:45:35 +00:00
73cb832702
'main': Highlight mismatched 'if'/'fi'.
...
Also 'then'/'elif'/'else'.
2017-03-05 17:33:36 +00:00
237f89ad62
'main': Don't consider «$*» a glob.
2017-02-11 23:49:13 +00:00
9523d6d49c
tests: zsh 5.4-to-be compatibility: Set a new "I am shooting myself in the foot" option.
2017-01-25 19:35:34 +00:00
76ea9e1df3
'main': Highlight possible history expansions in double-quoted strings.
2016-11-22 07:09:29 +00:00
9396ad5c5f
'main': Fix highlighting of comments followed by non-comments (on a subsequent line).
...
Merge remote-tracking branch 'upstream/pr/385'
* upstream/pr/385:
'main': Add regression test for previous commit.
'main': Fix bug: no start_pos=$end_pos in comment short path
Fixes #385 .
2016-11-02 15:54:56 +00:00
347cf0eb06
'main': Add regression test for previous commit.
2016-11-02 15:54:02 +00:00
5625e30b87
'main': Fix bug: no start_pos=$end_pos in comment short path
2016-11-02 10:58:15 +01:00
fed37a90ac
'main': Fix a bug concerning command word with embedded colon-space sequences.
...
Such a command word would, if not valid, fall through to the `type -w` case,
where the output would be misparsed, consequently the forward-compatible [arg0]
style would be used.
2016-11-02 03:16:45 +00:00
035d3eb095
Follow-up to 28d7056a7a06: Fix test expectations.
2016-10-22 17:46:42 +00:00
28d7056a7a
'main': Escape '!' within double-quoted strings.
2016-10-19 23:56:25 +00:00
7d38d07255
'main': Followup to fdaeec45146b: Update comment.
...
That revision was itself a followup to 51614ca2c9
2016-10-17 20:46:46 +00:00
094329eb14
'main': Introduce style fallback for the command word.
...
Fixes #316 .
* danielsh/i316-v2:
'main': Enable fallback to the 'arg0' style.
'main': Set fallback style for the 'arg0' style.
2016-09-28 13:25:05 +00:00
bccc3dc269
'main': Enable fallback to the 'arg0' style.
2016-09-28 13:22:29 +00:00
b4537a972e
'main': Set fallback style for the 'arg0' style.
...
The fallback style name uses '_' in anticipation of a future auto-fallback
feature keyed on style names.
'arg0' was previously known as 'commandtypefromthefuture'.
2016-09-28 13:22:09 +00:00
79198759b3
tests: Also test arguments to an anonymous function.
2016-09-25 18:08:45 +00:00
dd51b7bebe
Merge remote-tracking branch 'upstream/pr/374' into HEAD
...
* upstream/pr/374:
'main': Directly count spaces to skip, don't leverage proc_buf length
2016-09-25 15:58:35 +00:00
15461e7d21
'main': Directly count spaces to skip, don't leverage proc_buf length
...
Main highlighter run on itself, on the optimized version:
- optimized (8 runs, 3 last noted):
1.1201650000
1.1074430000
1.1263810000
- unoptimized (8 runs, 3 last noted):
1.5746400000
1.5115250000
1.5155440000
Average difference: 0.415907
2016-09-25 17:52:56 +02:00
44ef6e38e5
'main': Highlight several more special (non-alphabetic) parameters.
2016-09-25 14:51:02 +00:00
4afe670f7a
'main': Highlight shell's PID ($$) inside double quotes.
2016-09-25 14:40:58 +00:00
c3913e0d8e
'main': Highlight command substitutions inside double quotes.
...
Part of issue #139 .
2016-09-25 14:40:02 +00:00
4fc35362ee
'main': Permit subshells to end at command position.
...
Fixes #344 .
2016-09-25 12:06:39 +00:00
2bb8f0703d
'main': Highlight mismatched foreach/end.
...
Fixes #96 .
2016-09-25 11:52:15 +00:00
b2733a64da
'main': Highlight mismatched do/done.
2016-09-25 11:38:54 +00:00
2755438e80
'main': Yet another test for mismatched braces.
2016-09-25 11:38:52 +00:00
c6b6513ac0
'main' / *_check_path: Precompute $#BUFFER and use it for speed gain
...
Running main highlighter on itself (both runs are on the optimized
version):
- clean (8 runs, last 3 noted):
1.7007670000
1.7330720000
1.7038810000
- optimized (8 runs, last 3 noted):
1.5007230000
1.5142960000
1.4973320000
Average difference: 0.208456
When parsing main-highlighter with itself, the *_check_path function is
called 426 times. Note that there are 686 region_highlight resulting
entries.
2016-09-25 12:35:28 +02:00
a053768627
dev tools: Remove a superfluous empty line.
2016-09-25 08:11:01 +00:00
e5782e4ddf
'main': Highlight 'always' blocks.
...
Fixes #335 .
2016-09-25 08:11:01 +00:00
8bf423d16d
'main': Don't find command positions within multiline array literals.
...
Fixes #333 .
2016-09-24 17:55:18 +00:00
a4196eda5e
'main': Restore compatibility with zsh-4.3.14 and older (after e3182c18de8f).
...
Fixes #368 .
2016-09-23 15:55:06 +00:00
6f91850a01
'main': Highlight first command word in named functions defined in the sh syntax when MULTI_FUNC_DEF is set.
...
Fixes a subset of issue #237 .
2016-09-23 06:37:26 +00:00
2fabf7ca64
'main': More tests for mismstached parentheses and braces.
2016-09-22 11:12:42 +00:00
51b9d79c3b
'main': Highlight mismatched parentheses and braces.
2016-09-22 11:12:42 +00:00
02807f1826
'main': Support the IGNORE_BRACES option.
...
This is related to a future "unbalanced { ( ) }" check for issue #344 .
2016-09-22 03:45:04 +00:00
a8a6384356
'main': Add tests for the IGNORE_BRACES option.
...
Also adds an XFail test for balanced braces for issue #344 .
2016-09-22 03:41:53 +00:00
fdaeec4514
'main': Followup to 51614ca2c994: Run cheaper conditions first.
...
This was suggested on #355 .
2016-09-08 19:09:29 +00:00
4c4baede51
'brackets': Don't highlight corresponding bracket on accept-line
2016-09-08 15:22:43 +02:00
51614ca2c9
'main': Avoid triggering a zsh bug related to hashed commands.
...
This manifested in completion of the form «./foo<TAB>» where there happened to
be a program called 'foo' in $PATH.
Fixes #354 .
Closes #355 .
2016-08-30 02:56:23 +00:00
c7f7d2ff16
*: Change highlighters' namespace.
...
Fixes #329 .
Merge remote-tracking branch 'danielsh/i329-v1'
* danielsh/i329-v1:
highlighters: Rename entry points.
driver: Rename highlighter entry points
2016-08-16 17:53:01 +00:00
c793e0dcea
highlighters: Rename entry points.
...
This tracks the API change made in the previous commit, as suggested in the
(#if 0'd) deprecation warning.
2016-08-16 17:51:43 +00:00
2c002f9f89
noop: Add comments.
2016-08-16 13:40:31 +00:00
757d047f09
'main': The word after 'sudo' is only a non-command word if it is an option.
2016-08-16 13:31:05 +00:00
179b8e753f
'main': Test for redirection earlier.
...
This is a prerequisite for the next commit.
The incumbent code was wrong: the test of $in_redirection in the first hunk
would never have seen «(( in_redirection == 2 ))». That had no visible
effect since options to sudo don't look like redirection operators.
2016-08-16 13:27:36 +00:00
6e2ef574c8
noop: Restructure code for clarity.
...
The structure now mirrors the stall construct at the top of the loop.
2016-08-16 13:25:43 +00:00
d1c773faa7
noop: Fix indentation.
2016-08-16 13:00:55 +00:00
171a4eec2d
Merge remote-tracking branch 'danielsh/m0vie-i288-v2' (revised version of upstream/pr/288)
...
* danielsh/m0vie-i288-v2:
driver: Don't highlight in isearch
driver: Always bind zle-line-finish and use it instead of accept-*
driver: Widget binding: Support binding incomplete/nonexistent widgets
2016-07-29 21:09:31 +00:00
5bae621900
driver: Always bind zle-line-finish and use it instead of accept-*
...
Special handling for cursor imprint or partial path highlighting
is needed in more cases than accept-*. For example when accepting
a line from isearch, no accept-* widget is invoked.
The proper way is to use zle-line-finish.
Trumps #259 .
Fixes #284 .
2016-07-29 20:41:06 +00:00
fa57633d81
'main': Enable test for issue #238 .
2016-07-28 08:14:23 +00:00
0d41933c61
'main': Add test for issue #343 , concerning the 'command' precommand.
2016-07-28 07:54:28 +00:00
e6fb61c42b
'main': Highlight a broken symlink as a file.
...
Merge remote-tracking branch 'upstream/pr/342'
* upstream/pr/342:
'main': Highlight a broken symlink as a file.
tests: Add an XFail test for issue #342 .
2016-07-22 16:09:06 +00:00
6b69389bd9
'main': New test, related to issue #328 .
...
The test passes so I'm adding it directly to master.
2016-07-22 15:52:43 +00:00
3409a2e4d2
*: s/echo/print/
...
Just in case one of the interpolated variables contains a backslash.
2016-07-21 04:01:50 +00:00
53083da821
'main': Highlight a broken symlink as a file.
...
Fixes #342 .
2016-07-20 02:01:15 +00:00
95f7206a93
tests: Add an XFail test for issue #342 .
2016-07-20 02:00:28 +00:00
d13da0cf00
'main': Support vi linewise region (REGION_ACTIVE == 2).
...
Merge remote-tracking branch 'danielshahaf/i267-linewise-region-v1'
* danielsh/i267-linewise-region-v1:
tests: Add a regression test for issue #267 , concerning highlighting a vi linewise region.
Support linewise region.
2016-07-01 02:00:10 +00:00
ee07588cfd
tests: Add a regression test for issue #267 , concerning highlighting a vi linewise region.
2016-07-01 01:59:37 +00:00
9a934d291e
'main': Path separators: Leave styles empty by default
...
If the separator feature is disabled, this makes it possible to
change the main 'path' styles in a running session without the
need to touch the '_pathseparator' styles, too.
2016-06-11 14:19:17 +02:00
d9e07b5082
'main': simple parameter expansions at command word: Don't use an undefined value.
...
Causes such expansions to be highlighted as [unknown-token] rather than as default (absent from $region_highlight).
Fixes #337 .
2016-06-10 14:31:57 +00:00
da91264122
'main': Add missing arguments.
...
Part of #337 .
2016-06-10 14:31:57 +00:00
e35a0b256e
'main': Try the "non-command word" codepath when a word may be either a command word or a non-command word.
...
Merge remote-tracking branch 'upstream/pr/331'
* upstream/pr/331:
'main': Try the "non-command word" codepath when a word may be either a command word or a non-command word.
2016-06-05 16:58:12 +00:00
47144ad974
'main': Fix issue #290 , «Mishighlights "longloops" 'repeat'».
...
* upstream/pr/319:
tests: Extend issue #290 test with another variant.
'main': Fix issue #290 , «Mishighlights "longloops" 'repeat'».
tests: New test for issue #290 , «Mishighlights "longloops" 'repeat'».
2016-06-03 04:32:25 +00:00
7fb6f99791
'main': Try the "non-command word" codepath when a word may be either a command word or a non-command word.
...
Fixes #231 .
Fixes #330 .
2016-06-03 04:25:00 +00:00
29b30e0ca7
'main': Add XFail test for issue #330 , concerning command word after array assignment.
2016-06-03 03:42:12 +00:00
f4036a09ce
'main': Highlight scalar assignments to argv
...
Assignments to positional parameters using scalar assignment syntax is
a feature: it is covered by upstream's test suite ("append to positional
parameter" in Test/A06assign.ztst).
2016-06-03 03:27:52 +00:00
14711a51f3
tests: Explicitly test 'default' style inside an array assignment.
2016-06-03 02:41:10 +00:00
91fa057a39
minor: 'main': Only search for prefixes if :h is a directory
2016-06-01 00:54:30 -05:00
f060622dc6
'main': Internal cleanup: drop $style_override.
...
Merge remote-tracking branch 'upstream/pr/326'
* upstream/pr/326:
'main': Internal cleanup: drop $style_override.
Conflicts:
highlighters/main/main-highlighter.zsh (context lines only)
2016-06-01 05:45:39 +00:00
6cd39e7c70
'main': Highlight path separators
...
This commit is based on the work done by
Jorge Israel Peña (blaenk) in #136 .
Changes:
* Adjusted to changes on the latest master branch.
* Use regular path highlighter colors by default.
* Break out early if the separator color is the same to
improve performance.
* Tests.
2016-05-31 15:06:12 +00:00
a5b8bc0ef0
'main': Internal cleanup: drop $style_override.
...
Changes the interface of _zsh_highlight_main_highlighter_check_path().
Suggested-by: m0viefreak
2016-05-27 10:21:28 +00:00
3b67e656bf
'main': Implement simple command type cache
2016-05-24 23:08:11 +02:00
12b879caf7
'main': Use zsh/parameter instead of type -w
...
If possible, try to use the zsh/parameter module to get
information about a shell words.
This avoids subshells and is a huge speed improvement
on systems such as cygwin.
Note 1:
$commands does not know about PATH_DIRS. So in case
PATH_DIRS is set, 'type -w' is still used if nothing
else matches.
Note 2:
zsh/parameter can't distinguish between 'command' and
'hashed'. Adjusted the test for that case to XFAIL.
The ideal solution would be if whence had an option to
put the result in REPLY instead of printing it to stdout.
2016-05-13 20:25:07 +02:00
61f43255ab
'main': Support multiple styles in _zsh_highlight_main_add_region_highlight
2016-05-13 20:25:04 +02:00
6362c757b6
tests: Extend issue #290 test with another variant.
...
The test being extended is highlighters/main/test-data/control-flow2.zsh.
2016-05-13 04:28:43 +00:00
ef68f50c04
'main': Fix issue #290 , «Mishighlights "longloops" 'repeat'».
2016-05-13 03:30:11 +00:00
4832f18c50
tests: New test for issue #290 , «Mishighlights "longloops" 'repeat'».
2016-05-13 02:50:24 +00:00
f146651913
Merge part of PR #298
...
* commit '2f18ba':
'main': use zsh/parameter to resolve alias
driver: load zsh/parameter if available
2016-05-13 02:27:29 +00:00
2f18ba64e3
'main': use zsh/parameter to resolve alias
...
If possible, use zsh/parameter to avoid forks.
Fixes #263 .
2016-05-13 02:27:03 +00:00
def8c0da83
Bump copyright years.
2016-05-13 01:29:49 +00:00
4f5bb6cf96
Merge remote-tracking branch 'upstream/pr/308' into HEAD
...
* upstream/pr/308:
'main': Fix issue #302 , "Process substitution misparsed as redirection".
'main': Factor out common code. No functional change.
'main': Add a regression test for issue #302 , "Process substitution misparsed as redirection".
2016-05-13 01:24:01 +00:00
7b82b88a71
'main': Don't leak the PATH_DIRS options.
...
Found-by: m0viefreak
(in #298 )
2016-05-12 19:24:00 +00:00
ef4bfe5bcc
'main': 2nd optimization that in my tests shows 2.2s -> 2.0s
2016-05-12 19:22:29 +00:00
5a98cd3a10
Merge remote-tracking branch 'upstream/pr/315' into HEAD
...
* upstream/pr/315:
'main': optimization that in my tests shows 2.7s -> 2.2s
2016-05-12 18:30:50 +00:00
02229ebd63
'main': optimization that in my tests shows 2.7s -> 2.2s
...
Consider indexing long buffers (say 300 chars). E.g. following line:
integer offset=${${buf[start_pos+1,len]}[(i)$needle]}
will gradually go into large indices for first index [a,] and be kept
at large index for second index [,b]. Instead, we can remove already
processed characters from buf:
proc_buf="${proc_buf[offset + $#arg + 1,-1]}"
$offset and $#arg are small, first index will not be large. $proc_buf
will be smaller and smaller and the second index [,-1] will run shorter
and shorter.
2016-05-12 18:29:09 +00:00
62f1c108f3
tests: New test to capture off-by-ones.
...
Inspired by #312 .
2016-05-11 20:36:18 +00:00
5fe8fd8bdc
'brackets': Fix for one-based indexing
...
Use correct indexing also for cursor-matchingbracket.
Fixup for 95d82568d8
2016-05-11 01:11:49 +02:00
fc9c892a3f
'main': Fix issue #302 , "Process substitution misparsed as redirection".
2016-05-09 03:29:27 +00:00
bfabffbf97
'main': Factor out common code. No functional change.
2016-05-09 03:26:29 +00:00
6889ff6bd2
'main': Add a regression test for issue #302 , "Process substitution misparsed as redirection".
2016-05-09 03:26:06 +00:00
b5955213b9
tests: Add tests for 'brackets' and 'pattern'
2016-05-05 15:36:33 -05:00
f73f3d53d3
'brackets': Allow unset ZSH_HIGHLIGHT_STYLES
...
Without this when bracket_color_size is 0,
$(( (levelpos[$pos] - 1) % bracket_color_size + 1 ))
errors with division by zero.
2016-05-05 13:56:09 -05:00
eaa4335c34
tests: Set ZSH_HIGHLIGHT_STYLES=() during tests
...
Since the _zsh_highlight_add_highlight that the tests use ignores
ZSH_HIGHLIGHT_STYLES, we can test both an injective mapping and an empty
mapping at once.
2016-05-05 12:31:52 -05:00
d3678ec7a8
tests: Remove unused_highlight
2016-05-05 12:28:43 -05:00
ccaf6f48a1
brackets: Fix bug introduced in 95d8256
2016-05-05 09:59:26 -05:00
e05b8e88ad
'brackets': Check if brackets match on first pass
...
This removes the need for the typepos array.
2016-05-04 20:50:55 -05:00
95d82568d8
'brackets': Use one-based indexing
...
zsh arrays start at one, and this will make the next commit easier.
2016-05-04 20:50:55 -05:00
f4d3dcb42f
'brackets': Move highlight call outside conditional
2016-05-04 20:50:55 -05:00
fd84010252
'brackets': Lift local declarations from inside loops
2016-05-04 20:50:55 -05:00
4da9889d15
tests: Use 'NONE' to denote no highlighting
...
'none' is a valid highlighting type. Since by convention styles are all
lowercase, 'NONE' shouldn't conflict with anything.
Closes #289 .
2016-04-30 12:48:44 -05:00
341a3ae1f0
highlighters: Use _zsh_highlight_add_highlight
...
_zsh_highlight_add_highlight appends to region_highlight $1 $2 and the
next non-null parameter. If there is no non-null parameter, do nothing,
This is so that highlighters can add a style with fallbacks if the most
specific style is not defined. If none of the applicable styles are
defined, do the right thing and don't add an invalid entry to
region_highlight.
The pattern highlighter doesn't use this function as it'd need too large
of an API change.
2016-04-29 10:09:16 -05:00
089329660b
highlighters: Pass around the style key instead of the style itself
2016-04-29 09:53:05 -05:00
a830613467
tests: Specify the style key instead of the style itself
2016-04-29 09:51:13 -05:00
38c8fbea2d
root-highlighter: use EUID instead of id -u command
...
No need to fork every time.
2016-04-23 06:43:01 +00:00
b52a485c5c
brackets: Optimize a tiny bit.
...
Compute «${#BUFFER}» just once. I haven't measured the effect of this, but
it might just avoid a strlen() every time around the loop, which could add
up for large ${BUFFER}s.
See issue #295 .
2016-04-22 14:14:15 +00:00
78290e043b
tests: Expect the correct style
2016-04-03 20:43:13 -05:00
31ac2b36a9
tests: Quote style in expected_region_highlight
2016-04-02 09:45:24 -05:00
bc7f8ea433
'main': Restore support for zsh-4.3.10 and older.
...
zsh older than workers/28418 (zsh revision 23bdfc7fd2a012d5205ed22d18eb39e41c8fbc95)
doesn't support the «${name:offset:length}» syntax. Therefore, use the older
«$name[start,end]» syntax instead.
Followup to 3cb58fd7d7Fixes zsh-users/zsh-syntax-highlighting#279 .
2016-03-23 01:32:44 +00:00
4c23a2fd1b
'main': Highlight lone '!' correctly: it's not a history expansion.
...
While here, also add a test for the '!' reserved word (which is highlighted
since c216242b
2016-03-13 02:47:25 +00:00
e500ca2462
'main': Don't highlight in vared
...
This is a continuation of 451665cb2a
2016-02-14 17:34:53 +02:00
3cb58fd7d7
Optimization: -1 is extra computation of string length internally
...
./parse.zsh "zplugin.zsh" > out_norm.txt 106,17s user 7,84s system 98% cpu 1:55,85 total
./parse.zsh "zplugin.zsh" > out_opt.txt 51,91s user 7,44s system 99% cpu 59,912 total
% wc -l zplugin.zsh
3188 zplugin.zsh
2016-02-12 08:31:14 +01:00
451665cb2a
'main': Don't highlight at the $PS3 prompt.
...
The input to the $PS3 prompt is not commands, so the 'main' highlighter is
not applicable to it.
Fixes zsh-users/zsh-syntax-highlighting#268 .
2016-01-20 22:10:49 +00:00
Matthew Martin
Daniel Shahaf
Daniel Shahaf
Sam Jorna (wraeth)
disarmer mk
Sebastian Gniazdowski
m0viefreak