diff options
Diffstat (limited to 'runtime/syntax')
| -rw-r--r-- | runtime/syntax/hyprlang.vim | 7 | ||||
| -rw-r--r-- | runtime/syntax/java.vim | 24 | ||||
| -rw-r--r-- | runtime/syntax/lf.vim | 194 | ||||
| -rw-r--r-- | runtime/syntax/solidity.vim | 14 | ||||
| -rw-r--r-- | runtime/syntax/vim.vim | 2 |
5 files changed, 135 insertions, 106 deletions
diff --git a/runtime/syntax/hyprlang.vim b/runtime/syntax/hyprlang.vim index cde504d9ca..081d917b4c 100644 --- a/runtime/syntax/hyprlang.vim +++ b/runtime/syntax/hyprlang.vim @@ -1,11 +1,14 @@ " Vim syntax file " Language: hyprlang " Maintainer: Luca Saccarola <github.e41mv@aleeas.com> -" Last Change: 2025 Jan 29 +" Last Change: 2025 Mar 26 if exists("b:current_syntax") finish endif +let s:cpo= &cpo +set cpo&vim + let b:current_syntax = "hyprlang" syn case ignore @@ -56,4 +59,6 @@ hi def link hyprString String hi def link hyprColor Structure hi def link hyprCommand Keyword +let &cpo = s:cpo +unlet s:cpo " vim: ts=8 sts=2 sw=2 et diff --git a/runtime/syntax/java.vim b/runtime/syntax/java.vim index 9b38ccd4dc..8dabc5e3df 100644 --- a/runtime/syntax/java.vim +++ b/runtime/syntax/java.vim @@ -3,7 +3,7 @@ " Maintainer: Aliaksei Budavei <0x000c70 AT gmail DOT com> " Former Maintainer: Claudio Fleiner <claudio@fleiner.com> " Repository: https://github.com/zzzyxwvut/java-vim.git -" Last Change: 2025 Jan 02 +" Last Change: 2025 Mar 26 " Please check ":help java.vim" for comments on some of the options " available. @@ -46,8 +46,10 @@ function! s:ff.RightConstant(x, y) abort return a:y endfunction -function! s:ff.IsRequestedPreviewFeature(n) abort - return exists("g:java_syntax_previews") && index(g:java_syntax_previews, a:n) + 1 +function! s:ff.IsAnyRequestedPreviewFeatureOf(ns) abort + return exists("g:java_syntax_previews") && + \ !empty(filter(a:ns, printf('index(%s, v:val) + 1', + \ string(g:java_syntax_previews)))) endfunction if !exists("*s:ReportOnce") @@ -108,7 +110,7 @@ syn keyword javaTypedef this super syn keyword javaOperator new instanceof syn match javaOperator "\<var\>\%(\s*(\)\@!" -if s:ff.IsRequestedPreviewFeature(476) +if s:ff.IsAnyRequestedPreviewFeatureOf([476, 494]) " Module imports can be used in any source file. syn match javaExternal "\<import\s\+module\>" contains=javaModuleImport syn keyword javaModuleImport contained module @@ -262,8 +264,12 @@ if exists("g:java_highlight_all") || exists("g:java_highlight_java") || exists(" syn keyword javaC_JavaLang Class InheritableThreadLocal ThreadLocal Enum ClassValue endif - " As of JDK 21, java.lang.Compiler is no more (deprecated in JDK 9). - syn keyword javaLangDeprecated Compiler + " As of JDK 24, SecurityManager is rendered non-functional + " (JDK-8338625). + " (Note that SecurityException and RuntimePermission are still + " not deprecated.) + " As of JDK 21, Compiler is no more (JDK-8205129). + syn keyword javaLangDeprecated Compiler SecurityManager syn cluster javaClasses add=javaC_JavaLang hi def link javaC_JavaLang javaC_Java syn keyword javaE_JavaLang AbstractMethodError ClassCircularityError ClassFormatError Error IllegalAccessError IncompatibleClassChangeError InstantiationError InternalError LinkageError NoClassDefFoundError NoSuchFieldError NoSuchMethodError OutOfMemoryError StackOverflowError ThreadDeath UnknownError UnsatisfiedLinkError VerifyError VirtualMachineError ExceptionInInitializerError UnsupportedClassVersionError AssertionError BootstrapMethodError @@ -311,7 +317,7 @@ endif exec 'syn match javaUserLabel "^\s*\<\K\k*\>\%(\<default\>\)\@' . s:ff.Peek('7', '') . '<!\s*::\@!"he=e-1' -if s:ff.IsRequestedPreviewFeature(455) +if s:ff.IsAnyRequestedPreviewFeatureOf([455, 488]) syn region javaLabelRegion transparent matchgroup=javaLabel start="\<case\>" matchgroup=NONE end=":\|->" contains=javaBoolean,javaNumber,javaCharacter,javaString,javaConstant,@javaClasses,javaGenerics,javaType,javaLabelDefault,javaLabelVarType,javaLabelWhenClause else syn region javaLabelRegion transparent matchgroup=javaLabel start="\<case\>" matchgroup=NONE end=":\|->" contains=javaLabelCastType,javaLabelNumber,javaCharacter,javaString,javaConstant,@javaClasses,javaGenerics,javaLabelDefault,javaLabelVarType,javaLabelWhenClause @@ -609,7 +615,7 @@ syn region javaString start=+"+ end=+"+ end=+$+ contains=javaSpecialChar,javaS syn region javaString start=+"""[ \t\x0c\r]*$+hs=e+1 end=+"""+he=s-1 contains=javaSpecialChar,javaSpecialError,javaTextBlockError,@Spell syn match javaTextBlockError +"""\s*"""+ -if s:ff.IsRequestedPreviewFeature(430) +if s:ff.IsAnyRequestedPreviewFeatureOf([430]) syn region javaStrTemplEmbExp contained matchgroup=javaStrTempl start="\\{" end="}" contains=TOP exec 'syn region javaStrTempl start=+\%(\.[[:space:]\n]*\)\@' . s:ff.Peek('80', '') . '<="+ end=+"+ contains=javaStrTemplEmbExp,javaSpecialChar,javaSpecialError,@Spell' exec 'syn region javaStrTempl start=+\%(\.[[:space:]\n]*\)\@' . s:ff.Peek('80', '') . '<="""[ \t\x0c\r]*$+hs=e+1 end=+"""+he=s-1 contains=javaStrTemplEmbExp,javaSpecialChar,javaSpecialError,javaTextBlockError,@Spell' @@ -688,7 +694,7 @@ if exists("g:java_highlight_debug") syn region javaDebugString contained start=+"+ end=+"+ contains=javaDebugSpecial syn region javaDebugString contained start=+"""[ \t\x0c\r]*$+hs=e+1 end=+"""+he=s-1 contains=javaDebugSpecial,javaDebugTextBlockError - if s:ff.IsRequestedPreviewFeature(430) + if s:ff.IsAnyRequestedPreviewFeatureOf([430]) " The highlight groups of java{StrTempl,Debug{,Paren,StrTempl}}\, " share one colour by default. Do not conflate unrelated parens. syn region javaDebugStrTemplEmbExp contained matchgroup=javaDebugStrTempl start="\\{" end="}" contains=javaComment,javaLineComment,javaDebug\%(Paren\)\@!.* diff --git a/runtime/syntax/lf.vim b/runtime/syntax/lf.vim index e4cf014865..3c1513fe68 100644 --- a/runtime/syntax/lf.vim +++ b/runtime/syntax/lf.vim @@ -2,15 +2,18 @@ " Language: lf file manager configuration file (lfrc) " Maintainer: Andis Sprinkis <andis@sprinkis.com> " Former Maintainer: Cameron Wright -" Former URL: https://github.com/andis-sprinkis/lf-vim -" Last Change: 13 October 2024 +" URL: https://github.com/andis-sprinkis/lf-vim +" Last Change: 28 March 2025 +" 29 Mar 2025 by Vim Project (save and restore 'cpo' setting) " " The shell syntax highlighting is configurable. See $VIMRUNTIME/doc/syntax.txt -" lf version: 32 +" lf version: 34 if exists("b:current_syntax") finish endif +let s:cpo = &cpo +set cpo&vim let b:current_syntax = "lf" @@ -33,122 +36,80 @@ syn keyword lfKeyword set setlocal cmd map cmap skipwhite "{{{ Options Keywords syn keyword lfOptions - \ quit - \ up - \ half-up - \ page-up - \ scroll-up - \ down - \ half-down - \ page-down - \ scroll-down - \ updir - \ open - \ jump-next - \ jump-prev - \ top + \ anchorfind + \ autoquit + \ borderfmt \ bottom - \ high - \ middle - \ low - \ toggle - \ invert - \ invert-below - \ unselect - \ glob-select - \ glob-unselect \ calcdirsize - \ clearmaps - \ copy - \ cut - \ paste - \ clear - \ sync - \ draw - \ redraw - \ load - \ reload - \ echo - \ echomsg - \ echoerr \ cd - \ select - \ delete - \ rename - \ source - \ push - \ read - \ shell - \ shell-pipe - \ shell-wait - \ shell-async - \ find - \ find-back - \ find-next - \ find-prev - \ search - \ search-back - \ search-next - \ search-prev - \ filter - \ setfilter - \ mark-save - \ mark-load - \ mark-remove - \ tag - \ tag-toggle - \ cmd-escape + \ cleaner + \ clear + \ clearmaps + \ cmd-capitalize-word \ cmd-complete - \ cmd-menu-complete - \ cmd-menu-complete-back - \ cmd-menu-accept + \ cmd-delete + \ cmd-delete-back + \ cmd-delete-end + \ cmd-delete-home + \ cmd-delete-unix-word + \ cmd-delete-word + \ cmd-delete-word-back + \ cmd-end \ cmd-enter - \ cmd-interrupt + \ cmd-escape \ cmd-history-next \ cmd-history-prev + \ cmd-home + \ cmd-interrupt \ cmd-left + \ cmd-lowercase-word + \ cmd-menu-accept + \ cmd-menu-complete + \ cmd-menu-complete-back \ cmd-right - \ cmd-home - \ cmd-end - \ cmd-delete - \ cmd-delete-back - \ cmd-delete-home - \ cmd-delete-end - \ cmd-delete-unix-word - \ cmd-yank \ cmd-transpose \ cmd-transpose-word + \ cmd-uppercase-word \ cmd-word \ cmd-word-back - \ cmd-delete-word - \ cmd-delete-word-back - \ cmd-capitalize-word - \ cmd-uppercase-word - \ cmd-lowercase-word - \ anchorfind - \ autoquit - \ borderfmt - \ cleaner + \ cmd-yank + \ copy \ copyfmt \ cursoractivefmt \ cursorparentfmt \ cursorpreviewfmt + \ cut \ cutfmt + \ delete \ dircache \ dircounts \ dirfirst \ dironly \ dirpreviews + \ down + \ draw \ drawbox \ dupfilefmt + \ echo + \ echoerr + \ echomsg \ errorfmt \ filesep + \ filter + \ find + \ find-back + \ find-next + \ find-prev \ findlen + \ glob-select + \ glob-unselect \ globfilter \ globsearch + \ half-down + \ half-up \ hidden \ hiddenfiles - \ hidecursorinactive + \ high \ history \ icons \ ifs @@ -159,45 +120,90 @@ syn keyword lfOptions \ info \ infotimefmtnew \ infotimefmtold + \ invert + \ invert-below + \ jump-next + \ jump-prev + \ load + \ locale + \ low + \ mark-load + \ mark-remove + \ mark-save + \ middle \ mouse \ number \ numberfmt + \ on-cd + \ on-focus-gained + \ on-focus-lost + \ on-init + \ on-quit + \ on-redraw + \ on-select + \ open + \ page-down + \ page-up + \ paste \ period + \ pre-cd \ preserve \ preview \ previewer \ promptfmt + \ push + \ quit \ ratios + \ read + \ redraw \ relativenumber + \ reload + \ rename \ reverse \ roundbox - \ ruler \ rulerfmt + \ scroll-down + \ scroll-up \ scrolloff + \ search + \ search-back + \ search-next + \ search-prev + \ select \ selectfmt \ selmode + \ setfilter \ shell + \ shell-async + \ shell-pipe + \ shell-wait \ shellflag \ shellopts + \ showbinds \ sixel \ smartcase \ smartdia \ sortby + \ source \ statfmt + \ sync \ tabstop + \ tag + \ tag-toggle \ tagfmt \ tempmarks \ timefmt + \ toggle + \ top \ truncatechar \ truncatepct + \ unselect + \ up + \ updir \ waitmsg + \ watch \ wrapscan \ wrapscroll - \ pre-cd - \ on-cd - \ on-select - \ on-redraw - \ on-quit "}}} "{{{ Special Matching @@ -234,3 +240,5 @@ hi def link lfExternalShell Normal hi def link lfExternalPatch Special hi def link lfIgnore Special "}}} +let &cpo = s:cpo +unlet s:cpo diff --git a/runtime/syntax/solidity.vim b/runtime/syntax/solidity.vim index a46d041a10..5391bba707 100644 --- a/runtime/syntax/solidity.vim +++ b/runtime/syntax/solidity.vim @@ -2,10 +2,11 @@ " Language: Solidity " Maintainer: Cothi (jiungdev@gmail.com) " Original Author: tomlion (https://github.com/tomlion/vim-solidity/blob/master/syntax/solidity.vim) -" Last Change: 2022 Sep 27 +" Last Change: 2025 Mar 25 " " Contributors: " Modified by thesis (https://github.com/thesis/vim-solidity/blob/main/indent/solidity.vim) +" Modified by S0AndS0 (https://github.com/S0AndS0/vim/blob/syntax-solidity-updates/runtime/syntax/solidity.vim) if exists("b:current_syntax") finish @@ -15,7 +16,7 @@ endif syn keyword solKeyword abstract anonymous as break calldata case catch constant constructor continue default switch revert require syn keyword solKeyword ecrecover addmod mulmod keccak256 syn keyword solKeyword delete do else emit enum external final for function if immutable import in indexed inline -syn keyword solKeyword interface internal is let match memory modifier new of payable pragma private public pure override virtual +syn keyword solKeyword interface internal is let match memory modifier new of payable pragma private public pure override virtual transient syn keyword solKeyword relocatable return returns static storage struct throw try type typeof using syn keyword solKeyword var view while @@ -158,6 +159,15 @@ hi def link solEvent Type hi def link solEventName Function hi def link solEventArgSpecial Label +" Error +syn match solError /\<error\>/ nextgroup=solErrorName,solErrorArgs skipwhite +syn match solErrorName contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*/ nextgroup=solErrorArgs skipwhite +syn region solErrorArgs contained matchgroup=solFuncParens start='(' end=')' contains=solErrorArgCommas,solBuiltinType skipwhite skipempty +syn match solErrorArgCommas contained ',' + +hi def link solError Type +hi def link solErrorName Function + " Comment syn keyword solCommentTodo TODO FIXME XXX TBD contained syn match solNatSpec contained /@title\|@author\|@notice\|@dev\|@param\|@inheritdoc\|@return/ diff --git a/runtime/syntax/vim.vim b/runtime/syntax/vim.vim index 7fe22190b7..29d9856b3d 100644 --- a/runtime/syntax/vim.vim +++ b/runtime/syntax/vim.vim @@ -60,7 +60,7 @@ 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 " 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 PmenuMatch PmenuMatchSel PmenuExtra PmenuExtraSel ComplMatchIns 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 keyword vimHLGroup contained ErrorMsg IncSearch ModeMsg NonText StatusLine StatusLineNC EndOfBuffer VertSplit DiffText DiffTextAdd PmenuSbar TabLineSel TabLineFill Cursor lCursor QuickFixLine CursorLineSign CursorLineFold CurSearch PmenuKind PmenuKindSel PmenuMatch PmenuMatchSel PmenuExtra PmenuExtraSel ComplMatchIns 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 keyword vimOnlyHLGroup contained Menu Scrollbar ToolbarButton ToolbarLine Tooltip VisualNOS syn keyword nvimHLGroup contained FloatBorder FloatFooter FloatTitle MsgSeparator NormalFloat NormalNC Substitute TermCursor VisualNC Whitespace WinBar WinBarNC WinSeparator |