Clusteres/zsh-syntax-highlighting
1
0
Fork 0
mirror of https://github.com/zsh-users/zsh-syntax-highlighting.git synced 2026-11-11 11:01:52 -05:00
Code Issues Packages Projects Releases Wiki Activity
675 Commits 6 Branches 17 Tags
c3913e0d8eadfa85e9cb1b4138d4fee7c7b486ab
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Daniel Shahaf 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
Daniel Shahaf 14711a51f3 tests: Explicitly test 'default' style inside an array assignment. 2016-06-03 02:41:10 +00:00
Daniel Shahaf 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
Daniel Shahaf 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
Daniel Shahaf 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
Daniel Shahaf ef68f50c04 'main': Fix issue #290, «Mishighlights "longloops" 'repeat'». 2016-05-13 03:30:11 +00:00
Daniel Shahaf 4832f18c50 tests: New test for issue #290, «Mishighlights "longloops" 'repeat'». 2016-05-13 02:50:24 +00:00
Daniel Shahaf 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
Daniel Shahaf def8c0da83 Bump copyright years. 2016-05-13 01:29:49 +00:00
Daniel Shahaf 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
Daniel Shahaf 0ff354b44b docs: Namespace highlighters' styles. 
Follow-up to 2176692704.

Part of #306.
 2016-05-12 19:28:17 +00:00
Daniel Shahaf 7b82b88a71 'main': Don't leak the PATH_DIRS options. 
Found-by: m0viefreak
(in #298)
 2016-05-12 19:24:00 +00:00
Daniel Shahaf 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
Daniel Shahaf 162c826452 docs: Honour $ZDOTDIR in code examples. 
Keep references in prose as '~/.zshrc': using $ZDOTDIR in that context would
be confusing, and people who set $ZDOTDIR understand these references.
 2016-05-12 13:29:10 +00:00
Daniel Shahaf a00ed24ba3 docs: Simplify/clarify installation instructions. 
This also removes an implicit assumption that ~/.zshrc is idempotent.
 2016-05-12 13:25:59 +00:00
Daniel Shahaf 62f1c108f3 tests: New test to capture off-by-ones. 
Inspired by #312.
 2016-05-11 20:36:18 +00:00
Daniel Shahaf a7a7f8b422 Support linewise region. 
Fixes #267.
 2016-05-09 04:10:02 +00:00
Daniel Shahaf 15db71abd0 driver: Track rename of an unreleased upstream API. 
ISEARCH_ACTIVE was renamed ISEARCHMATCH_ACTIVE in workers/38921
(commit f06be0ffcf2c to zsh itself).

Fixes #299.
 2016-05-09 03:38:27 +00:00
Daniel Shahaf fc9c892a3f 'main': Fix issue #302, "Process substitution misparsed as redirection". 2016-05-09 03:29:27 +00:00
Daniel Shahaf bfabffbf97 'main': Factor out common code. No functional change. 2016-05-09 03:26:29 +00:00
Daniel Shahaf 6889ff6bd2 'main': Add a regression test for issue #302, "Process substitution misparsed as redirection". 2016-05-09 03:26:06 +00:00
Daniel Shahaf f0bae44b76 tests: Followup to last: echo(1) is evil. 
Use 'print -r --' instead, so literal backslashes in $BUFFER aren't expanded.

Found-by: Matthew Martin
 2016-05-05 20:34:43 +00:00
Daniel Shahaf 3176b9567c minor: tests: Quote $BUFFER differently on output. 
The new output improves readability of the 'main' highlighter's test output.
 2016-05-05 19:33:56 +00:00
Daniel Shahaf 6aa57d60aa tests: TAP support: Emit a 'description' for all test points 2016-05-05 19:11:49 +00:00
Daniel Shahaf f83bca0847 minor: tests: Introduce a local variable. No functional change. 2016-05-05 19:11:28 +00:00
Daniel Shahaf 70b5687d66 minor: tests: Tighten up local variable scope. 2016-05-05 19:11:07 +00:00
Daniel Shahaf 21207c336a tests: TAP compliance: Do not emit literal '#' in the 'description' part 2016-05-05 19:11:07 +00:00
Daniel Shahaf 56a867076c tests: Followup to fd061b5730: quote both expected and actual output. 2016-05-05 19:10:06 +00:00
Daniel Shahaf cef49752fd dev docs: Create HACKING.md. 
Review-by: Matthew Martin
 2016-05-05 01:20:32 +00:00
Daniel Shahaf e8af14fe1f minor: Rewrap docs for uncompiled readability. 2016-05-03 15:00:48 +00:00
Daniel Shahaf f34714b8ee Bump copyright years. 2016-04-30 02:11:17 +00:00
Daniel Shahaf c54c076cfa cleanup: Avoid colon after parameter expansion to avoid risking introducing a colon modifier. 2016-04-24 17:08:08 +00:00
Daniel Shahaf 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
Daniel Shahaf 367929502f release.md: Add a release checklist line item. 2016-04-05 05:49:18 +00:00
Daniel Shahaf 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 3cb58fd7d7, "Optimization: -1 is
extra computation of string length internally".

Fixes zsh-users/zsh-syntax-highlighting#279.
 2016-03-23 01:32:44 +00:00
Daniel Shahaf cb02451a4e widget binding: Fix crucial typo in last commit. 2016-03-18 15:14:09 +00:00