Commit: runtime(zsh): sync syntax script with upstream repo

3 views
Skip to first unread message

Christian Brabandt

unread,
Jan 5, 2025, 10:45:11 AM1/5/25
to vim...@googlegroups.com
runtime(zsh): sync syntax script with upstream repo

Commit: https://github.com/vim/vim/commit/202ebc6ced6c5d7c0cdd9a79867af14aab39f75d
Author: Christian Brabandt <c...@256bit.org>
Date: Sun Jan 5 16:36:10 2025 +0100

runtime(zsh): sync syntax script with upstream repo

fixes: https://github.com/vim/vim/issues/16371

Signed-off-by: Christian Brabandt <c...@256bit.org>

diff --git a/runtime/syntax/zsh.vim b/runtime/syntax/zsh.vim
index 084f8cdb4..04b39aeac 100644
--- a/runtime/syntax/zsh.vim
+++ b/runtime/syntax/zsh.vim
@@ -2,7 +2,7 @@
" Language: Zsh shell script
" Maintainer: Christian Brabandt <c...@256bit.org>
" Previous Maintainer: Nikolai Weibull <n...@bitwi.se>
-" Latest Revision: 2022-07-26
+" Latest Revision: 2024 Jan 04
" License: Vim (see :h license)
" Repository: https://github.com/chrisbra/vim-zsh

@@ -48,8 +48,9 @@ syn match zshPOSIXQuoted '\u[0-9a-fA-F]\{1,4}'
syn match zshPOSIXQuoted '\U[1-9a-fA-F]\{1,8}'

syn region zshString matchgroup=zshStringDelimiter start=+"+ end=+"+
- \ contains=zshQuoted,@zshDerefs,@zshSubstQuoted fold
+ \ contains=@Spell,zshQuoted,@zshDerefs,@zshSubstQuoted fold
syn region zshString matchgroup=zshStringDelimiter start=+'+ end=+'+ fold
+ \ contains=@Spell
syn region zshPOSIXString matchgroup=zshStringDelimiter start=+\$'+
\ skip=+\[\']+ end=+'+ contains=zshPOSIXQuoted,zshQuoted
syn match zshJobSpec '%\(\d\+\|?\=\w\+\|[%+-]\)'
@@ -68,7 +69,7 @@ syn keyword zshConditional if then elif else fi esac select

syn keyword zshCase case nextgroup=zshCaseWord skipwhite
syn match zshCaseWord /\S\+/ nextgroup=zshCaseIn skipwhite contained transparent
-syn keyword zshCaseIn in nextgroup=zshCasePattern skipwhite skipnl contained
+syn keyword zshCaseIn in nextgroup=zshComment,zshCasePattern skipwhite skipnl contained
syn match zshCasePattern /\S[^)]*)/ contained

syn keyword zshRepeat while until repeat
@@ -94,22 +95,24 @@ syn match zshRedir '|\@1<!|&\=|\@!'

syn region zshHereDoc matchgroup=zshRedir
\ start='<\@<!<<\s*\z([^<]\S*\)'
- \ end='^\z1\>'
- \ contains=@zshSubst,@zshDerefs,zshQuoted,zshPOSIXString
+ \ end='^\z1$'
+ \ contains=@Spell,@zshSubst,@zshDerefs,zshQuoted,zshPOSIXString
syn region zshHereDoc matchgroup=zshRedir
\ start='<\@<!<<\s*\\z(\S\+\)'
- \ end='^\z1\>'
- \ contains=@zshSubst,@zshDerefs,zshQuoted,zshPOSIXString
+ \ end='^\z1$'
+ \ contains=@Spell
syn region zshHereDoc matchgroup=zshRedir
\ start='<\@<!<<-\s*\\=\z(\S\+\)'
- \ end='^\s*\z1\>'
- \ contains=@zshSubst,@zshDerefs,zshQuoted,zshPOSIXString
+ \ end='^ *\z1$'
+ \ contains=@Spell
syn region zshHereDoc matchgroup=zshRedir
\ start=+<\@<!<<\s*\(["']\)\z(\S\+\) +
- \ end='^\z1\>'
+ \ end='^\z1$'
+ \ contains=@Spell
syn region zshHereDoc matchgroup=zshRedir
\ start=+<\@<!<<-\s*\(["']\)\z(\S\+\) +
- \ end='^\s*\z1\>'
+ \ end='^ *\z1$'
+ \ contains=@Spell

syn match zshVariable '\<\h\w*' contained

Reply all
Reply to author
Forward
0 new messages