public/zsh-syntax-highlighting
1
0
Fork 0
mirror of https://github.com/zsh-users/zsh-syntax-highlighting.git synced 2025-04-17 11:35:32 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge ca6b31f6e0 into bdbe214453

Browse Source
This commit is contained in:
Daniel Shahaf 2017-12-25 00:40:58 +00:00 committed by GitHub
commit 923cc1ed40
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
zsh-syntax-highlighting.zsh
View File

@ -1,3 +1,4 @@
() { # that's here to make the line numbers in errors match the file line numbers.
# ------------------------------------------------------------------------------------------------- # -------------------------------------------------------------------------------------------------
# Copyright (c) 2010-2016 zsh-syntax-highlighting contributors # Copyright (c) 2010-2016 zsh-syntax-highlighting contributors
# All rights reserved. # All rights reserved.
@ -28,13 +29,17 @@
# ------------------------------------------------------------------------------------------------- # -------------------------------------------------------------------------------------------------
# First of all, ensure predictable parsing. # First of all, ensure predictable parsing.
zsh_highlight__aliases=`builtin alias -Lm '[^+]*'` local zsh_highlight__aliases="$(builtin alias -Lm '[^+]*')"
# In zsh <= 5.2, `alias -L` emits aliases that begin with a plus sign ('alias -- +foo=42') # In zsh <= 5.2, `alias -L` emits aliases that begin with a plus sign ('alias -- +foo=42')
# them without a '--' guard, so they don't round trip. # them without a '--' guard, so they don't round trip.
# #
# Hence, we exclude them from unaliasing: # Hence, we exclude them from unaliasing:
builtin unalias -m '[^+]*' builtin unalias -m '[^+]*'
# Set the 5.4-to-be WARN_NESTED_VAR option if it's available.
emulate -L zsh
setopt localoptions warncreateglobal ${(k)options[(I)warnnestedvar]}
# Set $0 to the expected value, regardless of functionargzero. # Set $0 to the expected value, regardless of functionargzero.
0=${(%):-%N} 0=${(%):-%N}
if true; then if true; then
@ -45,7 +50,7 @@ if true; then
# When running from a source tree without 'make install', $ZSH_HIGHLIGHT_REVISION # When running from a source tree without 'make install', $ZSH_HIGHLIGHT_REVISION
# would be set to '$Format:%H$' literally. That's an invalid value, and obtaining # would be set to '$Format:%H$' literally. That's an invalid value, and obtaining
# the valid value (via `git rev-parse HEAD`, as Makefile does) might be costly, so: # the valid value (via `git rev-parse HEAD`, as Makefile does) might be costly, so:
ZSH_HIGHLIGHT_REVISION=HEAD typeset -g ZSH_HIGHLIGHT_REVISION=HEAD
fi fi
fi fi
@ -428,7 +433,7 @@ add-zsh-hook preexec _zsh_highlight_preexec_hook 2>/dev/null || {
zmodload zsh/parameter 2>/dev/null || true zmodload zsh/parameter 2>/dev/null || true
# Initialize the array of active highlighters if needed. # Initialize the array of active highlighters if needed.
[[ $#ZSH_HIGHLIGHT_HIGHLIGHTERS -eq 0 ]] && ZSH_HIGHLIGHT_HIGHLIGHTERS=(main) [[ $#ZSH_HIGHLIGHT_HIGHLIGHTERS -eq 0 ]] && ZSH_HIGHLIGHT_HIGHLIGHTERS[1]=main
# Restore the aliases we unned # Restore the aliases we unned
eval "$zsh_highlight__aliases" eval "$zsh_highlight__aliases"
@ -436,3 +441,6 @@ builtin unset zsh_highlight__aliases
# Set $?. # Set $?.
true true
# End anonymous function
}