Mercurial > vim
comparison runtime/syntax/vim.vim @ 20552:74e3316c1d5a
Update runtime files
Commit: https://github.com/vim/vim/commit/388a5d4f20b4b64341d1604aa238cab85827b892
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue May 26 21:20:45 2020 +0200
Update runtime files
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Tue, 26 May 2020 21:30:04 +0200 |
parents | bd021eb62e73 |
children | 661eb972cb22 |
comparison
equal
deleted
inserted
replaced
20551:f1b23a9643fe | 20552:74e3316c1d5a |
---|---|
1 " Vim syntax file | 1 " Vim syntax file |
2 " Language: Vim 8.0 script | 2 " Language: Vim 8.0 script |
3 " Maintainer: Charles E. Campbell <NdrOchipS@PcampbellAfamily.Mbiz> | 3 " Maintainer: Charles E. Campbell <NcampObell@SdrPchip.AorgM-NOSPAM> |
4 " Last Change: Apr 15, 2020 | 4 " Last Change: May 26, 2020 |
5 " Version: 8.0-33 | 5 " Version: 8.0-35 |
6 " URL: http://www.drchip.org/astronaut/vim/index.html#SYNTAX_VIM | 6 " URL: http://www.drchip.org/astronaut/vim/index.html#SYNTAX_VIM |
7 " Automatically generated keyword lists: {{{1 | 7 " Automatically generated keyword lists: {{{1 |
8 | 8 |
9 " Quit when a syntax file was already loaded {{{2 | 9 " Quit when a syntax file was already loaded {{{2 |
10 if exists("b:current_syntax") | 10 if exists("b:current_syntax") |
226 " ========= | 226 " ========= |
227 syn cluster vimOperGroup contains=vimEnvvar,vimFunc,vimFuncVar,vimOper,vimOperParen,vimNumber,vimString,vimRegister,vimContinue,vim9Comment | 227 syn cluster vimOperGroup contains=vimEnvvar,vimFunc,vimFuncVar,vimOper,vimOperParen,vimNumber,vimString,vimRegister,vimContinue,vim9Comment |
228 syn match vimOper "\%#=1\(==\|!=\|>=\|<=\|=\~\|!\~\|>\|<\|=\)[?#]\{0,2}" skipwhite nextgroup=vimString,vimSpecFile | 228 syn match vimOper "\%#=1\(==\|!=\|>=\|<=\|=\~\|!\~\|>\|<\|=\)[?#]\{0,2}" skipwhite nextgroup=vimString,vimSpecFile |
229 syn match vimOper "\(\<is\|\<isnot\)[?#]\{0,2}\>" skipwhite nextgroup=vimString,vimSpecFile | 229 syn match vimOper "\(\<is\|\<isnot\)[?#]\{0,2}\>" skipwhite nextgroup=vimString,vimSpecFile |
230 syn match vimOper "||\|&&\|[-+.!]" skipwhite nextgroup=vimString,vimSpecFile | 230 syn match vimOper "||\|&&\|[-+.!]" skipwhite nextgroup=vimString,vimSpecFile |
231 syn region vimOperParen matchgroup=vimParenSep start="(" end=")" contains=@vimOperGroup | 231 syn region vimOperParen matchgroup=vimParenSep start="(" end=")" contains=vimoperStar,@vimOperGroup |
232 syn region vimOperParen matchgroup=vimSep start="{" end="}" contains=@vimOperGroup nextgroup=vimVar,vimFuncVar | 232 syn region vimOperParen matchgroup=vimSep start="{" end="}" contains=@vimOperGroup nextgroup=vimVar,vimFuncVar |
233 if !exists("g:vimsyn_noerror") && !exists("g:vimsyn_noopererror") | 233 if !exists("g:vimsyn_noerror") && !exists("g:vimsyn_noopererror") |
234 syn match vimOperError ")" | 234 syn match vimOperError ")" |
235 endif | 235 endif |
236 | 236 |
298 " Vim9 comments - TODO: might be highlighted while they don't work | 298 " Vim9 comments - TODO: might be highlighted while they don't work |
299 syn match vimComment excludenl +\s#[^{].*$+lc=1 contains=@vimCommentGroup,vimCommentString | 299 syn match vimComment excludenl +\s#[^{].*$+lc=1 contains=@vimCommentGroup,vimCommentString |
300 syn match vimComment +\<endif\s\+#[^{].*$+lc=5 contains=@vimCommentGroup,vimCommentString | 300 syn match vimComment +\<endif\s\+#[^{].*$+lc=5 contains=@vimCommentGroup,vimCommentString |
301 syn match vimComment +\<else\s\+#[^{].*$+lc=4 contains=@vimCommentGroup,vimCommentString | 301 syn match vimComment +\<else\s\+#[^{].*$+lc=4 contains=@vimCommentGroup,vimCommentString |
302 " Vim9 comment inside expression | 302 " Vim9 comment inside expression |
303 syn match vim9Comment +\s\zs#[^{].*$+ contains=@vimCommentGroup,vimCommentString | 303 syn match vim9Comment +\s\zs#[^{].*$+ms=s+1 contains=@vimCommentGroup,vimCommentString |
304 | 304 |
305 " Environment Variables: {{{2 | 305 " Environment Variables: {{{2 |
306 " ===================== | 306 " ===================== |
307 syn match vimEnvvar "\$\I\i*" | 307 syn match vimEnvvar "\$\I\i*" |
308 syn match vimEnvvar "\${\I\i*}" | 308 syn match vimEnvvar "\${\I\i*}" |
319 syn cluster vimStringGroup contains=vimEscapeBrace,vimPatSep,vimNotPatSep,vimPatSepErr,vimPatSepZone,@Spell | 319 syn cluster vimStringGroup contains=vimEscapeBrace,vimPatSep,vimNotPatSep,vimPatSepErr,vimPatSepZone,@Spell |
320 syn region vimString oneline keepend start=+[^a-zA-Z>!\\@]"+lc=1 skip=+\\\\\|\\"+ matchgroup=vimStringEnd end=+"+ contains=@vimStringGroup | 320 syn region vimString oneline keepend start=+[^a-zA-Z>!\\@]"+lc=1 skip=+\\\\\|\\"+ matchgroup=vimStringEnd end=+"+ contains=@vimStringGroup |
321 syn region vimString oneline keepend start=+[^a-zA-Z>!\\@]'+lc=1 end=+'+ | 321 syn region vimString oneline keepend start=+[^a-zA-Z>!\\@]'+lc=1 end=+'+ |
322 syn region vimString oneline start=+=!+lc=1 skip=+\\\\\|\\!+ end=+!+ contains=@vimStringGroup | 322 syn region vimString oneline start=+=!+lc=1 skip=+\\\\\|\\!+ end=+!+ contains=@vimStringGroup |
323 syn region vimString oneline start="=+"lc=1 skip="\\\\\|\\+" end="+" contains=@vimStringGroup | 323 syn region vimString oneline start="=+"lc=1 skip="\\\\\|\\+" end="+" contains=@vimStringGroup |
324 syn region vimString oneline start="\s/\s*\A"lc=1 skip="\\\\\|\\+" end="/" contains=@vimStringGroup | 324 "syn region vimString oneline start="\s/\s*\A"lc=1 skip="\\\\\|\\+" end="/" contains=@vimStringGroup |
325 syn match vimString contained +"[^"]*\\$+ skipnl nextgroup=vimStringCont | 325 syn match vimString contained +"[^"]*\\$+ skipnl nextgroup=vimStringCont |
326 syn match vimStringCont contained +\(\\\\\|.\)\{-}[^\\]"+ | 326 syn match vimStringCont contained +\(\\\\\|.\)\{-}[^\\]"+ |
327 | 327 |
328 " Substitutions: {{{2 | 328 " Substitutions: {{{2 |
329 " ============= | 329 " ============= |
930 hi def link vimNotFunc vimCommand | 930 hi def link vimNotFunc vimCommand |
931 hi def link vimNotPatSep vimString | 931 hi def link vimNotPatSep vimString |
932 hi def link vimNumber Number | 932 hi def link vimNumber Number |
933 hi def link vimOperError Error | 933 hi def link vimOperError Error |
934 hi def link vimOper Operator | 934 hi def link vimOper Operator |
935 hi def link vimOperStar vimOper | |
935 hi def link vimOption PreProc | 936 hi def link vimOption PreProc |
936 hi def link vimParenSep Delimiter | 937 hi def link vimParenSep Delimiter |
937 hi def link vimPatSepErr vimError | 938 hi def link vimPatSepErr vimError |
938 hi def link vimPatSepR vimPatSep | 939 hi def link vimPatSepR vimPatSep |
939 hi def link vimPatSep SpecialChar | 940 hi def link vimPatSep SpecialChar |