.github/workflows/test.yml

@@ -20,7 +20,6 @@ jobs:
       matrix:
         version:
           - master
-          - 5.9
           - 5.8.1
           - 5.8
           - 5.7.1
@@ -57,7 +56,7 @@ jobs:
     container:
       image: ghcr.io/zsh-users/zsh:${{ matrix.version }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2
       - run: install_packages bsdmainutils make procps
       - run: make test
 
@@ -68,8 +67,9 @@ jobs:
     steps:
       -
         name: Notify IRC
-        uses: Gottox/irc-message-action@v2
+        uses: Gottox/irc-message-action@v1
         with:
+          server: irc.libera.chat
           channel: '#zsh-syntax-highlighting'
           nickname: zsyh-gh-bot
           message: '${{ github.ref }} failed tests: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}'

.version

@@ -1 +1 @@
-0.8.1-dev
+0.8.0-alpha2-dev

changelog.md

@@ -1,15 +1,6 @@
 # Changes in HEAD
 
 
-- Highlight `&>` `>&|` `>&!` `&>|` and `&>!` as redirection.
-  [#942]
-
-
-# Changes in 0.8.0
-
-This is a stable bugfix and feature release.  Major new features and changes include:
-
-
 ## Changes fixed as part of the switch to zle-line-pre-redraw
 
 The changes in this section were fixed by switching to a `zle-line-pre-redraw`-based

highlighters/main/main-highlighter.zsh

@@ -254,9 +254,10 @@ _zsh_highlight_main__is_runnable() {
 _zsh_highlight_main__is_redirection() {
   # A redirection operator token:
   # - starts with an optional single-digit number;
-  # - is one of the tokens listed in zshmisc(1)
+  # - then, has a '<' or '>' character;
-  # - however (z) normalizes ! to |
+  # - is not a process substitution [<(...) or >(...)].
-  [[ ${1#[0-9]} == (\<|\<\>|(\>|\>\>)(|\|)|\<\<(|-)|\<\<\<|\<\&|\&\<|(\>|\>\>)\&(|\|)|\&(\>|\>\>)(|\||\!)) ]]
+  # - is not a numeric glob <->
+  [[ $1 == (<0-9>|)(\<|\>)* ]] && [[ $1 != (\<|\>)$'\x28'* ]] && [[ $1 != *'<'*'-'*'>'* ]]
 }
 
 # Resolve alias.
@@ -354,7 +355,6 @@ _zsh_highlight_highlighter_main_paint()
     'pkexec' '' # doesn't take short options; immune to #121 because it's usually not passed --option flags
     # Not listed: -h, which has two different meanings.
     'sudo' Cgprtu:AEHPSbilns:eKkVv # as of sudo 1.8.21p2
-    'run0' ugD:h # systemd 256.6
     'stdbuf' ioe:
     'eatmydata' ''
     'catchsegv' ''
@@ -373,7 +373,6 @@ _zsh_highlight_highlighter_main_paint()
     'grc' :se # grc - a "generic colouriser" (that's their spelling, not mine)
     'cpulimit' elp:ivz # cpulimit 0.2
     'ktrace' fgpt:aBCcdiT
-    'caffeinate' tw:dimsu # as of macOS's caffeinate(8) dated November 9, 2012
   )
   # Commands that would need to skip one positional argument:
   #    flock

highlighters/main/test-data/multiple-redirections.zsh

@@ -27,7 +27,7 @@
 # vim: ft=zsh sw=2 ts=2 et
 # -------------------------------------------------------------------------------------------------
 
-BUFFER='id bob | grep java | sort | uniq | tail | head'
+BUFFER='ps aux | grep java | sort | uniq | tail | head'
 
 expected_region_highlight=(
   "1  2  command" # ps

highlighters/main/test-data/redirection-all.zsh

@@ -1,95 +0,0 @@
-#!/usr/bin/env zsh
-# -------------------------------------------------------------------------------------------------
-# Copyright (c) 2024 zsh-syntax-highlighting contributors
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without modification, are permitted
-# provided that the following conditions are met:
-#
-#  * Redistributions of source code must retain the above copyright notice, this list of conditions
-#    and the following disclaimer.
-#  * Redistributions in binary form must reproduce the above copyright notice, this list of
-#    conditions and the following disclaimer in the documentation and/or other materials provided
-#    with the distribution.
-#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
-#    may be used to endorse or promote products derived from this software without specific prior
-#    written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
-# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-# -------------------------------------------------------------------------------------------------
-# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
-# vim: ft=zsh sw=2 ts=2 et
-# -------------------------------------------------------------------------------------------------
-
-BUFFER=$': <foo 9<foo <>foo 9<>foo >foo 9>foo >|foo >\!foo >>foo >>|foo >>\!foo <<<foo <&9 >&9 <&- >&- <&p >&p >&foo &>foo >&|foo >&\!foo &>|foo &>\!foo >>&foo &>>foo >>&|foo >>&\!foo &>>|foo &>>\!foo'
-
-expected_region_highlight=(
-  '1 1 builtin' # :
-  '3 3 redirection' # <
-  '4 6 default' # foo
-  '8 9 redirection' # 9<
-  '10 12 default' # foo
-  '14 15 redirection' # <>
-  '16 18 default' # foo
-  '20 22 redirection' # 9<>
-  '23 25 default' # foo
-  '27 27 redirection' # >
-  '28 30 default' # foo
-  '32 33 redirection' # 9>
-  '34 36 default' # foo
-  '38 39 redirection' # >|
-  '40 42 default' # foo
-  '44 45 redirection' # >\!
-  '46 48 default' # foo
-  '50 51 redirection' # >>
-  '52 54 default' # foo
-  '56 58 redirection' # >>|
-  '59 61 default' # foo
-  '63 65 redirection' # >>\!
-  '66 68 default' # foo
-  '70 72 redirection' # <<<
-  '73 75 default' # foo
-  '77 78 redirection' # <&
-  '79 79 numeric-fd' # 9
-  '81 82 redirection' # >&
-  '83 83 numeric-fd' # 9
-  '85 86 redirection' # <&
-  '87 87 redirection' # -
-  '89 90 redirection' # >&
-  '91 91 redirection' # -
-  '93 94 redirection' # <&
-  '95 95 redirection' # p
-  '97 98 redirection' # >&
-  '99 99 redirection' # p
-  '101 102 redirection' # >&
-  '103 105 default' # foo
-  '107 108 redirection' # &>
-  '109 111 default' # foo
-  '113 115 redirection' # >&|
-  '116 118 default' # foo
-  '120 122 redirection' # >&\!
-  '123 125 default' # foo
-  '127 129 redirection' # &>|
-  '130 132 default' # foo
-  '134 136 redirection' # &>\!
-  '137 139 default' # foo
-  '141 143 redirection' # >>&
-  '144 146 default' # foo
-  '148 150 redirection' # &>>
-  '151 153 default' # foo
-  '155 158 redirection' # >>&|
-  '159 161 default' # foo
-  '163 166 redirection' # >>&\!
-  '167 169 default' # foo
-  '171 174 redirection' # &>>|
-  '175 177 default' # foo
-  '179 182 redirection' # &>>\!
-  '183 185 default' # foo
-)

highlighters/main/test-data/simple-redirection.zsh

@@ -27,7 +27,7 @@
 # vim: ft=zsh sw=2 ts=2 et
 # -------------------------------------------------------------------------------------------------
 
-BUFFER='id bob | grep java'
+BUFFER='ps aux | grep java'
 
 expected_region_highlight=(
   "1  2  command" # ps

tests/README.md

@@ -86,7 +86,7 @@ grow ways to set `$PREBUFFER` to inject free-form code into the generated file.
 Highlighting test
 -----------------
 
-[`test-highlighting.zsh`](test-highlighting.zsh) tests the correctness of
+[`test-highlighting.zsh`](tests/test-highlighting.zsh) tests the correctness of
 the highlighting. Usage:
 
 ```zsh
@@ -110,7 +110,7 @@ results (tests that failed but were expected to succeed, or vice-versa), run
 Performance test
 ----------------
 
-[`test-perfs.zsh`](test-perfs.zsh) measures the time spent doing the
+[`test-perfs.zsh`](tests/test-perfs.zsh) measures the time spent doing the
 highlighting. Usage:
 
 ```zsh

zsh-syntax-highlighting.zsh

@@ -155,7 +155,18 @@ _zsh_highlight()
         # C structs, so that none of the previous case patterns will match.
         #
         # In either case, fall back to a version check.
-        if is-at-least 5.9; then
+        #
+        # The memo= feature was added to zsh in commit zsh-5.8-172-gdd6e702ee.
+        # The version number at the time was 5.8.0.2-dev (see Config/version.mk).
+        # Therefore, on zsh master 5.8.0.3 and newer the memo= feature is available.
+        # However, there's also the zsh 5.8.1 release, which doesn't have the
+        # memo= feature.
+        #
+        # On zsh master 5.8.0.2 between the aforementioned commit and the
+        # first Config/version.mk bump after it (zsh-5.8-607-g75c1edde5, the
+        # bump to 5.8.1.1-dev following the backport to master of the bump
+        # to 5.8.1), this condition will false negative.
+        if is-at-least 5.8.1.1 $ZSH_VERSION.0.0; then
           integer -gr zsh_highlight__memo_feature=1
         else
           integer -gr zsh_highlight__memo_feature=0
@@ -404,7 +415,9 @@ _zsh_highlight_call_widget()
 #    We check this with a plain version number check, since a functional check,
 #    as done by _zsh_highlight, can only be done from inside a widget
 #    function — a catch-22.
-if is-at-least 5.9 && _zsh_highlight__function_callable_p add-zle-hook-widget
+#
+#    See _zsh_highlight for the magic version number.
+if is-at-least 5.8.1.1 $ZSH_VERSION.0.0 && _zsh_highlight__function_callable_p add-zle-hook-widget
 then
   autoload -U add-zle-hook-widget
   _zsh_highlight__zle-line-finish() {