Skip to content

Commit 1ac39b0

Browse files
committed
comments: Mark prematurely-terminated command as an error.
This is already done for commands prematurely terminated by ";".
1 parent 693de99 commit 1ac39b0

File tree

2 files changed

+43
-2
lines changed

2 files changed

+43
-2
lines changed

highlighters/main/main-highlighter.zsh

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,8 +190,11 @@ _zsh_highlight_main_highlighter()
190190
fi
191191

192192
if [[ ${interactive_comments+'set'} && $arg[1] == $histchars[3] ]]; then
193-
# TODO: check $this_word
194-
style=$ZSH_HIGHLIGHT_STYLES[comment]
193+
if [[ $this_word == *(':regular:'|':start:')* ]]; then
194+
style=$ZSH_HIGHLIGHT_STYLES[comment]
195+
else
196+
style=$ZSH_HIGHLIGHT_STYLES[unknown-token] # prematurely terminated
197+
fi
195198
_zsh_highlight_main_add_region_highlight $start_pos $end_pos $style
196199
already_added=1
197200
continue
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
# -------------------------------------------------------------------------------------------------
2+
# Copyright (c) 2015 zsh-syntax-highlighting contributors
3+
# All rights reserved.
4+
#
5+
# Redistribution and use in source and binary forms, with or without modification, are permitted
6+
# provided that the following conditions are met:
7+
#
8+
# * Redistributions of source code must retain the above copyright notice, this list of conditions
9+
# and the following disclaimer.
10+
# * Redistributions in binary form must reproduce the above copyright notice, this list of
11+
# conditions and the following disclaimer in the documentation and/or other materials provided
12+
# with the distribution.
13+
# * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
14+
# may be used to endorse or promote products derived from this software without specific prior
15+
# written permission.
16+
#
17+
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
18+
# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
19+
# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
20+
# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
21+
# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
22+
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
23+
# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
24+
# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25+
# -------------------------------------------------------------------------------------------------
26+
# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
27+
# vim: ft=zsh sw=2 ts=2 et
28+
# -------------------------------------------------------------------------------------------------
29+
30+
ZSH_HIGHLIGHT_STYLES[single-hyphen-option]=$unused_highlight
31+
setopt interactive_comments
32+
BUFFER='sudo -u # comment'
33+
34+
expected_region_highlight=(
35+
"1 4 $ZSH_HIGHLIGHT_STYLES[precommand]" # sudo
36+
"6 7 $ZSH_HIGHLIGHT_STYLES[single-hyphen-option]" # -u
37+
"9 17 $ZSH_HIGHLIGHT_STYLES[unknown-token]" # "# comment" - error because argument missed
38+
)

0 commit comments

Comments
 (0)