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 through28d7056a7a
. 'main': Escape '!' within double-quoted strings. [REVERTED] Post-branch version number bump. This reverts commit1bdb88aee1
.
14
README.md
@ -13,7 +13,19 @@ highlighing of commands whilst they are typed at a zsh prompt into an
|
||||
interactive terminal. This helps in reviewing commands before running
|
||||
them, particularly in catching syntax errors.
|
||||
|
||||
[![Screenshot](images/preview-smaller.png)](images/preview.png)
|
||||
Some examples:
|
||||
|
||||
Before: [![Screenshot #1.1](images/before1-smaller.png)](images/before1.png)
|
||||
<br/>
|
||||
After: [![Screenshot #1.2](images/after1-smaller.png)](images/after1.png)
|
||||
|
||||
Before: [![Screenshot #2.1](images/before2-smaller.png)](images/before2.png)
|
||||
<br/>
|
||||
After: [![Screenshot #2.2](images/after2-smaller.png)](images/after2.png)
|
||||
|
||||
Before: [![Screenshot #3.1](images/before3-smaller.png)](images/before3.png)
|
||||
<br/>
|
||||
After: [![Screenshot #3.2](images/after3-smaller.png)](images/after3.png)
|
||||
|
||||
|
||||
How to install
|
||||
|
@ -1,4 +1,4 @@
|
||||
up to 0020f592c108
|
||||
up to 28d7056a7a06
|
||||
|
||||
# Changes in version 0.5.0
|
||||
|
||||
@ -75,6 +75,9 @@ in this area.
|
||||
This also adds an `arg0` style that all other command word styles fall back to.
|
||||
(b4537a972eed, bccc3dc26943)
|
||||
|
||||
- Escaped history expansions inside double quotes: `: "\!"`
|
||||
(28d7056a7a06)
|
||||
|
||||
|
||||
## Fixed highlighting of:
|
||||
|
||||
|
@ -810,7 +810,7 @@ _zsh_highlight_main_highlighter_highlight_string()
|
||||
fi
|
||||
;;
|
||||
"\\") style=back-double-quoted-argument
|
||||
if [[ \\\`\"\$ == *$arg[$i+1]* ]]; then
|
||||
if [[ \\\`\"\$${histchars[1]} == *$arg[$i+1]* ]]; then
|
||||
(( k += 1 )) # Color following char too.
|
||||
(( i += 1 )) # Skip parsing the escaped char.
|
||||
else
|
||||
|
@ -0,0 +1,37 @@
|
||||
#!/usr/bin/env zsh
|
||||
# -------------------------------------------------------------------------------------------------
|
||||
# Copyright (c) 2016 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='echo "Hello\!"'
|
||||
|
||||
expected_region_highlight=(
|
||||
'1 4 builtin' # echo
|
||||
'6 14 double-quoted-argument' # "Hello\\\!"
|
||||
'12 13 back-double-quoted-argument' # \\\!
|
||||
)
|
BIN
images/after1-smaller.png
Normal file
After Width: | Height: | Size: 2.5 KiB |
BIN
images/after1.png
Normal file
After Width: | Height: | Size: 5.7 KiB |
BIN
images/after2-smaller.png
Normal file
After Width: | Height: | Size: 4.3 KiB |
BIN
images/after2.png
Normal file
After Width: | Height: | Size: 10 KiB |
BIN
images/after3-smaller.png
Normal file
After Width: | Height: | Size: 1.6 KiB |
BIN
images/after3.png
Normal file
After Width: | Height: | Size: 3.3 KiB |
BIN
images/before1-smaller.png
Normal file
After Width: | Height: | Size: 1.6 KiB |
BIN
images/before1.png
Normal file
After Width: | Height: | Size: 2.6 KiB |
BIN
images/before2-smaller.png
Normal file
After Width: | Height: | Size: 2.5 KiB |
BIN
images/before2.png
Normal file
After Width: | Height: | Size: 2.6 KiB |
BIN
images/before3-smaller.png
Normal file
After Width: | Height: | Size: 763 B |
BIN
images/before3.png
Normal file
After Width: | Height: | Size: 1.4 KiB |