From 04f9c8884fbb24dfaf79db56700d08946d39c126 Mon Sep 17 00:00:00 2001 From: sonnym Date: Sat, 7 Dec 2013 05:11:19 -0500 Subject: [PATCH 1/5] highlight ^old^new pattern by extending the already in place mechanism of checking for the first histchar to check for the second as well --- highlighters/main/main-highlighter.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/highlighters/main/main-highlighter.zsh b/highlighters/main/main-highlighter.zsh index 72b48f0..5b038b4 100755 --- a/highlighters/main/main-highlighter.zsh +++ b/highlighters/main/main-highlighter.zsh @@ -128,7 +128,7 @@ _zsh_highlight_main_highlighter() new_expression=true elif _zsh_highlight_main_highlighter_check_path; then style=$ZSH_HIGHLIGHT_STYLES[path] - elif [[ $arg[0,1] = $histchars[0,1] ]]; then + elif [[ $arg[0,1] == $histchars[0,1] || $arg[0,1] == $histchars[2,2] ]]; then style=$ZSH_HIGHLIGHT_STYLES[history-expansion] else style=$ZSH_HIGHLIGHT_STYLES[unknown-token] From e8cc271314612cf2aad1fe8e9e28d1a9c24ae0c8 Mon Sep 17 00:00:00 2001 From: Randy Date: Mon, 24 Mar 2014 08:45:34 +0200 Subject: [PATCH 2/5] Resolves slow performance in brackets highlighter --- highlighters/brackets/brackets-highlighter.zsh | 1 + 1 file changed, 1 insertion(+) diff --git a/highlighters/brackets/brackets-highlighter.zsh b/highlighters/brackets/brackets-highlighter.zsh index 8e635dd..ee4a83b 100644 --- a/highlighters/brackets/brackets-highlighter.zsh +++ b/highlighters/brackets/brackets-highlighter.zsh @@ -49,6 +49,7 @@ _zsh_highlight_brackets_highlighter() { local level=0 pos local -A levelpos lastoflevel matching typepos + region_highlight=() # Find all brackets and remember which one is matching for (( pos = 0; $pos < ${#BUFFER}; pos++ )) ; do From 7edd08156e98b8be451bd5a034714746894b2a3d Mon Sep 17 00:00:00 2001 From: Randy Date: Sat, 29 Mar 2014 22:52:10 +0200 Subject: [PATCH 3/5] Chaned main highlighter alorithm to resolve issue #77 --- zsh-syntax-highlighting.zsh | 41 +++++++++++++++++++++---------------- 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/zsh-syntax-highlighting.zsh b/zsh-syntax-highlighting.zsh index cdbe4c4..65f1938 100644 --- a/zsh-syntax-highlighting.zsh +++ b/zsh-syntax-highlighting.zsh @@ -54,37 +54,42 @@ _zsh_highlight() # Do not highlight if there are pending inputs (copy/paste). [[ $PENDING -gt 0 ]] && return $ret + # Reset region highlight to build it from scratch + region_highlight=(); + { - local -a selected_highlighters local cache_place + local -a region_highlight_copy # Select which highlighters in ZSH_HIGHLIGHT_HIGHLIGHTERS need to be invoked. local highlighter; for highlighter in $ZSH_HIGHLIGHT_HIGHLIGHTERS; do + # eval cache place for current highlighter and prepare it + cache_place="_zsh_highlight_${highlighter}_highlighter_cache" + typeset -ga ${cache_place} + # If highlighter needs to be invoked if "_zsh_highlight_${highlighter}_highlighter_predicate"; then - # Mark the highlighter as selected for update. - selected_highlighters+=($highlighter) + # save a copy, and cleanup region_highlight + region_highlight_copy=("${region_highlight[@]}") + region_highlight=() - # Remove what was stored in its cache from region_highlight. - cache_place="_zsh_highlight_${highlighter}_highlighter_cache" - typeset -ga ${cache_place} - [[ ${#${(P)cache_place}} -gt 0 ]] && [[ ! -z ${region_highlight-} ]] && region_highlight=(${region_highlight:#(${(P~j.|.)cache_place})}) + # Execute highlighter and save result + { + "_zsh_highlight_${highlighter}_highlighter" + } always { + eval "${cache_place}=(\"\${region_highlight[@]}\")" + } + + # Restore saved region_highlight + region_highlight=("${region_highlight_copy[@]}") fi - done - # Invoke each selected highlighter and store the result in its cache. - local -a region_highlight_copy - for highlighter in $selected_highlighters; do - cache_place="_zsh_highlight_${highlighter}_highlighter_cache" - region_highlight_copy=($region_highlight) - { - "_zsh_highlight_${highlighter}_highlighter" - } always { - [[ ! -z ${region_highlight-} ]] && : ${(PA)cache_place::=${region_highlight:#(${(~j.|.)region_highlight_copy})}} - } + # Use value form cache if any cached + eval "region_highlight+=(\"\${${cache_place}[@]}\")" + done } always { From d7d4dff1c8bc95a462156e131f4d48b02962c5cd Mon Sep 17 00:00:00 2001 From: Joost Cassee Date: Sun, 8 Jun 2014 00:04:00 +0200 Subject: [PATCH 4/5] Add 'line' highlighter for the whole buffer --- highlighters/README.md | 1 + highlighters/line/README.md | 24 ++++++++++++++ highlighters/line/line-highlighter.zsh | 45 ++++++++++++++++++++++++++ 3 files changed, 70 insertions(+) create mode 100644 highlighters/line/README.md create mode 100644 highlighters/line/line-highlighter.zsh diff --git a/highlighters/README.md b/highlighters/README.md index 0ea64c2..987cc83 100644 --- a/highlighters/README.md +++ b/highlighters/README.md @@ -8,6 +8,7 @@ Syntax highlighting is done by pluggable highlighters: * [***pattern***](pattern) - matches user-defined patterns. * [***cursor***](cursor) - matches the cursor position. * [***root***](root) - triggered if the current user is root. +* [***line***](line) - applied to the whole command line How to activate highlighters diff --git a/highlighters/line/README.md b/highlighters/line/README.md new file mode 100644 index 0000000..2be32a2 --- /dev/null +++ b/highlighters/line/README.md @@ -0,0 +1,24 @@ +zsh-syntax-highlighting / highlighters / line +================================================= + +This is the ***line*** highlighter, that highlights the whole line. + + +How to activate it +------------------ +To activate it, add it to `ZSH_HIGHLIGHT_HIGHLIGHTERS`: + + ZSH_HIGHLIGHT_HIGHLIGHTERS=( [...] line) + + +How to tweak it +--------------- +This highlighter defines the following styles: + +* `line` - the style for the whole line + +To override one of those styles, change its entry in `ZSH_HIGHLIGHT_STYLES`, for example in `~/.zshrc`: + + ZSH_HIGHLIGHT_STYLES[line]='bold' + +The syntax for declaring styles is [documented here](http://zsh.sourceforge.net/Doc/Release/Zsh-Line-Editor.html#SEC135). diff --git a/highlighters/line/line-highlighter.zsh b/highlighters/line/line-highlighter.zsh new file mode 100644 index 0000000..230c587 --- /dev/null +++ b/highlighters/line/line-highlighter.zsh @@ -0,0 +1,45 @@ +#!/usr/bin/env zsh +# ------------------------------------------------------------------------------------------------- +# Copyright (c) 2010-2011 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 +# ------------------------------------------------------------------------------------------------- + + +# Define default styles. +: ${ZSH_HIGHLIGHT_STYLES[line]:=} + +# Whether the root highlighter should be called or not. +_zsh_highlight_line_highlighter_predicate() +{ + _zsh_highlight_buffer_modified +} + +# root highlighting function. +_zsh_highlight_line_highlighter() +{ + region_highlight+=("0 $#BUFFER $ZSH_HIGHLIGHT_STYLES[line]") +} From 74a183447d88a10ba55273a7b5a794f62d72ef2d Mon Sep 17 00:00:00 2001 From: Vincent Bernat Date: Sun, 29 Jun 2014 11:52:32 +0200 Subject: [PATCH 5/5] zle: don't override yank/yank-pop `yank-pop` relies on the fact that the last zle command is `yank` or `yank-pop` to work correctly. Rewriting them prevents this check to work correctly breaking `yank-pop`. This fix just disallow overriding of those two zle commands. As a side-effect, syntax highlighting will not happen when using. This fixes #99. --- zsh-syntax-highlighting.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zsh-syntax-highlighting.zsh b/zsh-syntax-highlighting.zsh index cdbe4c4..7d780d2 100644 --- a/zsh-syntax-highlighting.zsh +++ b/zsh-syntax-highlighting.zsh @@ -134,7 +134,7 @@ _zsh_highlight_bind_widgets() # Override ZLE widgets to make them invoke _zsh_highlight. local cur_widget - for cur_widget in ${${(f)"$(builtin zle -la)"}:#(.*|_*|orig-*|run-help|which-command|beep)}; do + for cur_widget in ${${(f)"$(builtin zle -la)"}:#(.*|_*|orig-*|run-help|which-command|beep|yank*)}; do case $widgets[$cur_widget] in # Already rebound event: do nothing.