mirror of
https://github.com/neovim/neovim.git
synced 2024-12-24 21:25:04 -07:00
vim-patch:a3bddb7: runtime(vim): Update base-syntax, match :catch and :throw args (vim/vim#14989)
Match :catch /{pattern}/ and :throw {expr1}.
a3bddb759e
Co-authored-by: dkearns <dougkearns@gmail.com>
This commit is contained in:
parent
79ed11f257
commit
0600754d8d
@ -60,9 +60,9 @@ syn case ignore
|
|||||||
syn keyword vimGroup contained Comment Constant String Character Number Boolean Float Identifier Function Statement Conditional Repeat Label Operator Keyword Exception PreProc Include Define Macro PreCondit Type StorageClass Structure Typedef Special SpecialChar Tag Delimiter SpecialComment Debug Underlined Ignore Error Todo
|
syn keyword vimGroup contained Comment Constant String Character Number Boolean Float Identifier Function Statement Conditional Repeat Label Operator Keyword Exception PreProc Include Define Macro PreCondit Type StorageClass Structure Typedef Special SpecialChar Tag Delimiter SpecialComment Debug Underlined Ignore Error Todo
|
||||||
|
|
||||||
" Default highlighting groups {{{2
|
" Default highlighting groups {{{2
|
||||||
syn keyword vimHLGroup contained ErrorMsg IncSearch ModeMsg NonText StatusLine StatusLineNC EndOfBuffer VertSplit DiffText PmenuSbar TabLineSel TabLineFill Cursor lCursor QuickFixLine CursorLineSign CursorLineFold CurSearch PmenuKind PmenuKindSel PmenuExtra PmenuExtraSel Normal Directory LineNr CursorLineNr MoreMsg Question Search SpellBad SpellCap SpellRare SpellLocal PmenuThumb Pmenu PmenuSel SpecialKey Title WarningMsg WildMenu Folded FoldColumn SignColumn Visual DiffAdd DiffChange DiffDelete TabLine CursorColumn CursorLine ColorColumn MatchParen CursorIM LineNrAbove LineNrBelow
|
syn keyword vimHLGroup contained ErrorMsg IncSearch ModeMsg NonText StatusLine StatusLineNC EndOfBuffer VertSplit DiffText PmenuSbar TabLineSel TabLineFill Cursor lCursor QuickFixLine CursorLineSign CursorLineFold CurSearch PmenuKind PmenuKindSel PmenuMatch PmenuMatchSel PmenuExtra PmenuExtraSel Normal Directory LineNr CursorLineNr MoreMsg Question Search SpellBad SpellCap SpellRare SpellLocal PmenuThumb Pmenu PmenuSel SpecialKey Title WarningMsg WildMenu Folded FoldColumn SignColumn Visual DiffAdd DiffChange DiffDelete TabLine CursorColumn CursorLine ColorColumn MatchParen StatusLineTerm StatusLineTermNC CursorIM LineNrAbove LineNrBelow
|
||||||
syn match vimHLGroup contained "\<Conceal\>"
|
syn match vimHLGroup contained "\<Conceal\>"
|
||||||
syn keyword vimOnlyHLGroup contained Menu Scrollbar StatusLineTerm StatusLineTermNC ToolbarButton ToolbarLine Tooltip VisualNOS
|
syn keyword vimOnlyHLGroup contained Menu Scrollbar ToolbarButton ToolbarLine Tooltip VisualNOS
|
||||||
syn keyword nvimHLGroup contained FloatBorder FloatFooter FloatTitle MsgSeparator NormalFloat NormalNC Substitute TermCursor TermCursorNC VisualNC Whitespace WinBar WinBarNC WinSeparator
|
syn keyword nvimHLGroup contained FloatBorder FloatFooter FloatTitle MsgSeparator NormalFloat NormalNC Substitute TermCursor TermCursorNC VisualNC Whitespace WinBar WinBarNC WinSeparator
|
||||||
"}}}2
|
"}}}2
|
||||||
syn case match
|
syn case match
|
||||||
@ -165,7 +165,7 @@ syn match vimNumber '\%(^\|\A\)\zs#\x\{6}' skipwhite nextgroup=vimGlobal,vimSub
|
|||||||
syn case match
|
syn case match
|
||||||
|
|
||||||
" All vimCommands are contained by vimIsCommand. {{{2
|
" All vimCommands are contained by vimIsCommand. {{{2
|
||||||
syn cluster vimCmdList contains=vimAbb,vimAddress,vimAutoCmd,vimAugroup,vimBehave,vimDef,@vimEcho,vimEnddef,vimEndfunction,vimExecute,vimIsCommand,vimExtCmd,vimFor,vimFunction,vimGlobal,vimHighlight,vimLet,vimMap,vimMark,vimNotFunc,vimNorm,vimSet,vimSyntax,vimUnlet,vimUnmap,vimUserCmd,vimMenu,vimMenutranslate
|
syn cluster vimCmdList contains=vimAbb,vimAddress,vimAutoCmd,vimAugroup,vimBehave,vimCatch,vimDef,@vimEcho,vimEnddef,vimEndfunction,vimExecute,vimIsCommand,vimExtCmd,vimFor,vimFunction,vimGlobal,vimHighlight,vimLet,vimMap,vimMark,vimNotFunc,vimNorm,vimSet,vimSyntax,vimThrow,vimUnlet,vimUnmap,vimUserCmd,vimMenu,vimMenutranslate
|
||||||
syn match vimCmdSep "[:|]\+" skipwhite nextgroup=@vimCmdList,vimSubst1
|
syn match vimCmdSep "[:|]\+" skipwhite nextgroup=@vimCmdList,vimSubst1
|
||||||
syn match vimIsCommand "\<\%(\h\w*\|[23]mat\%[ch]\)\>" contains=vimCommand
|
syn match vimIsCommand "\<\%(\h\w*\|[23]mat\%[ch]\)\>" contains=vimCommand
|
||||||
syn match vimVar contained "\<\h[a-zA-Z0-9#_]*\>"
|
syn match vimVar contained "\<\h[a-zA-Z0-9#_]*\>"
|
||||||
@ -196,6 +196,11 @@ syn match vimBehave "\<be\%[have]\>" nextgroup=vimBehaveBang,vimBehaveModel,vi
|
|||||||
syn match vimBehaveBang contained "\a\@1<=!" nextgroup=vimBehaveModel skipwhite
|
syn match vimBehaveBang contained "\a\@1<=!" nextgroup=vimBehaveModel skipwhite
|
||||||
syn keyword vimBehaveModel contained mswin xterm
|
syn keyword vimBehaveModel contained mswin xterm
|
||||||
|
|
||||||
|
" Exception Handling {{{2
|
||||||
|
syn keyword vimThrow th[row] skipwhite nextgroup=@vimExprList
|
||||||
|
syn keyword vimCatch cat[ch] skipwhite nextgroup=vimCatchPattern
|
||||||
|
syn region vimCatchPattern contained matchgroup=Delimiter start="\z([!#$%&'()*+,-./:;<=>?@[\]^_`{}~]\)" skip="\\\\\|\\\z1" end="\z1" contains=@vimSubstList oneline
|
||||||
|
|
||||||
" Filetypes {{{2
|
" Filetypes {{{2
|
||||||
" =========
|
" =========
|
||||||
syn match vimFiletype "\<filet\%[ype]\(\s\+\I\i*\)*" skipwhite contains=vimFTCmd,vimFTOption,vimFTError
|
syn match vimFiletype "\<filet\%[ype]\(\s\+\I\i*\)*" skipwhite contains=vimFTCmd,vimFTOption,vimFTError
|
||||||
@ -1067,6 +1072,7 @@ if !exists("skip_vim_syntax_inits")
|
|||||||
hi def link vimBehaveModel vimBehave
|
hi def link vimBehaveModel vimBehave
|
||||||
hi def link vimBehave vimCommand
|
hi def link vimBehave vimCommand
|
||||||
hi def link vimBracket Delimiter
|
hi def link vimBracket Delimiter
|
||||||
|
hi def link vimCatch vimCommand
|
||||||
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
|
||||||
@ -1224,6 +1230,7 @@ if !exists("skip_vim_syntax_inits")
|
|||||||
hi def link vimSynReg Type
|
hi def link vimSynReg Type
|
||||||
hi def link vimSyntax vimCommand
|
hi def link vimSyntax vimCommand
|
||||||
hi def link vimSynType vimSpecial
|
hi def link vimSynType vimSpecial
|
||||||
|
hi def link vimThrow vimCommand
|
||||||
hi def link vimTodo Todo
|
hi def link vimTodo Todo
|
||||||
hi def link vimType Type
|
hi def link vimType Type
|
||||||
hi def link vimUnlet vimCommand
|
hi def link vimUnlet vimCommand
|
||||||
|
Loading…
Reference in New Issue
Block a user