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
28932316cc
aliases: Highlight aliases with '=' in their LHS as error. (Part of issue #263.)
2016-01-11 15:27:48 +00:00
5e4b446dee
aliases: Add a test for one variant of issue #263 .
2016-01-11 15:07:18 +00:00
4f3910cbba
Fix issue #248 : Highlight 'pkexec' as a precommand.
2015-12-04 23:40:30 +00:00
73ee7c1f6c
Fix part of issue #238 , "fd redirections at command word".
...
This fixes fd's specified by a (single) digit. The named fd syntax remains an XFail.
2015-11-29 03:16:01 +00:00
48ecd29180
tests: Add two XFail tests for issue #238 , "fd redirections at command word".
2015-11-29 03:15:55 +00:00
430cf55368
tests: Cover [default].
2015-11-29 02:56:07 +00:00
46cd970bc4
tests: Improve tests by using $unused_highlight.
...
The default for [redirection] is 'none', so it wasn't actually being tested.
2015-11-29 02:53:58 +00:00
09c4114eb9
command word: Do not attempt to interpret command separator tokens as anything else.
...
The important part of this change is removing the second conjunct from the
condition; the remainder of the change gives one example of when that matters.
2015-11-29 02:02:42 +00:00
eb3715a56a
docs: Followup to the recent docs branch: clean up some internal cross-references.
2015-11-27 04:07:02 +00:00
8e115052e9
docs: Fix broken symlinks
2015-11-24 00:40:09 -06:00
0ab450ae47
docs: Move docs into docs/
2015-11-24 00:09:21 -06:00
35e0b0ca69
docs: Remove duplicate 'How to activate it' sections
2015-11-24 00:09:21 -06:00
2dd6923c30
docs: Move highlighter headers down one level
2015-11-24 00:09:21 -06:00
6e99128987
docs copyedit: minor: Spelling/punctuation fix.
2015-11-24 06:06:16 +00:00
3f163a2fd4
docs copyedit: Rewrap to 80 columns, part 2.
2015-11-24 06:06:16 +00:00
9ce97cd64d
docs copyedit: minor.
2015-11-24 06:06:16 +00:00
12097d55d1
docs copyedit: Rewrap to 80 columns.
2015-11-24 06:06:16 +00:00
8ea392e361
docs copyedit: Restyle bold-italic to fixed-width.
2015-11-24 06:06:16 +00:00
91e4a576fb
docs copyedit: Port 6d93ea07fd to the other highlighters' README's.
2015-11-24 06:06:16 +00:00
6c033e62e9
docs copyedit: Whitespace.
2015-11-24 06:06:16 +00:00
17fbcad8ac
'main': Fix state check.
...
At this time, no user-visible consequences are known.
2015-11-18 16:37:38 +00:00
29fd6ec1de
Support the '|&', '&!', '&|' command separators.
2015-11-17 20:19:19 +00:00
3ed0f7f823
noop: Consolidate two identical conditionals.
2015-11-17 20:07:14 +00:00
2dbcb575e5
internal: Document the ':regular' state.
2015-11-17 19:40:58 +00:00
00de155063
docs: 'main': Improve styles documentation.
2015-11-17 18:41:14 +00:00
7d4252f5f5
minor: docs: Improve dollar-double-quoted-argument documentation.
2015-11-17 03:55:00 +00:00
21e5e26923
docs: Clarify 'create a new highlighter' documentation.
2015-11-17 03:22:14 +00:00
79b95c629e
Drop unnecessary shebang lines.
...
Done in c30301d474c687bddea3
2015-11-17 02:04:23 +00:00
3669d69226
Fix copyright year.
2015-11-17 02:02:42 +00:00
4fcfb15913
Highlight parameter expansions that are a command word.
...
Fixes zsh-users/zsh-syntax-highlighting#101 .
2015-11-17 01:37:58 +00:00
bdc1449733
noop: Break out a helper function.
2015-11-17 01:37:12 +00:00
6e3720f39d
dollar-double-quoted-argument: Support the syntax «"${foo}"». (Issue #186.)
2015-11-17 00:40:02 +00:00
28776371a0
tests: Add an XFail test for highlighting «"${foo}"». (Issue #186.)
2015-11-17 00:37:58 +00:00
4f0c293fde
cursor: Remove cursor highlighting when accepting a line.
...
Fixes zsh-users/zsh-syntax-highlighting#109 .
Similar to 59fbdda64c
2015-11-17 00:05:06 +00:00
96ee5116b1
Fix issue #228 , "Support the PATH_DIRS option".
2015-11-16 23:14:48 +00:00
a636527f70
tests: Add an XFail test for issue #228 , "Support the PATH_DIRS option".
...
This builds upon the test harness auto-cleaned-up directories work (c01533920
2015-11-16 23:04:11 +00:00
2b35ff1c15
minor: Rename a test file to a not-escape-needing name.
...
There's simply no reason to use such names, now that the filename is no longer
itself test data.
2015-11-16 22:57:47 +00:00
c015339202
tests: Provide an independent, auto-cleaned working directory to each test.
...
Fixes zsh-users/zsh-syntax-highlighting#182.
Prerequisite for testing issue #228 .
* tests/test-highlighting.zsh
(run_test): Move functionality to run_test_internal; make run_test be a wrapper
that handles creating and cleaning up the tempdir.
* tests/README.md: Document the new feature.
* "highlighters/main/test-data/path-space- .zsh"
* highlighters/main/test-data/path-tilde-named.zsh
* highlighters/main/test-data/path.zsh
Change test data to not depend on being run from the source directory.
2015-11-16 22:54:52 +00:00
3620ad951f
Add an XFail test for issue #231 , "Assignment terminating subshell flags closing parenthesis as an error".
2015-11-16 19:04:37 +00:00
b285c7b821
brackets: Highlight closing ')' of array assignments correctly. (Issue #226.)
...
Followup to c0dafd1d85
2015-11-16 18:44:44 +00:00
c0dafd1d85
brackets: Highlight the closing brackets of subshells and blocks. (Issue #226.)
2015-10-30 20:20:30 +02:00
28abb960de
noop: Follow-up to last: improve readability.
2015-10-30 20:14:03 +02:00
a59f442d2d
brackets: Highlight the closing brackets of arithmetic expansion. (Issue #226.)
2015-10-30 17:28:48 +00:00
8b4adbd991
Fix issue #222 , "command word after repeat".
2015-10-30 13:31:43 +00:00
6fbd2aa957
Add an XFail test for issue #222 , "command word after repeat".
2015-10-30 13:31:23 +00:00
Daniel Shahaf
m0viefreak
Matthew Martin
Sebastian Gniazdowski