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
712 Commits 6 Branches 17 Tags
15d4587514a3beaa13972093e335bf685b6726a9
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Shahaf 15d4587514 Tag version 0.5.0. 2016-10-24 11:32:54 +00:00
Daniel Shahaf e5a59f6b56 changelog: Update for post-branch changes. 2016-10-24 11:32:54 +00:00
Daniel Shahaf b4d882dd59 Merge remote-tracking branch 'upstream/master' into 0.5.x 
* upstream/master:
  Follow-up to 28d7056a7a: Fix test expectations.
 2016-10-22 19:46:46 +00:00
Daniel Shahaf 035d3eb095 Follow-up to 28d7056a7a: Fix test expectations. 2016-10-22 17:46:42 +00:00
Daniel Shahaf 2e95ffc08f Merge remote-tracking branch 'upstream/master' into 0.5.x 
* upstream/master:
  README: Set alt="" attributes.
  README: Add a third image.
  README: Add another image.
  README: Use a more minimal example iamge.
  README: Add before/after images
  changelog: Update through 28d7056a7a.
  'main': Escape '!' within double-quoted strings.
  [REVERTED] Post-branch version number bump.
    This reverts commit 1bdb88aee1.
 2016-10-22 17:43:05 +00:00
Daniel Shahaf b7e277106b README: Set alt="" attributes. 2016-10-20 01:04:41 +00:00
Daniel Shahaf 1495195eb5 README: Add a third image. 
Also remove the existing image, thereby removing the filename expansion
example and the file-existence highlighting example.
 2016-10-20 01:02:27 +00:00
Daniel Shahaf 50cbdbaebc README: Add another image. 2016-10-20 00:46:22 +00:00
Daniel Shahaf 242481c279 README: Use a more minimal example iamge. 2016-10-20 00:15:31 +00:00
Daniel Shahaf cd9ec14a65 README: Add before/after images 2016-10-20 00:03:09 +00:00
Daniel Shahaf 24096c2e4f changelog: Update through 28d7056a7a. 2016-10-20 00:00:58 +00:00
Daniel Shahaf 28d7056a7a 'main': Escape '!' within double-quoted strings. 2016-10-19 23:56:25 +00:00
Daniel Shahaf 1bdb88aee1 Post-branch version number bump. 2016-10-19 23:08:18 +00:00
Daniel Shahaf 5dcf0cecd8 driver: Revert changes that depend on not-yet-released zsh features. 
The $ISEARCHMATCH_ACTIVE and $SUFFIX_ACTIVE have not yet appeared in a zsh release.
 2016-10-19 23:03:44 +00:00
Daniel Shahaf 31250c77bf Revert "apply suffix and isearch zle_highlights on top" 
This reverts commit 79e4d3d124.
 2016-10-19 23:03:19 +00:00
Daniel Shahaf 39ab1b7321 Revert "driver: Track rename of an unreleased upstream API." 
This reverts commit 15db71abd0.
 2016-10-19 23:03:19 +00:00
Daniel Shahaf af0099465f Revert "driver: Enable highlighting during isearch under zsh≥5.3." 
This reverts commit 4ad311ec0a.
 2016-10-19 23:03:16 +00:00
Daniel Shahaf d464d3857f changelog: Write arg0 entry. 2016-10-19 09:10:24 +00:00
Daniel Shahaf f5c44ed7a2 changelog: Markup tweak. 2016-10-18 23:59:32 +00:00
Daniel Shahaf 2335986a39 changelog: Add the last few entries. One remains as a TODO. 2016-10-18 23:54:52 +00:00
Daniel Shahaf e060a0a1c8 release.md: Record the specific command I used. 2016-10-18 22:53:17 +00:00
Daniel Shahaf f3d0e141fd changelog: Review. 2016-10-18 22:53:17 +00:00
Daniel Shahaf 3c90a673f6 changelog: Update through 0020f592c1. 2016-10-18 22:53:17 +00:00
Daniel Shahaf 773d60c833 changelog: Update through d37c55c788. 2016-10-18 22:53:17 +00:00
Daniel Shahaf 2dff6e54ed changelog: Copyedit. 
- Move an entry to another section.
- Fix commit hash width.
- Add missing punctuation.
 2016-10-18 22:52:36 +00:00
Daniel Shahaf 0020f592c1 changelog: Update through cef49752fd. 2016-10-18 02:28:40 +00:00
Daniel Shahaf 56e4c38ab4 changelog: Start 0.5.0 section. Update through bc7f8ea433. 2016-10-18 02:28:39 +00:00
Daniel Shahaf 7d38d07255 'main': Followup to fdaeec4514: Update comment. 
That revision was itself a followup to 51614ca2c9.
 2016-10-17 20:46:46 +00:00
Daniel Shahaf 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
Daniel Shahaf bccc3dc269 'main': Enable fallback to the 'arg0' style. 2016-09-28 13:22:29 +00:00
Daniel Shahaf 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
Daniel Shahaf 2b303f01b6 dev tools: Automagically handle newlines (\n) in $BUFFER. 2016-09-27 22:55:16 +00:00
Daniel Shahaf 79198759b3 tests: Also test arguments to an anonymous function. 2016-09-25 18:08:45 +00:00
Daniel Shahaf 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
Daniel Shahaf 44ef6e38e5 'main': Highlight several more special (non-alphabetic) parameters. 2016-09-25 14:51:02 +00:00
Daniel Shahaf 4afe670f7a 'main': Highlight shell's PID ($$) inside double quotes. 2016-09-25 14:40:58 +00:00
Daniel Shahaf c3913e0d8e 'main': Highlight command substitutions inside double quotes. 
Part of issue #139.
 2016-09-25 14:40:02 +00:00
Daniel Shahaf 4fc35362ee 'main': Permit subshells to end at command position. 
Fixes #344.
 2016-09-25 12:06:39 +00:00
Daniel Shahaf 2bb8f0703d 'main': Highlight mismatched foreach/end. 
Fixes #96.
 2016-09-25 11:52:15 +00:00
Daniel Shahaf a2876fb57d dev tools: Add a TODO to introduce code reuse. 2016-09-25 11:38:54 +00:00
Daniel Shahaf b2733a64da 'main': Highlight mismatched do/done. 2016-09-25 11:38:54 +00:00
Daniel Shahaf 2755438e80 'main': Yet another test for mismatched braces. 2016-09-25 11:38:52 +00:00
Daniel Shahaf a053768627 dev tools: Remove a superfluous empty line. 2016-09-25 08:11:01 +00:00
Daniel Shahaf e5782e4ddf 'main': Highlight 'always' blocks. 
Fixes #335.
 2016-09-25 08:11:01 +00:00
Daniel Shahaf 8bf423d16d 'main': Don't find command positions within multiline array literals. 
Fixes #333.
 2016-09-24 17:55:18 +00:00
Daniel Shahaf 5627fd2045 dev tools: Stage the copyright block to make diffs smaller. 2016-09-24 17:07:01 +00:00
Daniel Shahaf 987c133486 dev tools: Tolerate invalid input. 2016-09-24 17:06:21 +00:00
Daniel Shahaf a4196eda5e 'main': Restore compatibility with zsh-4.3.14 and older (after e3182c18de8f). 
Fixes #368.
 2016-09-23 15:55:06 +00:00
Daniel Shahaf e15a09840e dev tools: Automate a recurring step: Set year correctly for new tests. 2016-09-23 06:37:28 +00:00
Daniel Shahaf 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
Daniel Shahaf 2fabf7ca64 'main': More tests for mismstached parentheses and braces. 2016-09-22 11:12:42 +00:00
Daniel Shahaf 51b9d79c3b 'main': Highlight mismatched parentheses and braces. 2016-09-22 11:12:42 +00:00
Daniel Shahaf 0a9b347483 driver: Warn just once when a highlighter is missing. 
The heretofore code warned once per keypress.
 2016-09-22 04:10:28 +00:00
Daniel Shahaf 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
Daniel Shahaf 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
Daniel Shahaf fdaeec4514 'main': Followup to 51614ca2c9: Run cheaper conditions first. 
This was suggested on #355.
 2016-09-08 19:09:29 +00:00
Daniel Shahaf 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
Daniel Shahaf 11c9081967 *: error messages: Fix quoting. 2016-08-16 19:01:25 +00:00
Daniel Shahaf 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
Daniel Shahaf 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
Daniel Shahaf a3d5dfcbda driver: Rename highlighter entry points 
This updates the docs and the driver, in a manner backwards compatible with
existing highlighters.  (None of the highlighters are touched by this change,
yet tests continue to pass.)

Part of issue #329.
 2016-08-16 17:51:43 +00:00
Daniel Shahaf f91a7b885e driver: Followup to 80148f6c84: don't squat on the highlighters' namespace. 2016-08-16 17:49:18 +00:00
Daniel Shahaf f3242cbd6a driver: Followup to d711563fe1: actually make the driver reentrant. 
Re-fixes #305.
 2016-08-16 17:22:39 +00:00
Daniel Shahaf b2ba91f12f noop: Rewrap. 2016-08-16 17:09:42 +00:00
Daniel Shahaf d1e0defceb README: Add a reference to upstream's documentation. 2016-08-16 17:09:04 +00:00
Daniel Shahaf b7bb4f8657 README: Rephrase a question non-negatively^W neutrally. 2016-08-16 17:08:47 +00:00
Daniel Shahaf 2c002f9f89 noop: Add comments. 2016-08-16 13:40:31 +00:00
Daniel Shahaf 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
Daniel Shahaf 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
Daniel Shahaf 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
Daniel Shahaf d1c773faa7 noop: Fix indentation. 2016-08-16 13:00:55 +00:00
Daniel Shahaf 295d62ec88 driver: Followup to last: make the value more unique. 
Part of issue #305.
 2016-08-12 09:43:54 +00:00
Daniel Shahaf d711563fe1 driver: Make it reentrant. 
This fixes an infinite recursion in zsh without zle-line-pre-redraw [≤5.2] in
the following situation:

% source zsh-syntax-highlighting.zsh
% eval "my-self-insert() { zle -M 'foobar'; ${(q)widgets[self-insert]#*:} \"\$@\" }"
% zle -N self-insert my-self-insert
% source zsh-syntax-highlighting.zsh

Fixes #305.
 2016-08-12 09:19:36 +00:00
Daniel Shahaf e2f863c151 minor: Fix typo in development usage message. 2016-08-12 09:19:36 +00:00
Daniel Shahaf 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
Daniel Shahaf add6825898 dev tools: Extend tests/generate.zsh. 2016-07-29 19:02:40 +00:00
Daniel Shahaf 8013dc3b8d dev tools: Add a script that generates a test-data file. 2016-07-29 18:58:37 +00:00
Daniel Shahaf fa57633d81 'main': Enable test for issue #238. 2016-07-28 08:14:23 +00:00
Daniel Shahaf 0d41933c61 'main': Add test for issue #343, concerning the 'command' precommand. 2016-07-28 07:54:28 +00:00
Daniel Shahaf 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
Daniel Shahaf 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
Daniel Shahaf 3409a2e4d2 *: s/echo/print/ 
Just in case one of the interpolated variables contains a backslash.
 2016-07-21 04:01:50 +00:00
Daniel Shahaf 53083da821 'main': Highlight a broken symlink as a file. 
Fixes #342.
 2016-07-20 02:01:15 +00:00
Daniel Shahaf 95f7206a93 tests: Add an XFail test for issue #342. 2016-07-20 02:00:28 +00:00
Daniel Shahaf fffe13a8fb docs: Minor tweak. 
Suggested-by: Matthew Martin
 2016-07-18 04:27:54 +00:00
Daniel Shahaf 80148f6c84 docs: State highlighters' designated namespace. 2016-07-12 07:05:37 +00:00
Daniel Shahaf ba16cf2fb2 docs: s/myhighlighter/acme/g 
Makes the text easier to read ("_zsh_highlight_myhighlighter_highlighter" is
a mouthful).
 2016-07-12 07:03:18 +00:00
Daniel Shahaf 3e59ab41b6 driver: Change a variable name to avoid squatting the highlighters' namespace. 
Part of issue #329.
 2016-07-12 06:50:49 +00:00
Daniel Shahaf 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
Daniel Shahaf ee07588cfd tests: Add a regression test for issue #267, concerning highlighting a vi linewise region. 2016-07-01 01:59:37 +00:00
Daniel Shahaf 750aebc553 driver: Stop requiring function_argzero. 
Instead, use the %N prompt expando, as suggested by Bart in users/21637.

Avoid the `print -P %N` syntax to save a fork on Cygwin, at the expense
of not supporting zsh's from 2001 through c. 2004 vintages.

Fixes #338.
 2016-06-10 15:18:46 +00:00
Daniel Shahaf 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
Daniel Shahaf da91264122 'main': Add missing arguments. 
Part of #337.
 2016-06-10 14:31:57 +00:00
Daniel Shahaf 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
Daniel Shahaf 10a596f9fd dev docs: Document a useful tab completion setting. 2016-06-03 08:46:30 +00:00
Daniel Shahaf 4b77af73fb minor: Fix typo in comment. 
Two instances.
 2016-06-03 08:41:45 +00:00
Daniel Shahaf 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
Daniel Shahaf 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
Daniel Shahaf fccf92402b minor: tests: Formatting tweak to XPASS output. 
Remove superfluous single quotes around the second hyphen.
 2016-06-03 03:57:45 +00:00
Daniel Shahaf 29b30e0ca7 'main': Add XFail test for issue #330, concerning command word after array assignment. 2016-06-03 03:42:12 +00:00