Support $''-quoted strings.
This does not yet highlight backslash escapes within them.
This commit is contained in:
		
							parent
							
								
									6d93ea07fd
								
							
						
					
					
						commit
						a8afbdf2f5
					
				|  | @ -42,6 +42,7 @@ This highlighter defines the following styles: | ||||||
| * `back-quoted-argument` - backquoted expressions (`` `foo` ``) | * `back-quoted-argument` - backquoted expressions (`` `foo` ``) | ||||||
| * `single-quoted-argument` - single quoted arguments (`` 'foo' ``) | * `single-quoted-argument` - single quoted arguments (`` 'foo' ``) | ||||||
| * `double-quoted-argument` - double quoted arguments (`` "foo" ``) | * `double-quoted-argument` - double quoted arguments (`` "foo" ``) | ||||||
|  | * `dollar-quoted-argument` - dollar quoted arguments (`` $'foo' ``) | ||||||
| * `dollar-double-quoted-argument` -  dollar double quoted arguments ($foo inside "") | * `dollar-double-quoted-argument` -  dollar double quoted arguments ($foo inside "") | ||||||
| * `back-double-quoted-argument` -  back double quoted arguments (\x inside "") | * `back-double-quoted-argument` -  back double quoted arguments (\x inside "") | ||||||
| * `assign` - variable assignments | * `assign` - variable assignments | ||||||
|  |  | ||||||
|  | @ -51,6 +51,7 @@ | ||||||
| : ${ZSH_HIGHLIGHT_STYLES[back-quoted-argument]:=none} | : ${ZSH_HIGHLIGHT_STYLES[back-quoted-argument]:=none} | ||||||
| : ${ZSH_HIGHLIGHT_STYLES[single-quoted-argument]:=fg=yellow} | : ${ZSH_HIGHLIGHT_STYLES[single-quoted-argument]:=fg=yellow} | ||||||
| : ${ZSH_HIGHLIGHT_STYLES[double-quoted-argument]:=fg=yellow} | : ${ZSH_HIGHLIGHT_STYLES[double-quoted-argument]:=fg=yellow} | ||||||
|  | : ${ZSH_HIGHLIGHT_STYLES[dollar-quoted-argument]:=fg=yellow} | ||||||
| : ${ZSH_HIGHLIGHT_STYLES[dollar-double-quoted-argument]:=fg=cyan} | : ${ZSH_HIGHLIGHT_STYLES[dollar-double-quoted-argument]:=fg=cyan} | ||||||
| : ${ZSH_HIGHLIGHT_STYLES[back-double-quoted-argument]:=fg=cyan} | : ${ZSH_HIGHLIGHT_STYLES[back-double-quoted-argument]:=fg=cyan} | ||||||
| : ${ZSH_HIGHLIGHT_STYLES[assign]:=none} | : ${ZSH_HIGHLIGHT_STYLES[assign]:=none} | ||||||
|  | @ -198,6 +199,8 @@ _zsh_highlight_main_highlighter() | ||||||
|                  _zsh_highlight_main_highlighter_highlight_string |                  _zsh_highlight_main_highlighter_highlight_string | ||||||
|                  substr_color=1 |                  substr_color=1 | ||||||
|                  ;; |                  ;; | ||||||
|  |         \$\'*)   style=$ZSH_HIGHLIGHT_STYLES[dollar-quoted-argument] | ||||||
|  |                  ;; | ||||||
|         '`'*)    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];; |         *[*?]*)  $highlight_glob && style=$ZSH_HIGHLIGHT_STYLES[globbing] || style=$ZSH_HIGHLIGHT_STYLES[default];; | ||||||
|         *)       if _zsh_highlight_main_highlighter_check_path; then |         *)       if _zsh_highlight_main_highlighter_check_path; then | ||||||
|  |  | ||||||
|  | @ -0,0 +1,35 @@ | ||||||
|  | #!/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 | ||||||
|  | # ------------------------------------------------------------------------------------------------- | ||||||
|  | 
 | ||||||
|  | BUFFER=": \$'*'" | ||||||
|  | 
 | ||||||
|  | expected_region_highlight=( | ||||||
|  |   "3 6 $ZSH_HIGHLIGHT_STYLES[dollar-quoted-argument]" # $'*' - not a glob | ||||||
|  | ) | ||||||
		Loading…
	
		Reference in New Issue