From 2c5acaefa930600acdcec3d8a7322193ae032aeb Mon Sep 17 00:00:00 2001 From: Daniel Shahaf Date: Mon, 26 Jan 2015 12:49:19 +0000 Subject: [PATCH 1/7] Refactoring, no functional change The new function will be used in the next commit. --- highlighters/main/main-highlighter.zsh | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/highlighters/main/main-highlighter.zsh b/highlighters/main/main-highlighter.zsh index 5b038b4..18d5bc4 100755 --- a/highlighters/main/main-highlighter.zsh +++ b/highlighters/main/main-highlighter.zsh @@ -60,6 +60,13 @@ _zsh_highlight_main_highlighter_predicate() _zsh_highlight_buffer_modified } +# Helper to deal with tokens crossing line boundaries. +_zsh_highlight_main_add_region_highlight() { + integer start=$1 end=$2 + local style=$3 + region_highlight+=("$start $end $style") +} + # Main syntax highlighting function. _zsh_highlight_main_highlighter() { @@ -142,7 +149,7 @@ _zsh_highlight_main_highlighter() '-'*) style=$ZSH_HIGHLIGHT_STYLES[single-hyphen-option];; "'"*"'") style=$ZSH_HIGHLIGHT_STYLES[single-quoted-argument];; '"'*'"') style=$ZSH_HIGHLIGHT_STYLES[double-quoted-argument] - region_highlight+=("$start_pos $end_pos $style") + _zsh_highlight_main_add_region_highlight $start_pos $end_pos $style _zsh_highlight_main_highlighter_highlight_string substr_color=1 ;; @@ -162,7 +169,7 @@ _zsh_highlight_main_highlighter() fi # if a style_override was set (eg in _zsh_highlight_main_highlighter_check_path), use it [[ -n $style_override ]] && style=$ZSH_HIGHLIGHT_STYLES[$style_override] - [[ $substr_color = 0 ]] && region_highlight+=("$start_pos $end_pos $style") + [[ $substr_color = 0 ]] && _zsh_highlight_main_add_region_highlight $start_pos $end_pos $style [[ -n ${(M)ZSH_HIGHLIGHT_TOKENS_FOLLOWED_BY_COMMANDS:#"$arg"} ]] && new_expression=true start_pos=$end_pos done @@ -235,6 +242,6 @@ _zsh_highlight_main_highlighter_highlight_string() *) [[ $varflag -eq 0 ]] && continue ;; esac - region_highlight+=("$j $k $style") + _zsh_highlight_main_add_region_highlight $j $k $style done } From 667495bfb7f7b27fb95d4773554bedef0042b95e Mon Sep 17 00:00:00 2001 From: Daniel Shahaf Date: Mon, 26 Jan 2015 14:03:08 +0000 Subject: [PATCH 2/7] Support multiline strings --- highlighters/main/main-highlighter.zsh | 13 ++++++- .../main/test-data/multiline-string.zsh | 37 +++++++++++++++++++ tests/test-highlighting.zsh | 8 ++-- 3 files changed, 52 insertions(+), 6 deletions(-) create mode 100644 highlighters/main/test-data/multiline-string.zsh diff --git a/highlighters/main/main-highlighter.zsh b/highlighters/main/main-highlighter.zsh index 18d5bc4..516600f 100755 --- a/highlighters/main/main-highlighter.zsh +++ b/highlighters/main/main-highlighter.zsh @@ -64,6 +64,14 @@ _zsh_highlight_main_highlighter_predicate() _zsh_highlight_main_add_region_highlight() { integer start=$1 end=$2 local style=$3 + + # The calculation was relative to $PREBUFFER$BUFFER, but region_highlight is + # relative to $BUFFER. + (( start -= $#PREBUFFER )) + (( end -= $#PREBUFFER )) + + (( end < 0 )) && return # bug + (( start < 0 )) && start=0 # normal with e.g. multiline strings region_highlight+=("$start $end $style") } @@ -76,6 +84,7 @@ _zsh_highlight_main_highlighter() typeset -a ZSH_HIGHLIGHT_TOKENS_COMMANDSEPARATOR typeset -a ZSH_HIGHLIGHT_TOKENS_PRECOMMANDS typeset -a ZSH_HIGHLIGHT_TOKENS_FOLLOWED_BY_COMMANDS + local buf="$PREBUFFER$BUFFER" region_highlight=() ZSH_HIGHLIGHT_TOKENS_COMMANDSEPARATOR=( @@ -89,11 +98,11 @@ _zsh_highlight_main_highlighter() $ZSH_HIGHLIGHT_TOKENS_COMMANDSEPARATOR $ZSH_HIGHLIGHT_TOKENS_PRECOMMANDS ) - for arg in ${(z)BUFFER}; do + for arg in ${(z)buf}; do local substr_color=0 local style_override="" [[ $start_pos -eq 0 && $arg = 'noglob' ]] && highlight_glob=false - ((start_pos+=${#BUFFER[$start_pos+1,-1]}-${#${BUFFER[$start_pos+1,-1]##[[:space:]]#}})) + ((start_pos+=${#buf[$start_pos+1,-1]}-${#${buf[$start_pos+1,-1]##[[:space:]]#}})) ((end_pos=$start_pos+${#arg})) # Parse the sudo command line if $sudo; then diff --git a/highlighters/main/test-data/multiline-string.zsh b/highlighters/main/test-data/multiline-string.zsh new file mode 100644 index 0000000..f2eb13e --- /dev/null +++ b/highlighters/main/test-data/multiline-string.zsh @@ -0,0 +1,37 @@ +#!/usr/bin/env zsh +# ------------------------------------------------------------------------------------------------- +# Copyright (c) 2015 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 +# ------------------------------------------------------------------------------------------------- + +PREBUFFER=$'echo "foo1\n' +BUFFER='foo2" ./' + +expected_region_highlight=( + "0 5 $ZSH_HIGHLIGHT_STYLES[double-quoted-argument]" # 'foo2"' + "7 8 $ZSH_HIGHLIGHT_STYLES[path]" # './' +) diff --git a/tests/test-highlighting.zsh b/tests/test-highlighting.zsh index 2e72b2b..fdca16f 100755 --- a/tests/test-highlighting.zsh +++ b/tests/test-highlighting.zsh @@ -60,13 +60,13 @@ ZSH_HIGHLIGHT_HIGHLIGHTERS=($1) for data_file in ${0:h:h}/highlighters/$1/test-data/*; do # Load the data and prepare checking it. - BUFFER= ; expected_region_highlight=(); errors=() + PREBUFFER= BUFFER= ; expected_region_highlight=(); errors=() echo -n "* ${data_file:t:r}: " . $data_file - # Check the data declares $BUFFER. - if [[ ${#BUFFER} -eq 0 ]]; then - errors+=("'BUFFER' is not declared or blank.") + # Check the data declares $PREBUFFER or $BUFFER. + if [[ ${#PREBUFFER} -eq 0 && ${#BUFFER} -eq 0 ]]; then + errors+=("Either 'PREBUFFER' or 'BUFFER' must be declared and non-blank") else # Check the data declares $expected_region_highlight. From 23cacb12fe9a3580fa9ec45d625218a05a146779 Mon Sep 17 00:00:00 2001 From: Daniel Shahaf Date: Mon, 26 Jan 2015 15:17:49 +0000 Subject: [PATCH 3/7] Support backslash continuations --- highlighters/main/main-highlighter.zsh | 2 +- .../main/test-data/backslash-continuation.zsh | 36 +++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 highlighters/main/test-data/backslash-continuation.zsh diff --git a/highlighters/main/main-highlighter.zsh b/highlighters/main/main-highlighter.zsh index 516600f..fa495c7 100755 --- a/highlighters/main/main-highlighter.zsh +++ b/highlighters/main/main-highlighter.zsh @@ -102,7 +102,7 @@ _zsh_highlight_main_highlighter() local substr_color=0 local style_override="" [[ $start_pos -eq 0 && $arg = 'noglob' ]] && highlight_glob=false - ((start_pos+=${#buf[$start_pos+1,-1]}-${#${buf[$start_pos+1,-1]##[[:space:]]#}})) + ((start_pos+=${#buf[$start_pos+1,-1]}-${#${buf[$start_pos+1,-1]##([[:space:]]|\\[[:space:]])#}})) ((end_pos=$start_pos+${#arg})) # Parse the sudo command line if $sudo; then diff --git a/highlighters/main/test-data/backslash-continuation.zsh b/highlighters/main/test-data/backslash-continuation.zsh new file mode 100644 index 0000000..f0b22f7 --- /dev/null +++ b/highlighters/main/test-data/backslash-continuation.zsh @@ -0,0 +1,36 @@ +#!/usr/bin/env zsh +# ------------------------------------------------------------------------------------------------- +# Copyright (c) 2015 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 +# ------------------------------------------------------------------------------------------------- + +PREBUFFER=$'echo \\\n' +BUFFER='noglob' + +expected_region_highlight=( + "0 6 none" # 'noglob' highlighted as a string, not as a precomand +) From 384be15b130a54d19e3d0183b645edd440645ccb Mon Sep 17 00:00:00 2001 From: Daniel Shahaf Date: Mon, 26 Jan 2015 15:39:42 +0000 Subject: [PATCH 4/7] Support literal newlines --- highlighters/main/main-highlighter.zsh | 21 ++++++++++ .../main/test-data/vanilla-newline.zsh | 40 +++++++++++++++++++ 2 files changed, 61 insertions(+) create mode 100644 highlighters/main/test-data/vanilla-newline.zsh diff --git a/highlighters/main/main-highlighter.zsh b/highlighters/main/main-highlighter.zsh index fa495c7..657fcd3 100755 --- a/highlighters/main/main-highlighter.zsh +++ b/highlighters/main/main-highlighter.zsh @@ -104,6 +104,27 @@ _zsh_highlight_main_highlighter() [[ $start_pos -eq 0 && $arg = 'noglob' ]] && highlight_glob=false ((start_pos+=${#buf[$start_pos+1,-1]}-${#${buf[$start_pos+1,-1]##([[:space:]]|\\[[:space:]])#}})) ((end_pos=$start_pos+${#arg})) + + # Deal with faked colons. + # + # We can't use the (Z+n+) flag because that elides the end-of-command + # token altogether, so 'echo foo\necho bar' (two commands) becomes + # indistinguishable from 'echo foo echo bar' (one command with three + # words for arguments). + if [[ $arg == ';' ]] ; then + if [[ $buf[start_pos+1] == ';' ]] ; then + # Literally-input colon. That's the normal case. + elif [[ $buf[start_pos] == $'\n' ]] ; then + # Newline token rendered as a colon. Empirically we're off-by-one. + (( start_pos -= 1 )) + (( end_pos -= 1 )) + else + # Currently, there aren't any other sources of ";" (SEPER) tokens + # besides literally-input semicolons and (Z+n+)-converted newlines, + # If that ever changes, handle them here. + fi + fi + # Parse the sudo command line if $sudo; then case "$arg" in diff --git a/highlighters/main/test-data/vanilla-newline.zsh b/highlighters/main/test-data/vanilla-newline.zsh new file mode 100644 index 0000000..b876928 --- /dev/null +++ b/highlighters/main/test-data/vanilla-newline.zsh @@ -0,0 +1,40 @@ +#!/usr/bin/env zsh +# ------------------------------------------------------------------------------------------------- +# Copyright (c) 2015 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 +# ------------------------------------------------------------------------------------------------- + +PREBUFFER=$'echo foo; echo bar\n\n\n' +BUFFER='echo baz; echo qux' + +expected_region_highlight=( + "0 4 $ZSH_HIGHLIGHT_STYLES[builtin]" # echo + "5 7 $ZSH_HIGHLIGHT_STYLES[default]" # baz + "8 9 $ZSH_HIGHLIGHT_STYLES[default]" # semicolon + "11 14 $ZSH_HIGHLIGHT_STYLES[builtin]" # echo + "16 18 $ZSH_HIGHLIGHT_STYLES[default]" # qux +) From ff4d402e9a587e0e8f8400a3aeac40a8f73215e5 Mon Sep 17 00:00:00 2001 From: Daniel Shahaf Date: Wed, 28 Jan 2015 13:28:09 +0000 Subject: [PATCH 5/7] Highlight the first part of multiline strings correctly Given the following input: PREBUFFER=$'echo "foo\n' BUFFER='bar"' This patch causes the '"foo' part to be highlighted as a string. There is no test because the tests only check highlighting of BUFFER, and 'bar"' is already highlighted correctly. --- highlighters/main/main-highlighter.zsh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/highlighters/main/main-highlighter.zsh b/highlighters/main/main-highlighter.zsh index 657fcd3..2c9120a 100755 --- a/highlighters/main/main-highlighter.zsh +++ b/highlighters/main/main-highlighter.zsh @@ -177,13 +177,13 @@ _zsh_highlight_main_highlighter() case $arg in '--'*) style=$ZSH_HIGHLIGHT_STYLES[double-hyphen-option];; '-'*) style=$ZSH_HIGHLIGHT_STYLES[single-hyphen-option];; - "'"*"'") style=$ZSH_HIGHLIGHT_STYLES[single-quoted-argument];; - '"'*'"') style=$ZSH_HIGHLIGHT_STYLES[double-quoted-argument] + "'"*) style=$ZSH_HIGHLIGHT_STYLES[single-quoted-argument];; + '"'*) style=$ZSH_HIGHLIGHT_STYLES[double-quoted-argument] _zsh_highlight_main_add_region_highlight $start_pos $end_pos $style _zsh_highlight_main_highlighter_highlight_string substr_color=1 ;; - '`'*'`') style=$ZSH_HIGHLIGHT_STYLES[back-quoted-argument];; + '`'*) style=$ZSH_HIGHLIGHT_STYLES[back-quoted-argument];; *"*"*) $highlight_glob && style=$ZSH_HIGHLIGHT_STYLES[globbing] || style=$ZSH_HIGHLIGHT_STYLES[default];; *) if _zsh_highlight_main_highlighter_check_path; then style=$ZSH_HIGHLIGHT_STYLES[path] From 52ece975c393f5f7e1d2bbfecb19124fc696f918 Mon Sep 17 00:00:00 2001 From: Daniel Shahaf Date: Wed, 2 Sep 2015 02:37:43 +0000 Subject: [PATCH 6/7] Update comments. No functional change. --- highlighters/main/main-highlighter.zsh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/highlighters/main/main-highlighter.zsh b/highlighters/main/main-highlighter.zsh index 2c9120a..f5711c9 100755 --- a/highlighters/main/main-highlighter.zsh +++ b/highlighters/main/main-highlighter.zsh @@ -70,8 +70,8 @@ _zsh_highlight_main_add_region_highlight() { (( start -= $#PREBUFFER )) (( end -= $#PREBUFFER )) - (( end < 0 )) && return # bug - (( start < 0 )) && start=0 # normal with e.g. multiline strings + (( end < 0 )) && return # having end<0 would be a bug + (( start < 0 )) && start=0 # having start<0 is normal with e.g. multiline strings region_highlight+=("$start $end $style") } @@ -102,6 +102,7 @@ _zsh_highlight_main_highlighter() local substr_color=0 local style_override="" [[ $start_pos -eq 0 && $arg = 'noglob' ]] && highlight_glob=false + # advance $start_pos, skipping over whitespace in $buf. ((start_pos+=${#buf[$start_pos+1,-1]}-${#${buf[$start_pos+1,-1]##([[:space:]]|\\[[:space:]])#}})) ((end_pos=$start_pos+${#arg})) From c2b9327b0763f3457fb09db17e22ee9e1e024792 Mon Sep 17 00:00:00 2001 From: Daniel Shahaf Date: Wed, 2 Sep 2015 08:28:03 +0000 Subject: [PATCH 7/7] Support literal newlines, part 2 --- highlighters/main/main-highlighter.zsh | 36 +++++++++---------- .../main/test-data/vanilla-newline.zsh | 12 +++---- 2 files changed, 22 insertions(+), 26 deletions(-) diff --git a/highlighters/main/main-highlighter.zsh b/highlighters/main/main-highlighter.zsh index f5711c9..ad31b4c 100755 --- a/highlighters/main/main-highlighter.zsh +++ b/highlighters/main/main-highlighter.zsh @@ -102,28 +102,24 @@ _zsh_highlight_main_highlighter() local substr_color=0 local style_override="" [[ $start_pos -eq 0 && $arg = 'noglob' ]] && highlight_glob=false - # advance $start_pos, skipping over whitespace in $buf. - ((start_pos+=${#buf[$start_pos+1,-1]}-${#${buf[$start_pos+1,-1]##([[:space:]]|\\[[:space:]])#}})) - ((end_pos=$start_pos+${#arg})) - # Deal with faked colons. - # - # We can't use the (Z+n+) flag because that elides the end-of-command - # token altogether, so 'echo foo\necho bar' (two commands) becomes - # indistinguishable from 'echo foo echo bar' (one command with three - # words for arguments). + # advance $start_pos, skipping over whitespace in $buf. if [[ $arg == ';' ]] ; then - if [[ $buf[start_pos+1] == ';' ]] ; then - # Literally-input colon. That's the normal case. - elif [[ $buf[start_pos] == $'\n' ]] ; then - # Newline token rendered as a colon. Empirically we're off-by-one. - (( start_pos -= 1 )) - (( end_pos -= 1 )) - else - # Currently, there aren't any other sources of ";" (SEPER) tokens - # besides literally-input semicolons and (Z+n+)-converted newlines, - # If that ever changes, handle them here. - fi + # We're looking for either a semicolon or a newline, whichever comes + # first. Both of these are rendered as a ";" (SEPER) by the ${(z)..} + # flag. + # + # We can't use the (Z+n+) flag because that elides the end-of-command + # token altogether, so 'echo foo\necho bar' (two commands) becomes + # indistinguishable from 'echo foo echo bar' (one command with three + # words for arguments). + local needle=$'[;\n]' + integer offset=${${buf[start_pos+1,-1]}[(i)$needle]} + (( start_pos += offset )) + (( end_pos += offset )) + else + ((start_pos+=${#buf[$start_pos+1,-1]}-${#${buf[$start_pos+1,-1]##([[:space:]]|\\[[:space:]])#}})) + ((end_pos=$start_pos+${#arg})) fi # Parse the sudo command line diff --git a/highlighters/main/test-data/vanilla-newline.zsh b/highlighters/main/test-data/vanilla-newline.zsh index b876928..f0c8eac 100644 --- a/highlighters/main/test-data/vanilla-newline.zsh +++ b/highlighters/main/test-data/vanilla-newline.zsh @@ -29,12 +29,12 @@ # ------------------------------------------------------------------------------------------------- PREBUFFER=$'echo foo; echo bar\n\n\n' -BUFFER='echo baz; echo qux' +BUFFER=' echo baz; echo qux' expected_region_highlight=( - "0 4 $ZSH_HIGHLIGHT_STYLES[builtin]" # echo - "5 7 $ZSH_HIGHLIGHT_STYLES[default]" # baz - "8 9 $ZSH_HIGHLIGHT_STYLES[default]" # semicolon - "11 14 $ZSH_HIGHLIGHT_STYLES[builtin]" # echo - "16 18 $ZSH_HIGHLIGHT_STYLES[default]" # qux + "1 5 $ZSH_HIGHLIGHT_STYLES[builtin]" # echo + "6 8 $ZSH_HIGHLIGHT_STYLES[default]" # baz + "9 10 $ZSH_HIGHLIGHT_STYLES[default]" # semicolon + "12 15 $ZSH_HIGHLIGHT_STYLES[builtin]" # echo + "17 19 $ZSH_HIGHLIGHT_STYLES[default]" # qux )