chinhwajie/zsh-syntax-highlighting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use the new, unreleased zsh 'memo=' feature to remove only our own entries from $region_highlight.

Browse Source 
Fixes #418 (interoperability issue with other plugins).
This commit is contained in:
Daniel Shahaf
2020-07-14 00:24:04 +00:00
parent 075c852924
commit 810c2dcede
6 changed files with 97 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
highlighters/pattern/pattern-highlighter.zsh
View File

@@ -54,7 +54,7 @@ _zsh_highlight_pattern_highlighter_loop()
local -a match mbegin mend
local MATCH; integer MBEGIN MEND
if [[ "$buf" == (#b)(*)(${~pat})* ]]; then
region_highlight+=("$((mbegin[2] - 1)) $mend[2] $ZSH_HIGHLIGHT_PATTERNS[$pat]")
region_highlight+=("$((mbegin[2] - 1)) $mend[2] $ZSH_HIGHLIGHT_PATTERNS[$pat], memo=zsh-syntax-highlighting")
"$0" "$match[1]" "$pat"; return $?
fi
}

2
highlighters/regexp/regexp-highlighter.zsh
View File

@@ -55,7 +55,7 @@ _zsh_highlight_regexp_highlighter_loop()
local -a match mbegin mend
while true; do
[[ "$buf" =~ "$pat" ]] || return;
region_highlight+=("$((MBEGIN - 1 + OFFSET)) $((MEND + OFFSET)) $ZSH_HIGHLIGHT_REGEXP[$pat]")
region_highlight+=("$((MBEGIN - 1 + OFFSET)) $((MEND + OFFSET)) $ZSH_HIGHLIGHT_REGEXP[$pat], memo=zsh-syntax-highlighting")
buf="$buf[$(($MEND+1)),-1]"
OFFSET=$((MEND+OFFSET));
done