Matt/zsh-syntax-highlighting
1
0
Fork 0
mirror of https://github.com/zsh-users/zsh-syntax-highlighting.git synced 2026-10-20 02:42:02 +08:00
Code Issues Packages Projects Releases Wiki Activity
331 Commits 6 Branches 17 Tags
c538d6b35750df11c3750658bf0b23d4efdf0da8
Commit Graph
98 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Shahaf c538d6b357 versionstamp: Set up '.revision-hash' file. 2015-10-19 07:21:20 +00:00
Daniel Shahaf 9c56c624e9 versionstamp: Handle NO_FUNCTION_ARGZERO. 
Sourcing zsh-syntax-highlighting.zsh without FUNCTION_ARGZERO doesn't work (for
reasons unrelated to this branch), but now errors out gracefully.  The failure mode
before this branch was:

    zsh-syntax-highlighting: highlighters directory '/usr/local/bin/highlighters' not found.

where /usr/local/bin is dirname() of the zsh binary.
 2015-10-19 07:21:20 +00:00
Daniel Shahaf 43386376d8 Set the version number. 
Store it in a separate file so OS packages and 'make install' (issue #177) can
reuse it.
 2015-10-19 07:20:57 +00:00
Daniel Shahaf 984b4acd78 Makefile: have the default invocation safer. 
Don't modify $(PREFIX) from 'make', only from 'make install'.
 2015-10-19 07:08:42 +00:00
Daniel Shahaf 75d62b9657 Add Makefile 
Fixes issue #177 (using a different branch than the originally-proposed one).

* phy1729/makefile:
  Makefile: Add default for INSTALL
  Makefile: exit non-zero for a failed test
  Makefile: Add test target
  Add Makefile
 2015-10-19 06:49:19 +00:00
Daniel Shahaf 56c793d96a docs: Clarify oh-my-zsh installation instructions 
Suggested-by: Ory Band
(on issue #169)
 2015-10-18 12:46:27 +00:00
Daniel Shahaf e138cfd765 command word: Protect against the case that the command word starts with a minus. 2015-10-02 13:27:21 +00:00
Daniel Shahaf 07fd773d7e noop: Add comments. 2015-09-30 01:26:27 +00:00
Daniel Shahaf 5cd1fb26c0 Resolve tilde expansions in command word. 
This causes '~/bin/foo' to highlight as a command, rather than as a file.

Part of issue #201.
 2015-09-30 00:49:34 +00:00
Daniel Shahaf faed2fa49e internal: Fix docstrings. 2015-09-29 23:45:44 +00:00
Daniel Shahaf 69203b1a1d Don't highlight escaped globbing. 
Fixes zsh-users/zsh-syntax-highlighting#193.
 2015-09-29 23:44:57 +00:00
Daniel Shahaf 800158745a Highlight quoted command words correctly. 
Fixes zsh-users/zsh-syntax-highlighting#147.
 2015-09-28 19:49:39 +00:00
Daniel Shahaf 7b4598a764 Highlight arithmetic expansions. 
Fixes zsh-users/zsh-syntax-highlighting#188 in the case that both the
opening '((' and closing '))' have been typed,  The case that only the
opening '((' have been typed is also fixed, but requires a zsh development
build (zsh-5.1.1-52-g4bed2cf or newer); see comments within.
 2015-09-28 13:55:38 +00:00
Daniel Shahaf 52a2ef644b Don't highlight escaped globbing. 
Fixes zsh-users/zsh-syntax-highlighting#193.
 2015-09-27 16:28:32 +00:00
Daniel Shahaf 6488284814 back-dollar-quoted-argument: Highlight incomplete escape sequences as unknown-token 
Followup to 219184f046, which fixed issue #196.
 2015-09-27 15:59:04 +00:00
Daniel Shahaf f657406159 minor: Fix comment in last ocmmit. 2015-09-26 18:59:16 +00:00
Daniel Shahaf 8b728522de Add test for empty commands. 
Related to issue #205.
 2015-09-26 18:28:56 +00:00
Daniel Shahaf 79e8c2dd48 Don't highlight syntax elements as paths. 
Without this, redirections, history expansions, and command separators would
be matched by path_approx.

A test case is simply LBUFFER="<" RBUFFER="" (highlighted as redirection with this
fix and as path_approx without it).

Fixes zsh-users/zsh-syntax-highlighting#204.
 2015-09-26 18:28:48 +00:00
Daniel Shahaf 4ec821b2b1 Highlight redirections. 
Fixes zsh-users/zsh-syntax-highlighting#23.

* danielsh/i23-highlight-redirections:
  Highlight redirections.
 2015-09-26 17:58:07 +00:00
Daniel Shahaf 219184f046 Highlight backslash escapes in "" and $'' strings correctly. 
Remove highlighting of hex and octal escapes in "" strings (which don't parse
those escapes), add it to $'' strings (which do), and correct the regexps.
Also add support for unicode \u/\U escapes.

Fixes zsh-users/zsh-syntax-highlighting#196.

* danielsh/i196-back-dollar-quoted-v1:
  back-dollar-quoted-argument: Correct an off-by-one.
  back-dollar-quoted-argument: Correct octal escape syntax.
  back-dollar-quoted-argument: Highlight \uHHHH and \UHHHHHHHH escapes.
  back-dollar-quoted-argument: Don't consider \0xHH a hex escape sequence.
  back-dollar-quoted-argument: Don't consider comma a hex character.
  Highlight backslash escapes within $'' strings.
 2015-09-26 17:55:10 +00:00
Daniel Shahaf 3fdaec3d4a WARN_CREATE_GLOBAL: Plug yet another instance. 2015-09-26 16:27:08 +00:00
Daniel Shahaf 6732783d46 back-dollar-quoted-argument: Correct an off-by-one. 
Highlight the last character of a «\xHH» escape when it is the last thing in
LBUFFER.  This is similar to what b0cc02ed86 did
for issue #186.
 2015-09-26 01:09:37 +00:00
Daniel Shahaf 0788514cbd back-dollar-quoted-argument: Correct octal escape syntax. 
A leading zero, as in '\0NNN', is permitted by 'echo' but not by 'print',
and «$''» follows 'print'.
 2015-09-25 21:54:37 +00:00
Daniel Shahaf 8a43bd2cd9 back-dollar-quoted-argument: Highlight \uHHHH and \UHHHHHHHH escapes. 2015-09-25 21:45:38 +00:00
Daniel Shahaf 98366ade11 back-dollar-quoted-argument: Don't consider \0xHH a hex escape sequence. 
A leading zero is not permitted in the '\xHH' syntax.
 2015-09-25 21:45:38 +00:00
Daniel Shahaf 78ad649d47 back-dollar-quoted-argument: Don't consider comma a hex character. 
Character class syntax does not ignore commas between ranges.
 2015-09-25 21:45:38 +00:00
Daniel Shahaf 69fcb40275 Highlight backslash escapes within $'' strings. 
Correct highlighting of backslash escapes within "" strings: highlight only
the four specific escape sequences defined there.

Fixes zsh-users/zsh-syntax-highlighting#196.
 2015-09-25 21:45:38 +00:00
Daniel Shahaf f4164ac86c internal: Document a function-local variable. 2015-09-25 21:22:09 +00:00
Daniel Shahaf 9c7a1109c8 WARN_CREATE_GLOBAL: don't leak the arithmetic for loop's index variable. 
Found by code inspection; WARN_CREATE_GLOBAL missed this.
 2015-09-25 20:57:51 +00:00
Daniel Shahaf dd12dde93a Fix errors with non-reserved-word typeset. 
Follow-up to 908c4fe150.

Intended to fix fix zsh-users/zsh-syntax-highlighting#206.
 2015-09-25 17:53:22 +00:00
Daniel Shahaf cb5589db73 Don't wrap set-local-history. 
See issue #137.  A reproduction recipe for testing this change:

$ zsh -f
% bindkey -e
% source <the script from http://www.zsh.org/mla/users/2014/msg00321.html users/18584>
% source zsh-syntax-highlighting.zsh
% echo foo
% echo bar
% <^R>echo<^R>

This finds the 'echo foo' with this change but not without it.
 2015-09-25 15:35:03 +00:00
Daniel Shahaf 35c4bb7bdc More WARN_CREATE_GLOBAL cleanups. 
Followup to 908c4fe150.
Found by test-perfs.zsh.
 2015-09-25 13:04:37 +00:00
Daniel Shahaf 040df93c01 Highlight redirections. 
Fixes zsh-users/zsh-syntax-highlighting#23.
 2015-09-25 12:42:34 +00:00
Daniel Shahaf 86cd337446 README: Document release announcements. 
Thanks to tibbs@fedora for setting up anitya.
 2015-09-24 23:00:05 +00:00
Daniel Shahaf c43dc8bd44 dollar-double-quoted-argument: Two patches. 
* danielsh/i186-dollar-dquote:
  dollar-double-quoted-argument: Handle «"foo$"» correctly.
  dollar-double-quoted-argument: Highlight "$foo" better.
 2015-09-24 19:04:49 +00:00
Daniel Shahaf 66eb801358 dollar-double-quoted-argument: Handle «"foo$"» correctly. 2015-09-24 19:03:17 +00:00
Daniel Shahaf b0cc02ed86 dollar-double-quoted-argument: Highlight "$foo" better. 
Now, «"$42foo"» doesn't highlight the «foo», and «"$bar» highlights the «r».
 2015-09-24 19:03:00 +00:00
Daniel Shahaf 4ec0c6d7a7 README: Expand the at-end-of-.zshrc FAQ answer. 
Fixes zsh-users/zsh-syntax-highlighting#185.
 2015-09-24 18:45:35 +00:00
Daniel Shahaf 908c4fe150 Stop leaking variables into global namespace. 
Set WARN_CREATE_GLOBAL to prevent recurrence.

Fixes zsh-users/zsh-syntax-highlighting#192.
 2015-09-24 18:01:06 +00:00
Daniel Shahaf 1467eae86d Bump copyright years, part 2. 2015-09-24 16:48:27 +00:00
Daniel Shahaf 9e80fe8f02 Bump copyright years. 2015-09-24 16:46:28 +00:00
Daniel Shahaf 001e6cb404 tests: Cover 'back-quoted-argument'. 
This is part of issue zsh-users/zsh-syntax-highlighting#198.
 2015-09-23 15:41:17 +00:00
Daniel Shahaf 22fa215e05 Fixup last commit. 
* highlighters/main/test-data/hashed-command.zsh:
    Set the right region key.  This makes the test more specific.
    (Issue #184 would have caught this bug.)
 2015-09-23 15:39:53 +00:00
Daniel Shahaf 845361ef3d tests: Cover 'hashed-command'. 
This is part of issue zsh-users/zsh-syntax-highlighting#198.
 2015-09-23 15:35:56 +00:00
Daniel Shahaf 4594d8b7ec Merge remote-tracking branch 'danielsh/i199-semicolon-v1' 
* danielsh/i199-semicolon-v1:
  Fix regression: Highlight ';' as commandseparator.
  Follow-up to 547b8be304: Fix $observed_result calculation.

Fixes zsh-syntax-highlghting/zsh-users#199.
 2015-09-23 15:23:25 +00:00
Daniel Shahaf 5fb4cb2f72 Fix regression: Highlight ';' as commandseparator. 
This was broken by c2b9327b07
and tracked as zsh-users/zsh-syntax-highlighting#199.

This fixes the vanilla-newline.zsh test, which was was (consciously) broken
by the previous commit.
 2015-09-23 14:50:22 +00:00
Daniel Shahaf f7cb4741d6 Followup to previous: Extend the 'alias' test. 2015-09-18 22:04:07 +00:00
Daniel Shahaf 81c8d78d12 tests: Cover 'alias' and 'suffix-alias'. 
This is part of issue zsh-users/zsh-syntax-highlighting#198.
 2015-09-18 21:42:22 +00:00
Daniel Shahaf 8767e0ef66 tests: Cover 'reserved-word'. 
This is part of issue zsh-users/zsh-syntax-highlighting#198.
 2015-09-18 20:38:32 +00:00
Daniel Shahaf b056f592f2 tests: Cover 'path_prefix'. 
This is part of issue zsh-users/zsh-syntax-highlighting#198.
 2015-09-18 20:21:19 +00:00
Daniel Shahaf e0a7ddb6ec tests: Cover 'history-expansion'. 
This is part of issue zsh-users/zsh-syntax-highlighting#198.
 2015-09-18 20:01:10 +00:00
Daniel Shahaf 416934202e tests: Cover 'single-quoted-argument', 'double-hyphen-option', and 'function'. 
This is part of issue zsh-users/zsh-syntax-highlighting#198.
 2015-09-18 19:21:21 +00:00
Daniel Shahaf 627eb71940 tests: Use $unused_highlight in more places. 
Notably, the 'single-hyphen-option' and 'assign' contexts both default to the
'none' style, so before this patch, the tests would not have detected a failure
to apply those two contexts.

For other contexts, using $unused_highlight only helps detect the case where
the right highlight style (e.g., 'fg=yellow') is used as a result of applying
the wrong context — which should be a theoretical failure mode.

This is part of zsh-users/zsh-syntax-highlighting#198.
 2015-09-18 18:44:45 +00:00
Daniel Shahaf 00862cf4fa Followup to e5c2a88db0 (merged in 51102bf83f): 
Have widgets return EXIT_SUCCESS.
 2015-09-18 12:38:24 +00:00
Daniel Shahaf aab1b8f50f Follow-up to 547b8be304: Fix $observed_result calculation. 
In region_highlight, a spec of the form 'i j foo' with i >= j should have no effect.
Before this commit, however, the {$i..$j} range would happily expand to (5 4 3)
if i > j were the case (e.g., i=5 and j=3).

This breaks vanilla-newline.zsh; the next commit will fix that.
 2015-09-17 23:40:20 +00:00
Daniel Shahaf 4068413dfe tests: Let each test change the highlight styles. 
This way, each test can set custom styles to specific highlight contexts
(to differentiate those contexts) without affecting later tests.
 2015-09-17 23:35:44 +00:00
Daniel Shahaf 404d498e1d tests: vanilla-newline.zsh: Fix expectations 2015-09-17 23:33:56 +00:00
Daniel Shahaf 05ab9f7342 tests: Run only *.zsh files. 
Otherwise, *.rej patch files would be run by zsh, with unpredictable results.
 2015-09-17 20:11:05 +00:00
Daniel Shahaf 0d3a5dadea tests: Add test for escape sequences in double-quoted strings 2015-09-17 20:01:46 +00:00
Daniel Shahaf 51102bf83f Highlight the region and yanks and pastes on top of syntax highlighting. 
Fixes zsh-users/zsh-syntax-highlighting#165.
Fixes zsh-users/zsh-syntax-highlighting#175.

* danielsh/i165-region-v1:
  Highlight yanks/pastes on top of syntax highlighting.
  Highlight the region on top of syntax highlighting.
 2015-09-17 19:21:25 +00:00
Daniel Shahaf 186536705b tests: path-tilde-named.zsh: Fix expectations 
The path string ends at offset 26, not 23.
 2015-09-17 19:09:33 +00:00
Daniel Shahaf 547b8be304 test harness: Fix off-by-one discrepancy between observed and expected. 
Fixes zsh-users/zsh-syntax-highlighting#195.

The one revision made on master between this branch's creation and merge
already uses correct offsets.

* danielsh/i195-tests-offbyone-v1:
  New test for dollar-double-quoted-argument.
  test harness: Fix off-by-one discrepancy between observed and expected.
 2015-09-17 19:08:29 +00:00
Daniel Shahaf 80587e5419 New test for dollar-double-quoted-argument. 
This exercises the previous patch.
 2015-09-12 20:48:25 +00:00
Daniel Shahaf c46b8d169e test harness: Fix off-by-one discrepancy between observed and expected. 
Fixes issue #195.
 2015-09-12 20:48:25 +00:00
Daniel Shahaf a8afbdf2f5 Support $''-quoted strings. 
This does not yet highlight backslash escapes within them.
 2015-09-10 20:02:39 +00:00
Daniel Shahaf 6d93ea07fd main highlighter docs: README: Tweak. 2015-09-10 19:46:01 +00:00
Daniel Shahaf 4f5a0fe60b main highlighter docs: Give examples of styles. 2015-09-10 19:44:19 +00:00
Daniel Shahaf e5c2a88db0 Highlight yanks/pastes on top of syntax highlighting. 
Let $zle_highlight[paste] override $region_highlight.
 2015-09-10 19:31:36 +00:00
Daniel Shahaf 0e31d6e1a2 Highlight the region on top of syntax highlighting. 
Let $zle_highlight[region] override $region_highlight.
 2015-09-08 20:22:22 +00:00
Daniel Shahaf 555e142e66 suffix aliases: Highlight differently. 
Add an underline, since they are at command word position but will be executed
by something else.

Suggested-by: Daniel Hahler
 2015-09-08 10:13:16 +00:00
Daniel Shahaf e13c5a1611 Highlight 'noglob' correctly in more cases. 
Fixes zsh-users/zsh-syntax-highlighting#189.
 2015-09-07 18:07:59 +00:00
Daniel Shahaf 8515b7e0c5 Highlight ? as globbing. 
Fixes zsh-users/zsh-syntax-highlighting#94.
 2015-09-07 18:05:56 +00:00
Daniel Shahaf dc701501e5 Highlight ? as globbing. 
Fixes zsh-users/zsh-syntax-highlighting#94.
 2015-09-07 18:03:14 +00:00
Daniel Shahaf 9310d8ae71 Support suffix aliases 
Fixes zsh-users/zsh-syntax-highlighting#126.
 2015-09-07 17:59:52 +00:00
Daniel Shahaf b3ceea8511 Highlight 'noglob' correctly in more cases. 
Fixes zsh-users/zsh-syntax-highlighting#189.
 2015-09-07 09:09:17 +00:00
Daniel Shahaf a0b5bc6c71 Fix bug in previous commit (d330b49b33) 
'local' is a reserved word in zsh 5.1 but not in earlier versions [1].
Therefore, under zsh older than 5.1, quoting is required.

This manifested as random «builtin=''» in emitted to the terminal, and
commands (such as 'echo') highlighted as errors (in red).

[1] https://github.com/zsh-users/zsh/blob/master/README#L46
    (the section "Incompatibilites between 5.0.8 and 5.1")
 2015-09-07 01:26:11 +00:00
Daniel Shahaf d330b49b33 Fix variable leakage into global namespace. 
Similar to zsh-users/zsh-syntax-highlighting#97.
 2015-09-06 19:20:49 +00:00
Daniel Shahaf f78919d941 Preserve $? of wrapped widgets. 2015-09-05 21:44:11 +00:00
Daniel Shahaf eaffd88793 docs: Document homebrew package name. 
Fixes zsh-users/zsh-syntax-highlighting#156.
 2015-09-05 19:21:52 +00:00
Daniel Shahaf 546a5288e2 multiline strings: Add a second test for commit ff4d402e9a 2015-09-05 15:08:08 +00:00
Daniel Shahaf 8e7c26f489 Do wrap the 'yank' widget, because that works. 
Partly reverts eb9870f4db which was PR #143 to
fix issue #99.
 2015-09-05 12:50:32 +00:00
Daniel Shahaf 7f41967a17 Highlight array appends: foo+=(bar baz). 
Fixes zsh-users/zsh-syntax-highlighting#181.
 2015-09-05 09:38:02 +00:00
Daniel Shahaf 13a8db1d71 tests: exit non-zero upon failure 2015-09-05 09:27:51 +00:00
Daniel Shahaf 51aed8a765 Merge remote-tracking branch 'upstream/pr/179' 
* upstream/pr/179:
  Don't parse first word of array assignment as command
 2015-09-04 17:57:08 +00:00
Daniel Shahaf 42495cc5d6 Merge remote-tracking branch 'upstream/pr/161' 
* upstream/pr/161:
  Don't highlight prefix redirections as error
 2015-09-04 17:27:25 +00:00
Daniel Shahaf ea81e3df6e Merge remote-tracking branch 'upstream/pr/159' 
* upstream/pr/159:
  Support literal newlines, part 2
  Update comments. No functional change.
  Highlight the first part of multiline strings correctly
  Support literal newlines
  Support backslash continuations
  Support multiline strings
  Refactoring, no functional change
 2015-09-04 17:27:03 +00:00
Daniel Shahaf c2b9327b07 Support literal newlines, part 2 2015-09-02 09:30:08 +00:00
Daniel Shahaf 52ece975c3 Update comments. No functional change. 2015-09-02 02:37:43 +00:00
Daniel Shahaf 7ee9df915d Merge remote-tracking branch 'origin/pr/158' 
* origin/pr/158:
  README: give the rationale for the at-end-of-.zshrc requirement
 2015-09-01 16:26:04 +00:00
Daniel Shahaf 85b3446897 README: make installation step 1 more accurate 
Based on a patch by George Angelopoulos <george@usermod.net>.

Closes #149.
 2015-08-31 17:27:56 +00:00
Daniel Shahaf b9b67b9f78 Don't parse first word of array assignment as command 
Fixes zsh-users/zsh-syntax-highlighting#178
 2015-08-28 09:52:52 +00:00
Daniel Shahaf 359d48bf78 Don't highlight prefix redirections as error 
Fixes zsh-users/zsh-syntax-highlighting#146
 2015-02-16 02:44:56 +00:00
Daniel Shahaf ff4d402e9a Highlight the first part of multiline strings correctly 
Given the following input:
    PREBUFFER=$'echo "foo\n'
    BUFFER='bar"'
This patch causes the '"foo' part to be highlighted as a string.  There
is no test because the tests only check highlighting of BUFFER, and 'bar"'
is already highlighted correctly.
 2015-02-02 15:12:59 +00:00
Daniel Shahaf 384be15b13 Support literal newlines 2015-01-27 10:23:59 +00:00
Daniel Shahaf 23cacb12fe Support backslash continuations 2015-01-27 10:23:59 +00:00
Daniel Shahaf 667495bfb7 Support multiline strings 2015-01-27 10:23:58 +00:00
Daniel Shahaf 2c5acaefa9 Refactoring, no functional change 
The new function will be used in the next commit.
 2015-01-27 10:23:58 +00:00
Daniel Shahaf 0c8c4b73f8 README: give the rationale for the at-end-of-.zshrc requirement 2015-01-27 10:23:21 +00:00