mirror of
https://github.com/neovim/neovim.git
synced 2025-02-25 18:55:25 -06:00
vim-patch:2c7f8c574f1f
Update runtime files
2c7f8c574f
Omit the following line for man.vim:
hi def link manFooter PreProc
This commit is contained in:
parent
9d3576246b
commit
c2635665c5
@ -197,7 +197,7 @@ gR Enter Virtual Replace mode: Each character you type
|
|||||||
start insert (for {Visual} see |Visual-mode|).
|
start insert (for {Visual} see |Visual-mode|).
|
||||||
|
|
||||||
*v_r*
|
*v_r*
|
||||||
{Visual}["x]r{char} Replace all selected characters by {char}.
|
{Visual}r{char} Replace all selected characters by {char}.
|
||||||
|
|
||||||
*v_C*
|
*v_C*
|
||||||
{Visual}["x]C Delete the highlighted lines [into register x] and
|
{Visual}["x]C Delete the highlighted lines [into register x] and
|
||||||
|
@ -511,10 +511,13 @@ a tag for each "#defined" macro, typedefs, enums, etc.
|
|||||||
Some programs that generate tags files:
|
Some programs that generate tags files:
|
||||||
ctags As found on most Unix systems. Only supports C. Only
|
ctags As found on most Unix systems. Only supports C. Only
|
||||||
does the basic work.
|
does the basic work.
|
||||||
|
universal ctags A maintained version of ctags based on exuberant
|
||||||
|
ctags. See https://ctags.io.
|
||||||
*Exuberant_ctags*
|
*Exuberant_ctags*
|
||||||
exuberant ctags This is a very good one. It works for C, C++, Java,
|
exuberant ctags This is a very good one. It works for C, C++, Java,
|
||||||
Fortran, Eiffel and others. It can generate tags for
|
Fortran, Eiffel and others. It can generate tags for
|
||||||
many items. See http://ctags.sourceforge.net.
|
many items. See http://ctags.sourceforge.net.
|
||||||
|
No new version since 2009.
|
||||||
JTags For Java, in Java. It can be found at
|
JTags For Java, in Java. It can be found at
|
||||||
http://www.fleiner.com/jtags/.
|
http://www.fleiner.com/jtags/.
|
||||||
ptags.py For Python, in Python. Found in your Python source
|
ptags.py For Python, in Python. Found in your Python source
|
||||||
|
@ -338,7 +338,7 @@ g8 Print the hex values of the bytes used in the
|
|||||||
locked or the variable type is changed, then further
|
locked or the variable type is changed, then further
|
||||||
command output messages will cause errors.
|
command output messages will cause errors.
|
||||||
To get the output of one command the |execute()|
|
To get the output of one command the |execute()|
|
||||||
function can be used.
|
function can be used instead of redirection.
|
||||||
|
|
||||||
:redi[r] =>> {var} Append messages to an existing variable. Only string
|
:redi[r] =>> {var} Append messages to an existing variable. Only string
|
||||||
variables can be used.
|
variables can be used.
|
||||||
|
@ -1,7 +1,8 @@
|
|||||||
" Vim settings file
|
" Vim settings file
|
||||||
" Language: Fortran 2008 (and older: Fortran 2003, 95, 90, 77, 66)
|
" Language: Fortran 2008 (and older: Fortran 2003, 95, 90, 77, 66)
|
||||||
" Version: 0.50
|
" Version: 0.50
|
||||||
" Last Change: 2015 Nov. 30
|
" Last Change: 2020 Apr 20
|
||||||
|
" Patched By: Eisuke Kawashima
|
||||||
" Maintainer: Ajit J. Thakkar <ajit@unb.ca>; <http://www2.unb.ca/~ajit/>
|
" Maintainer: Ajit J. Thakkar <ajit@unb.ca>; <http://www2.unb.ca/~ajit/>
|
||||||
" Usage: For instructions, do :help fortran-plugin from Vim
|
" Usage: For instructions, do :help fortran-plugin from Vim
|
||||||
" Credits:
|
" Credits:
|
||||||
@ -31,10 +32,10 @@ if !exists("b:fortran_fixed_source")
|
|||||||
elseif exists("fortran_fixed_source")
|
elseif exists("fortran_fixed_source")
|
||||||
" User guarantees fixed source form
|
" User guarantees fixed source form
|
||||||
let b:fortran_fixed_source = 1
|
let b:fortran_fixed_source = 1
|
||||||
elseif expand("%:e") ==? "f\<90\|95\|03\|08\>"
|
elseif expand("%:e") =~? '^f\%(90\|95\|03\|08\)$'
|
||||||
" Free-form file extension defaults as in Intel ifort, gcc(gfortran), NAG, Pathscale, and Cray compilers
|
" Free-form file extension defaults as in Intel ifort, gcc(gfortran), NAG, Pathscale, and Cray compilers
|
||||||
let b:fortran_fixed_source = 0
|
let b:fortran_fixed_source = 0
|
||||||
elseif expand("%:e") ==? "f\|f77\|for"
|
elseif expand("%:e") =~? '^\%(f\|f77\|for\)$'
|
||||||
" Fixed-form file extension defaults
|
" Fixed-form file extension defaults
|
||||||
let b:fortran_fixed_source = 1
|
let b:fortran_fixed_source = 1
|
||||||
else
|
else
|
||||||
|
@ -1,9 +1,9 @@
|
|||||||
" Vim filetype plugin file
|
" Vim filetype plugin file
|
||||||
" Language: Perl
|
" Language: Perl
|
||||||
" Maintainer: vim-perl <vim-perl@googlegroups.com>
|
" Maintainer: vim-perl <vim-perl@googlegroups.com>
|
||||||
" Homepage: http://github.com/vim-perl/vim-perl
|
" Homepage: https://github.com/vim-perl/vim-perl
|
||||||
" Bugs/requests: http://github.com/vim-perl/vim-perl/issues
|
" Bugs/requests: https://github.com/vim-perl/vim-perl/issues
|
||||||
" Last Change: 2015-02-09
|
" Last Change: 2020 Apr 15
|
||||||
|
|
||||||
if exists("b:did_ftplugin") | finish | endif
|
if exists("b:did_ftplugin") | finish | endif
|
||||||
let b:did_ftplugin = 1
|
let b:did_ftplugin = 1
|
||||||
|
@ -1,9 +1,9 @@
|
|||||||
" Vim filetype plugin file
|
" Vim filetype plugin file
|
||||||
" Language: Perl 6
|
" Language: Perl 6
|
||||||
" Maintainer: vim-perl <vim-perl@googlegroups.com>
|
" Maintainer: vim-perl <vim-perl@googlegroups.com>
|
||||||
" Homepage: http://github.com/vim-perl/vim-perl
|
" Homepage: https://github.com/vim-perl/vim-perl
|
||||||
" Bugs/requests: http://github.com/vim-perl/vim-perl/issues
|
" Bugs/requests: https://github.com/vim-perl/vim-perl/issues
|
||||||
" Last Change: 2013-07-21
|
" Last Change: 2020 Apr 15
|
||||||
" Contributors: Hinrik Örn Sigurðsson <hinrik.sig@gmail.com>
|
" Contributors: Hinrik Örn Sigurðsson <hinrik.sig@gmail.com>
|
||||||
"
|
"
|
||||||
" Based on ftplugin/perl.vim by Dan Sharp <dwsharp at hotmail dot com>
|
" Based on ftplugin/perl.vim by Dan Sharp <dwsharp at hotmail dot com>
|
||||||
|
@ -1,7 +1,41 @@
|
|||||||
" Vim filetype plugin file
|
" Vim filetype plugin file
|
||||||
" Language: systemd.unit(5)
|
" Language: systemd.unit(5)
|
||||||
|
" Keyword Lookup Support: Enno Nagel <enno.nagel+vim@gmail.com>
|
||||||
|
|
||||||
if !exists('b:did_ftplugin')
|
if !exists('b:did_ftplugin')
|
||||||
" Looks a lot like dosini files.
|
" Looks a lot like dosini files.
|
||||||
runtime! ftplugin/dosini.vim
|
runtime! ftplugin/dosini.vim
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
if !has('unix')
|
||||||
|
finish
|
||||||
|
endif
|
||||||
|
|
||||||
|
if !has('gui_running')
|
||||||
|
command! -buffer -nargs=1 Sman silent exe '!' . KeywordLookup_systemd(<q-args>) | redraw!
|
||||||
|
elseif has('terminal')
|
||||||
|
command! -buffer -nargs=1 Sman silent exe 'term ' . KeywordLookup_systemd(<q-args>)
|
||||||
|
else
|
||||||
|
finish
|
||||||
|
endif
|
||||||
|
|
||||||
|
if !exists('*KeywordLookup_systemd')
|
||||||
|
function KeywordLookup_systemd(keyword) abort
|
||||||
|
let matches = matchlist(getline(search('\v^\s*\[\s*.+\s*\]\s*$', 'nbWz')), '\v^\s*\[\s*(\k+).*\]\s*$')
|
||||||
|
if len(matches) > 1
|
||||||
|
let section = matches[1]
|
||||||
|
return 'LESS= MANPAGER="less --pattern=''(^|,)\s+' . a:keyword . '=$'' --hilite-search" man ' . 'systemd.' . section
|
||||||
|
else
|
||||||
|
return 'LESS= MANPAGER="less --pattern=''(^|,)\s+' . a:keyword . '=$'' --hilite-search" man ' . 'systemd'
|
||||||
|
endif
|
||||||
|
endfunction
|
||||||
|
endif
|
||||||
|
|
||||||
|
setlocal iskeyword+=-
|
||||||
|
setlocal keywordprg=:Sman
|
||||||
|
|
||||||
|
if !exists('b:undo_ftplugin') || empty(b:undo_ftplugin)
|
||||||
|
let b:undo_ftplugin = 'setlocal keywordprg< iskeyword<'
|
||||||
|
else
|
||||||
|
let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword<'
|
||||||
|
endif
|
||||||
|
@ -1,7 +1,8 @@
|
|||||||
" Vim indent file
|
" Vim indent file
|
||||||
" Language: Fortran 2008 (and older: Fortran 2003, 95, 90, and 77)
|
" Language: Fortran 2008 (and older: Fortran 2003, 95, 90, and 77)
|
||||||
" Version: 47
|
" Version: 47
|
||||||
" Last Change: 2016 Oct. 29
|
" Last Change: 2020 Apr 20
|
||||||
|
" Patched By: Eisuke Kawashima
|
||||||
" Maintainer: Ajit J. Thakkar <ajit@unb.ca>; <http://www2.unb.ca/~ajit/>
|
" Maintainer: Ajit J. Thakkar <ajit@unb.ca>; <http://www2.unb.ca/~ajit/>
|
||||||
" Usage: For instructions, do :help fortran-indent from Vim
|
" Usage: For instructions, do :help fortran-indent from Vim
|
||||||
" Credits:
|
" Credits:
|
||||||
@ -39,10 +40,10 @@ if !exists("b:fortran_fixed_source")
|
|||||||
elseif exists("fortran_fixed_source")
|
elseif exists("fortran_fixed_source")
|
||||||
" User guarantees fixed source form
|
" User guarantees fixed source form
|
||||||
let b:fortran_fixed_source = 1
|
let b:fortran_fixed_source = 1
|
||||||
elseif expand("%:e") ==? "f\<90\|95\|03\|08\>"
|
elseif expand("%:e") =~? '^f\%(90\|95\|03\|08\)$'
|
||||||
" Free-form file extension defaults as in Intel ifort, gcc(gfortran), NAG, Pathscale, and Cray compilers
|
" Free-form file extension defaults as in Intel ifort, gcc(gfortran), NAG, Pathscale, and Cray compilers
|
||||||
let b:fortran_fixed_source = 0
|
let b:fortran_fixed_source = 0
|
||||||
elseif expand("%:e") ==? "f\|f77\|for"
|
elseif expand("%:e") =~? '^\%(f\|f77\|for\)$'
|
||||||
" Fixed-form file extension defaults
|
" Fixed-form file extension defaults
|
||||||
let b:fortran_fixed_source = 1
|
let b:fortran_fixed_source = 1
|
||||||
else
|
else
|
||||||
|
@ -1,9 +1,9 @@
|
|||||||
" Vim indent file
|
" Vim indent file
|
||||||
" Language: Perl 5
|
" Language: Perl 5
|
||||||
" Maintainer: vim-perl <vim-perl@googlegroups.com>
|
" Maintainer: vim-perl <vim-perl@googlegroups.com>
|
||||||
" Homepage: http://github.com/vim-perl/vim-perl
|
" Homepage: https://github.com/vim-perl/vim-perl
|
||||||
" Bugs/requests: http://github.com/vim-perl/vim-perl/issues
|
" Bugs/requests: https://github.com/vim-perl/vim-perl/issues
|
||||||
" Last Change: 2017-01-04
|
" Last Change: 2020 Apr 15
|
||||||
|
|
||||||
" Suggestions and improvements by :
|
" Suggestions and improvements by :
|
||||||
" Aaron J. Sherman (use syntax for hints)
|
" Aaron J. Sherman (use syntax for hints)
|
||||||
|
@ -1,9 +1,9 @@
|
|||||||
" Vim indent file
|
" Vim indent file
|
||||||
" Language: Perl 6
|
" Language: Perl 6
|
||||||
" Maintainer: vim-perl <vim-perl@googlegroups.com>
|
" Maintainer: vim-perl <vim-perl@googlegroups.com>
|
||||||
" Homepage: http://github.com/vim-perl/vim-perl
|
" Homepage: https://github.com/vim-perl/vim-perl
|
||||||
" Bugs/requests: http://github.com/vim-perl/vim-perl/issues
|
" Bugs/requests: https://github.com/vim-perl/vim-perl/issues
|
||||||
" Last Change: 2017 Jun 13
|
" Last Change: 2020 Apr 15
|
||||||
" Contributors: Andy Lester <andy@petdance.com>
|
" Contributors: Andy Lester <andy@petdance.com>
|
||||||
" Hinrik Örn Sigurðsson <hinrik.sig@gmail.com>
|
" Hinrik Örn Sigurðsson <hinrik.sig@gmail.com>
|
||||||
"
|
"
|
||||||
|
@ -1,7 +1,8 @@
|
|||||||
" Vim syntax file
|
" Vim syntax file
|
||||||
" Language: Fortran 2008 (and older: Fortran 2003, 95, 90, and 77)
|
" Language: Fortran 2008 (and older: Fortran 2003, 95, 90, and 77)
|
||||||
" Version: 102
|
" Version: 102
|
||||||
" Last Change: 2019 Dec. 14
|
" Last Change: 2020 Apr 20
|
||||||
|
" Patched By: Eisuke Kawashima
|
||||||
" Maintainer: Ajit J. Thakkar <ajit@unb.ca>; <http://www2.unb.ca/~ajit/>
|
" Maintainer: Ajit J. Thakkar <ajit@unb.ca>; <http://www2.unb.ca/~ajit/>
|
||||||
" Usage: For instructions, do :help fortran-syntax from Vim
|
" Usage: For instructions, do :help fortran-syntax from Vim
|
||||||
" Credits:
|
" Credits:
|
||||||
@ -53,10 +54,10 @@ if !exists("b:fortran_fixed_source")
|
|||||||
elseif exists("fortran_fixed_source")
|
elseif exists("fortran_fixed_source")
|
||||||
" User guarantees fixed source form for all fortran files
|
" User guarantees fixed source form for all fortran files
|
||||||
let b:fortran_fixed_source = 1
|
let b:fortran_fixed_source = 1
|
||||||
elseif expand("%:e") ==? "f\<90\|95\|03\|08\>"
|
elseif expand("%:e") =~? '^f\%(90\|95\|03\|08\)$'
|
||||||
" Free-form file extension defaults as in Intel ifort, gcc(gfortran), NAG, Pathscale, and Cray compilers
|
" Free-form file extension defaults as in Intel ifort, gcc(gfortran), NAG, Pathscale, and Cray compilers
|
||||||
let b:fortran_fixed_source = 0
|
let b:fortran_fixed_source = 0
|
||||||
elseif expand("%:e") ==? "f\|f77\|for"
|
elseif expand("%:e") =~? '^\%(f\|f77\|for\)$'
|
||||||
" Fixed-form file extension defaults
|
" Fixed-form file extension defaults
|
||||||
let b:fortran_fixed_source = 1
|
let b:fortran_fixed_source = 1
|
||||||
else
|
else
|
||||||
|
@ -8,11 +8,11 @@ endif
|
|||||||
syntax case ignore
|
syntax case ignore
|
||||||
syntax match manReference display '[^()[:space:]]\+([0-9nx][a-z]*)'
|
syntax match manReference display '[^()[:space:]]\+([0-9nx][a-z]*)'
|
||||||
syntax match manSectionHeading display '^\S.*$'
|
syntax match manSectionHeading display '^\S.*$'
|
||||||
syntax match manTitle display '^\%1l.*$'
|
syntax match manHeader display '^\%1l.*$'
|
||||||
syntax match manSubHeading display '^ \{3\}\S.*$'
|
syntax match manSubHeading display '^ \{3\}\S.*$'
|
||||||
syntax match manOptionDesc display '^\s\+\%(+\|-\)\S\+'
|
syntax match manOptionDesc display '^\s\+\%(+\|-\)\S\+'
|
||||||
|
|
||||||
highlight default link manTitle Title
|
highlight default link manHeader Title
|
||||||
highlight default link manSectionHeading Statement
|
highlight default link manSectionHeading Statement
|
||||||
highlight default link manOptionDesc Constant
|
highlight default link manOptionDesc Constant
|
||||||
highlight default link manReference PreProc
|
highlight default link manReference PreProc
|
||||||
|
@ -1,9 +1,9 @@
|
|||||||
" Vim syntax file
|
" Vim syntax file
|
||||||
" Language: Perl 5
|
" Language: Perl 5
|
||||||
" Maintainer: vim-perl <vim-perl@googlegroups.com>
|
" Maintainer: vim-perl <vim-perl@googlegroups.com>
|
||||||
" Homepage: http://github.com/vim-perl/vim-perl/tree/master
|
" Homepage: https://github.com/vim-perl/vim-perl/tree/master
|
||||||
" Bugs/requests: http://github.com/vim-perl/vim-perl/issues
|
" Bugs/requests: https://github.com/vim-perl/vim-perl/issues
|
||||||
" Last Change: 2017-09-12
|
" Last Change: 2020 Apr 15
|
||||||
" Contributors: Andy Lester <andy@petdance.com>
|
" Contributors: Andy Lester <andy@petdance.com>
|
||||||
" Hinrik Örn Sigurðsson <hinrik.sig@gmail.com>
|
" Hinrik Örn Sigurðsson <hinrik.sig@gmail.com>
|
||||||
" Lukas Mai <l.mai.web.de>
|
" Lukas Mai <l.mai.web.de>
|
||||||
|
@ -1,9 +1,9 @@
|
|||||||
" Vim syntax file
|
" Vim syntax file
|
||||||
" Language: Perl 6
|
" Language: Perl 6
|
||||||
" Maintainer: vim-perl <vim-perl@googlegroups.com>
|
" Maintainer: vim-perl <vim-perl@googlegroups.com>
|
||||||
" Homepage: http://github.com/vim-perl/vim-perl/tree/master
|
" Homepage: https://github.com/vim-perl/vim-perl/tree/master
|
||||||
" Bugs/requests: http://github.com/vim-perl/vim-perl/issues
|
" Bugs/requests: https://github.com/vim-perl/vim-perl/issues
|
||||||
" Last Change: 2013-07-21
|
" Last Change: 2020 Apr 15
|
||||||
|
|
||||||
" Contributors: Luke Palmer <fibonaci@babylonia.flatirons.org>
|
" Contributors: Luke Palmer <fibonaci@babylonia.flatirons.org>
|
||||||
" Moritz Lenz <moritz@faui2k3.org>
|
" Moritz Lenz <moritz@faui2k3.org>
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
" Vim syntax support file
|
" Vim syntax support file
|
||||||
" Maintainer: Bram Moolenaar <Bram@vim.org>
|
" Maintainer: Bram Moolenaar <Bram@vim.org>
|
||||||
" Last Change: 2016 Nov 04
|
" Last Change: 2020 Apr 13
|
||||||
|
|
||||||
" This file sets up for syntax highlighting.
|
" This file sets up for syntax highlighting.
|
||||||
" It is loaded from "syntax.vim" and "manual.vim".
|
" It is loaded from "syntax.vim" and "manual.vim".
|
||||||
@ -52,9 +52,11 @@ fun! s:SynSet()
|
|||||||
|
|
||||||
if s != ""
|
if s != ""
|
||||||
" Load the syntax file(s). When there are several, separated by dots,
|
" Load the syntax file(s). When there are several, separated by dots,
|
||||||
" load each in sequence.
|
" load each in sequence. Skip empty entries.
|
||||||
for name in split(s, '\.')
|
for name in split(s, '\.')
|
||||||
exe "runtime! syntax/" . name . ".vim syntax/" . name . "/*.vim"
|
if !empty(name)
|
||||||
|
exe "runtime! syntax/" . name . ".vim syntax/" . name . "/*.vim"
|
||||||
|
endif
|
||||||
endfor
|
endfor
|
||||||
endif
|
endif
|
||||||
endfun
|
endfun
|
||||||
|
@ -197,7 +197,7 @@ syn keyword vimAugroupKey contained aug[roup]
|
|||||||
|
|
||||||
" Operators: {{{2
|
" Operators: {{{2
|
||||||
" =========
|
" =========
|
||||||
syn cluster vimOperGroup contains=vimEnvvar,vimFunc,vimFuncVar,vimOper,vimOperParen,vimNumber,vimString,vimRegister,vimContinue
|
syn cluster vimOperGroup contains=vimEnvvar,vimFunc,vimFuncVar,vimOper,vimOperParen,vimNumber,vimString,vimRegister,vimContinue,vim9Comment
|
||||||
syn match vimOper "\%#=1\(==\|!=\|>=\|<=\|=\~\|!\~\|>\|<\|=\)[?#]\{0,2}" skipwhite nextgroup=vimString,vimSpecFile
|
syn match vimOper "\%#=1\(==\|!=\|>=\|<=\|=\~\|!\~\|>\|<\|=\)[?#]\{0,2}" skipwhite nextgroup=vimString,vimSpecFile
|
||||||
syn match vimOper "\(\<is\|\<isnot\)[?#]\{0,2}\>" skipwhite nextgroup=vimString,vimSpecFile
|
syn match vimOper "\(\<is\|\<isnot\)[?#]\{0,2}\>" skipwhite nextgroup=vimString,vimSpecFile
|
||||||
syn match vimOper "||\|&&\|[-+.!]" skipwhite nextgroup=vimString,vimSpecFile
|
syn match vimOper "||\|&&\|[-+.!]" skipwhite nextgroup=vimString,vimSpecFile
|
||||||
@ -237,7 +237,7 @@ syn match vimSpecFileMod "\(:[phtre]\)\+" contained
|
|||||||
|
|
||||||
" User-Specified Commands: {{{2
|
" User-Specified Commands: {{{2
|
||||||
" =======================
|
" =======================
|
||||||
syn cluster vimUserCmdList contains=vimAddress,vimSyntax,vimHighlight,vimAutoCmd,vimCmplxRepeat,vimComment,vimCtrlChar,vimEscapeBrace,vimFunc,vimFuncName,vimFunction,vimFunctionError,vimIsCommand,vimMark,vimNotation,vimNumber,vimOper,vimRegion,vimRegister,vimLet,vimSet,vimSetEqual,vimSetString,vimSpecFile,vimString,vimSubst,vimSubstRep,vimSubstRange,vimSynLine
|
syn cluster vimUserCmdList contains=vimAddress,vimSyntax,vimHighlight,vimAutoCmd,vimCmplxRepeat,vimComment,vim9Comment,vimCtrlChar,vimEscapeBrace,vimFunc,vimFuncName,vimFunction,vimFunctionError,vimIsCommand,vimMark,vimNotation,vimNumber,vimOper,vimRegion,vimRegister,vimLet,vimSet,vimSetEqual,vimSetString,vimSpecFile,vimString,vimSubst,vimSubstRep,vimSubstRange,vimSynLine
|
||||||
syn keyword vimUserCommand contained com[mand]
|
syn keyword vimUserCommand contained com[mand]
|
||||||
syn match vimUserCmd "\<com\%[mand]!\=\>.*$" contains=vimUserAttrb,vimUserAttrbError,vimUserCommand,@vimUserCmdList
|
syn match vimUserCmd "\<com\%[mand]!\=\>.*$" contains=vimUserAttrb,vimUserAttrbError,vimUserCommand,@vimUserCmdList
|
||||||
syn match vimUserAttrbError contained "-\a\+\ze\s"
|
syn match vimUserAttrbError contained "-\a\+\ze\s"
|
||||||
@ -267,6 +267,12 @@ syn match vimComment excludenl +\s"[^\-:.%#=*].*$+lc=1 contains=@vimCommentGroup
|
|||||||
syn match vimComment +\<endif\s\+".*$+lc=5 contains=@vimCommentGroup,vimCommentString
|
syn match vimComment +\<endif\s\+".*$+lc=5 contains=@vimCommentGroup,vimCommentString
|
||||||
syn match vimComment +\<else\s\+".*$+lc=4 contains=@vimCommentGroup,vimCommentString
|
syn match vimComment +\<else\s\+".*$+lc=4 contains=@vimCommentGroup,vimCommentString
|
||||||
syn region vimCommentString contained oneline start='\S\s\+"'ms=e end='"'
|
syn region vimCommentString contained oneline start='\S\s\+"'ms=e end='"'
|
||||||
|
" Vim9 comments - TODO: might be highlighted while they don't work
|
||||||
|
syn match vimComment excludenl +\s#[^{].*$+lc=1 contains=@vimCommentGroup,vimCommentString
|
||||||
|
syn match vimComment +\<endif\s\+#[^{].*$+lc=5 contains=@vimCommentGroup,vimCommentString
|
||||||
|
syn match vimComment +\<else\s\+#[^{].*$+lc=4 contains=@vimCommentGroup,vimCommentString
|
||||||
|
" Vim9 comment inside expression
|
||||||
|
syn match vim9Comment +\s\zs#[^{].*$+ contains=@vimCommentGroup,vimCommentString
|
||||||
|
|
||||||
" Environment Variables: {{{2
|
" Environment Variables: {{{2
|
||||||
" =====================
|
" =====================
|
||||||
@ -343,7 +349,7 @@ syn match vimCmplxRepeat '[^a-zA-Z_/\\()]q[0-9a-zA-Z"]\>'lc=1
|
|||||||
syn match vimCmplxRepeat '@[0-9a-z".=@:]\ze\($\|[^a-zA-Z]\>\)'
|
syn match vimCmplxRepeat '@[0-9a-z".=@:]\ze\($\|[^a-zA-Z]\>\)'
|
||||||
|
|
||||||
" Set command and associated set-options (vimOptions) with comment {{{2
|
" Set command and associated set-options (vimOptions) with comment {{{2
|
||||||
syn region vimSet matchgroup=vimCommand start="\<\%(setl\%[ocal]\|setg\%[lobal]\|se\%[t]\)\>" skip="\%(\\\\\)*\\." end="$" end="|" matchgroup=vimNotation end="<[cC][rR]>" keepend oneline contains=vimSetEqual,vimOption,vimErrSetting,vimComment,vimSetString,vimSetMod
|
syn region vimSet matchgroup=vimCommand start="\<\%(setl\%[ocal]\|setg\%[lobal]\|se\%[t]\)\>" skip="\%(\\\\\)*\\." end="$" end="|" matchgroup=vimNotation end="<[cC][rR]>" keepend oneline contains=vimSetEqual,vimOption,vimErrSetting,vimComment,vim9Comment,vimSetString,vimSetMod
|
||||||
syn region vimSetEqual contained start="[=:]\|[-+^]=" skip="\\\\\|\\\s" end="[| \t]\|$"me=e-1 contains=vimCtrlChar,vimSetSep,vimNotation,vimEnvvar oneline
|
syn region vimSetEqual contained start="[=:]\|[-+^]=" skip="\\\\\|\\\s" end="[| \t]\|$"me=e-1 contains=vimCtrlChar,vimSetSep,vimNotation,vimEnvvar oneline
|
||||||
syn region vimSetString contained start=+="+hs=s+1 skip=+\\\\\|\\"+ end=+"+ contains=vimCtrlChar
|
syn region vimSetString contained start=+="+hs=s+1 skip=+\\\\\|\\"+ end=+"+ contains=vimCtrlChar
|
||||||
syn match vimSetSep contained "[,:]" skipwhite nextgroup=vimCommand
|
syn match vimSetSep contained "[,:]" skipwhite nextgroup=vimCommand
|
||||||
@ -352,7 +358,7 @@ syn match vimSetMod contained "&vim\=\|[!&?<]\|all&"
|
|||||||
" Let: {{{2
|
" Let: {{{2
|
||||||
" ===
|
" ===
|
||||||
syn keyword vimLet let unl[et] skipwhite nextgroup=vimVar,vimFuncVar,vimLetHereDoc
|
syn keyword vimLet let unl[et] skipwhite nextgroup=vimVar,vimFuncVar,vimLetHereDoc
|
||||||
VimFoldh syn region vimLetHereDoc matchgroup=vimLetHereDocStart start='=<<\s\+\%(trim\>\)\=\s*\z(\L\S*\)' matchgroup=vimLetHereDocStop end='^\s*\z1\s*$' contains=vimComment
|
VimFoldh syn region vimLetHereDoc matchgroup=vimLetHereDocStart start='=<<\s\+\%(trim\>\)\=\s*\z(\L\S*\)' matchgroup=vimLetHereDocStop end='^\s*\z1\s*$' contains=vimComment,vim9Comment
|
||||||
|
|
||||||
" Abbreviations: {{{2
|
" Abbreviations: {{{2
|
||||||
" =============
|
" =============
|
||||||
@ -400,7 +406,7 @@ syn match vimMenuPriority "\d\+\(\.\d\+\)*" contained skipwhite nextgroup=vimMen
|
|||||||
syn match vimMenuNameMore "\c\\\s\|<tab>\|\\\." contained nextgroup=vimMenuName,vimMenuNameMore contains=vimNotation
|
syn match vimMenuNameMore "\c\\\s\|<tab>\|\\\." contained nextgroup=vimMenuName,vimMenuNameMore contains=vimNotation
|
||||||
syn match vimMenuMod contained "\c<\(script\|silent\)\+>" skipwhite contains=vimMapModKey,vimMapModErr nextgroup=@vimMenuList
|
syn match vimMenuMod contained "\c<\(script\|silent\)\+>" skipwhite contains=vimMapModKey,vimMapModErr nextgroup=@vimMenuList
|
||||||
syn match vimMenuMap "\s" contained skipwhite nextgroup=vimMenuRhs
|
syn match vimMenuMap "\s" contained skipwhite nextgroup=vimMenuRhs
|
||||||
syn match vimMenuRhs ".*$" contained contains=vimString,vimComment,vimIsCommand
|
syn match vimMenuRhs ".*$" contained contains=vimString,vimComment,vim9Comment,vimIsCommand
|
||||||
syn match vimMenuBang "!" contained skipwhite nextgroup=@vimMenuList
|
syn match vimMenuBang "!" contained skipwhite nextgroup=@vimMenuList
|
||||||
|
|
||||||
" Angle-Bracket Notation: (tnx to Michael Geddes) {{{2
|
" Angle-Bracket Notation: (tnx to Michael Geddes) {{{2
|
||||||
@ -450,8 +456,8 @@ syn match vimSynContains contained "\<contain\(s\|edin\)=" nextgroup=vimGroupLis
|
|||||||
syn match vimSynKeyContainedin contained "\<containedin=" nextgroup=vimGroupList
|
syn match vimSynKeyContainedin contained "\<containedin=" nextgroup=vimGroupList
|
||||||
syn match vimSynNextgroup contained "nextgroup=" nextgroup=vimGroupList
|
syn match vimSynNextgroup contained "nextgroup=" nextgroup=vimGroupList
|
||||||
|
|
||||||
syn match vimSyntax "\<sy\%[ntax]\>" contains=vimCommand skipwhite nextgroup=vimSynType,vimComment
|
syn match vimSyntax "\<sy\%[ntax]\>" contains=vimCommand skipwhite nextgroup=vimSynType,vimComment,vim9Comment
|
||||||
syn match vimAuSyntax contained "\s+sy\%[ntax]" contains=vimCommand skipwhite nextgroup=vimSynType,vimComment
|
syn match vimAuSyntax contained "\s+sy\%[ntax]" contains=vimCommand skipwhite nextgroup=vimSynType,vimComment,vim9Comment
|
||||||
syn cluster vimFuncBodyList add=vimSyntax
|
syn cluster vimFuncBodyList add=vimSyntax
|
||||||
|
|
||||||
" Syntax: case {{{2
|
" Syntax: case {{{2
|
||||||
@ -488,7 +494,7 @@ syn match vimSynKeyOpt contained "\%#=1\<\(conceal\|contained\|transparent\|skip
|
|||||||
syn cluster vimFuncBodyList add=vimSynType
|
syn cluster vimFuncBodyList add=vimSynType
|
||||||
|
|
||||||
" Syntax: match {{{2
|
" Syntax: match {{{2
|
||||||
syn cluster vimSynMtchGroup contains=vimMtchComment,vimSynContains,vimSynError,vimSynMtchOpt,vimSynNextgroup,vimSynRegPat,vimNotation
|
syn cluster vimSynMtchGroup contains=vimMtchComment,vimSynContains,vimSynError,vimSynMtchOpt,vimSynNextgroup,vimSynRegPat,vimNotation,vim9Comment
|
||||||
syn keyword vimSynType contained match skipwhite nextgroup=vimSynMatchRegion
|
syn keyword vimSynType contained match skipwhite nextgroup=vimSynMatchRegion
|
||||||
syn region vimSynMatchRegion contained keepend matchgroup=vimGroupName start="\h\w*" matchgroup=vimSep end="|\|$" contains=@vimSynMtchGroup
|
syn region vimSynMatchRegion contained keepend matchgroup=vimGroupName start="\h\w*" matchgroup=vimSep end="|\|$" contains=@vimSynMtchGroup
|
||||||
syn match vimSynMtchOpt contained "\%#=1\<\(conceal\|transparent\|contained\|excludenl\|keepend\|skipempty\|skipwhite\|display\|extend\|skipnl\|fold\)\>"
|
syn match vimSynMtchOpt contained "\%#=1\<\(conceal\|transparent\|contained\|excludenl\|keepend\|skipempty\|skipwhite\|display\|extend\|skipnl\|fold\)\>"
|
||||||
@ -542,7 +548,7 @@ syn match vimIsCommand "<Bar>\s*\a\+" transparent contains=vimCommand,vimNotatio
|
|||||||
|
|
||||||
" Highlighting: {{{2
|
" Highlighting: {{{2
|
||||||
" ============
|
" ============
|
||||||
syn cluster vimHighlightCluster contains=vimHiLink,vimHiClear,vimHiKeyList,vimComment
|
syn cluster vimHighlightCluster contains=vimHiLink,vimHiClear,vimHiKeyList,vimComment,vim9Comment
|
||||||
if !exists("g:vimsyn_noerror") && !exists("g:vimsyn_novimhictermerror")
|
if !exists("g:vimsyn_noerror") && !exists("g:vimsyn_novimhictermerror")
|
||||||
syn match vimHiCtermError contained "\D\i*"
|
syn match vimHiCtermError contained "\D\i*"
|
||||||
endif
|
endif
|
||||||
@ -598,6 +604,7 @@ syn match vimCtrlChar "[--]"
|
|||||||
" Beginners - Patterns that involve ^ {{{2
|
" Beginners - Patterns that involve ^ {{{2
|
||||||
" =========
|
" =========
|
||||||
syn match vimLineComment +^[ \t:]*".*$+ contains=@vimCommentGroup,vimCommentString,vimCommentTitle
|
syn match vimLineComment +^[ \t:]*".*$+ contains=@vimCommentGroup,vimCommentString,vimCommentTitle
|
||||||
|
syn match vim9LineComment +^[ \t:]\+#.*$+ contains=@vimCommentGroup,vimCommentString,vimCommentTitle
|
||||||
syn match vimCommentTitle '"\s*\%([sS]:\|\h\w*#\)\=\u\w*\(\s\+\u\w*\)*:'hs=s+1 contained contains=vimCommentTitleLeader,vimTodo,@vimCommentGroup
|
syn match vimCommentTitle '"\s*\%([sS]:\|\h\w*#\)\=\u\w*\(\s\+\u\w*\)*:'hs=s+1 contained contains=vimCommentTitleLeader,vimTodo,@vimCommentGroup
|
||||||
syn match vimContinue "^\s*\\"
|
syn match vimContinue "^\s*\\"
|
||||||
syn region vimString start="^\s*\\\z(['"]\)" skip='\\\\\|\\\z1' end="\z1" oneline keepend contains=@vimStringGroup,vimContinue
|
syn region vimString start="^\s*\\\z(['"]\)" skip='\\\\\|\\\z1' end="\z1" oneline keepend contains=@vimStringGroup,vimContinue
|
||||||
@ -716,10 +723,10 @@ if g:vimsyn_embed =~# 'P' && filereadable(s:pythonpath)
|
|||||||
unlet! b:current_syntax
|
unlet! b:current_syntax
|
||||||
syn cluster vimFuncBodyList add=vimPythonRegion
|
syn cluster vimFuncBodyList add=vimPythonRegion
|
||||||
exe "syn include @vimPythonScript ".s:pythonpath
|
exe "syn include @vimPythonScript ".s:pythonpath
|
||||||
VimFoldP syn region vimPythonRegion matchgroup=vimScriptDelim start=+py\%[thon]3\=\s*<<\s*\z(\S*\)\ze\(\s*#.*\)\=$+ end=+^\z1\ze\(\s*".*\)\=$+ contains=@vimPythonScript
|
VimFoldP syn region vimPythonRegion matchgroup=vimScriptDelim start=+py\%[thon][3x]\=\s*<<\s*\z(\S*\)\ze\(\s*#.*\)\=$+ end=+^\z1\ze\(\s*".*\)\=$+ contains=@vimPythonScript
|
||||||
VimFoldP syn region vimPythonRegion matchgroup=vimScriptDelim start=+py\%[thon]3\=\s*<<\s*$+ end=+\.$+ contains=@vimPythonScript
|
VimFoldP syn region vimPythonRegion matchgroup=vimScriptDelim start=+py\%[thon][3x]\=\s*<<\s*$+ end=+\.$+ contains=@vimPythonScript
|
||||||
VimFoldP syn region vimPythonRegion matchgroup=vimScriptDelim start=+Py\%[thon]2or3\s*<<\s*\z(\S*\)\ze\(\s*#.*\)\=$+ end=+^\z1\ze\(\s*".*\)\=$+ contains=@vimPythonScript
|
VimFoldP syn region vimPythonRegion matchgroup=vimScriptDelim start=+Py\%[thon]2or3\s*<<\s*\z(\S*\)\ze\(\s*#.*\)\=$+ end=+^\z1\ze\(\s*".*\)\=$+ contains=@vimPythonScript
|
||||||
VimFoldP syn region vimPythonRegion matchgroup=vimScriptDelim start=+Py\%[thon]2or3\=\s*<<\s*$+ end=+\.$+ contains=@vimPythonScript
|
VimFoldP syn region vimPythonRegion matchgroup=vimScriptDelim start=+Py\%[thon]2or3\=\s*<<\s*$+ end=+\.$+ contains=@vimPythonScript
|
||||||
syn cluster vimFuncBodyList add=vimPythonRegion
|
syn cluster vimFuncBodyList add=vimPythonRegion
|
||||||
else
|
else
|
||||||
syn region vimEmbedError start=+py\%[thon]3\=\s*<<\s*\z(.*\)$+ end=+^\z1$+
|
syn region vimEmbedError start=+py\%[thon]3\=\s*<<\s*\z(.*\)$+ end=+^\z1$+
|
||||||
@ -835,6 +842,7 @@ if !exists("skip_vim_syntax_inits")
|
|||||||
hi def link vimCmplxRepeat SpecialChar
|
hi def link vimCmplxRepeat SpecialChar
|
||||||
hi def link vimCommand Statement
|
hi def link vimCommand Statement
|
||||||
hi def link vimComment Comment
|
hi def link vimComment Comment
|
||||||
|
hi def link vim9Comment Comment
|
||||||
hi def link vimCommentString vimString
|
hi def link vimCommentString vimString
|
||||||
hi def link vimCommentTitle PreProc
|
hi def link vimCommentTitle PreProc
|
||||||
hi def link vimCondHL vimCommand
|
hi def link vimCondHL vimCommand
|
||||||
@ -885,6 +893,7 @@ if !exists("skip_vim_syntax_inits")
|
|||||||
hi def link vimLetHereDocStart Special
|
hi def link vimLetHereDocStart Special
|
||||||
hi def link vimLetHereDocStop Special
|
hi def link vimLetHereDocStop Special
|
||||||
hi def link vimLineComment vimComment
|
hi def link vimLineComment vimComment
|
||||||
|
hi def link vim9LineComment vimComment
|
||||||
hi def link vimMapBang vimCommand
|
hi def link vimMapBang vimCommand
|
||||||
hi def link vimMapModKey vimFuncSID
|
hi def link vimMapModKey vimFuncSID
|
||||||
hi def link vimMapMod vimBracket
|
hi def link vimMapMod vimBracket
|
||||||
|
Loading…
Reference in New Issue
Block a user