Merge c8f5d10dfe into 2fc57d6306

test-highlighting.zsh and test-perfs.zsh were linked as tests/test-*.zsh,
but this file already lives in tests/, so the links resolved to
tests/tests/test-*.zsh and 404'd. Found by pointing a markdown
link-checker at the repo.

docs/highlighters/main.md

@@ -56,6 +56,7 @@ This highlighter defines the following styles:
 * `dollar-quoted-argument-unclosed` - unclosed dollar-quoted arguments (`` $'foo ``)
 * `rc-quote` - two single quotes inside single quotes when the `RC_QUOTES` option is set (`` 'foo''bar' ``)
 * `dollar-double-quoted-argument` - parameter expansion inside double quotes (`$foo` inside `""`)
+* `back-un-quoted-argument` -  backslash escape sequences outside quotes (`\"` in `print -r \"bar\"`)
 * `back-double-quoted-argument` -  backslash escape sequences inside double-quoted arguments (`\"` in `"foo\"bar"`)
 * `back-dollar-quoted-argument` -  backslash escape sequences inside dollar-quoted arguments (`\x` in `$'\x48'`)
 * `assign` - parameter assignments (`x=foo` and `x=( )`)

highlighters/main/main-highlighter.zsh

@@ -55,6 +55,7 @@
 : ${ZSH_HIGHLIGHT_STYLES[dollar-quoted-argument]:=fg=yellow}
 : ${ZSH_HIGHLIGHT_STYLES[rc-quote]:=fg=cyan}
 : ${ZSH_HIGHLIGHT_STYLES[dollar-double-quoted-argument]:=fg=cyan}
+: ${ZSH_HIGHLIGHT_STYLES[back-un-quoted-argument]:=fg=cyan}
 : ${ZSH_HIGHLIGHT_STYLES[back-double-quoted-argument]:=fg=cyan}
 : ${ZSH_HIGHLIGHT_STYLES[back-dollar-quoted-argument]:=fg=cyan}
 : ${ZSH_HIGHLIGHT_STYLES[assign]:=none}
@@ -1353,7 +1354,13 @@ _zsh_highlight_main_highlighter_highlight_argument()
     i=${arg[(ib.i.)[\\\'\"\`\$\<\>\*\?]]}
     case "$arg[$i]" in
       "") break;;
-      "\\") (( i += 1 )); continue;;
+      "\\") 
+        highlights+=(
+          $(( start_pos + i - 1 )) $((start_pos + i + 1)) back-un-quoted-argument
+        )
+        (( i += 1 ))
+        continue
+        ;;
       "'")
         _zsh_highlight_main_highlighter_highlight_single_quote $i
         (( i = REPLY ))

highlighters/main/test-data/backslash-continuation2.zsh

@@ -34,4 +34,5 @@ expected_region_highlight=(
   '1 4 builtin' # echo
   '6 18 default "issue #705"' # foo\\\nbar"baz"
   '14 18 double-quoted-argument "issue #705"' # "baz"
+  # TODO: when fixing this, see if we can highlight the backslash-newline sequence as a comment.
 )

tests/README.md

@@ -86,7 +86,7 @@ grow ways to set `$PREBUFFER` to inject free-form code into the generated file.
 Highlighting test
 -----------------
 
-[`test-highlighting.zsh`](tests/test-highlighting.zsh) tests the correctness of
+[`test-highlighting.zsh`](test-highlighting.zsh) tests the correctness of
 the highlighting. Usage:
 
 ```zsh
@@ -110,7 +110,7 @@ results (tests that failed but were expected to succeed, or vice-versa), run
 Performance test
 ----------------
 
-[`test-perfs.zsh`](tests/test-perfs.zsh) measures the time spent doing the
+[`test-perfs.zsh`](test-perfs.zsh) measures the time spent doing the
 highlighting. Usage:
 
 ```zsh