diff options
Diffstat (limited to 'syntax')
| -rw-r--r-- | syntax/elixir.vim | 7 | ||||
| -rw-r--r-- | syntax/go.vim | 36 | ||||
| -rw-r--r-- | syntax/latextoc.vim | 13 | ||||
| -rw-r--r-- | syntax/markdown.vim | 8 | ||||
| -rw-r--r-- | syntax/proto.vim | 2 | ||||
| -rw-r--r-- | syntax/qml.vim | 2 | ||||
| -rw-r--r-- | syntax/tmux.vim | 7 | ||||
| -rw-r--r-- | syntax/toml.vim | 4 |
8 files changed, 54 insertions, 25 deletions
diff --git a/syntax/elixir.vim b/syntax/elixir.vim index ba1f10c0..fa452609 100644 --- a/syntax/elixir.vim +++ b/syntax/elixir.vim @@ -64,9 +64,10 @@ syn match elixirVariable '&\d\+' syn keyword elixirPseudoVariable __FILE__ __DIR__ __MODULE__ __ENV__ __CALLER__ -syn match elixirNumber '\<\d\(_\?\d\)*\(\.[^[:space:][:digit:]]\@!\(_\?\d\)*\)\?\([eE][-+]\?\d\(_\?\d\)*\)\?\>' -syn match elixirNumber '\<0[xX][0-9A-Fa-f]\+\>' -syn match elixirNumber '\<0[bB][01]\+\>' +syn match elixirNumber '\<-\?\d\(_\?\d\)*\(\.[^[:space:][:digit:]]\@!\(_\?\d\)*\)\?\([eE][-+]\?\d\(_\?\d\)*\)\?\>' +syn match elixirNumber '\<-\?0[xX][0-9A-Fa-f]\+\>' +syn match elixirNumber '\<-\?0[oO][0-7]\+\>' +syn match elixirNumber '\<-\?0[bB][01]\+\>' syn match elixirRegexEscape "\\\\\|\\[aAbBcdDefGhHnrsStvVwW]\|\\\d\{3}\|\\x[0-9a-fA-F]\{2}" contained syn match elixirRegexEscapePunctuation "?\|\\.\|*\|\\\[\|\\\]\|+\|\\^\|\\\$\|\\|\|\\(\|\\)\|\\{\|\\}" contained diff --git a/syntax/go.vim b/syntax/go.vim index 69c2b011..ef0bdd6b 100644 --- a/syntax/go.vim +++ b/syntax/go.vim @@ -40,6 +40,10 @@ if !exists("g:go_highlight_functions") let g:go_highlight_functions = 0 endif +if !exists("g:go_highlight_function_arguments") + let g:go_highlight_function_arguments = 0 +endif + if !exists("g:go_highlight_methods") let g:go_highlight_methods = 0 endif @@ -96,7 +100,7 @@ if exists("g:go_fold_enable") if index(g:go_fold_enable, 'package_comment') == -1 let s:fold_package_comment = 0 endif - + " Disabled by default. if index(g:go_fold_enable, 'comment') > -1 let s:fold_comment = 1 @@ -231,14 +235,14 @@ endif " var, const if s:fold_varconst syn region goVar start='var (' end='^\s*)$' transparent fold - \ contains=ALLBUT,goParen,goBlock,goFunction,goTypeName,goReceiverType,goReceiverVar + \ contains=ALLBUT,goParen,goBlock,goFunction,goTypeName,goReceiverType,goReceiverVar,goArgumentName,goArgumentType,goSimpleArguments syn region goConst start='const (' end='^\s*)$' transparent fold - \ contains=ALLBUT,goParen,goBlock,goFunction,goTypeName,goReceiverType,goReceiverVar + \ contains=ALLBUT,goParen,goBlock,goFunction,goTypeName,goReceiverType,goReceiverVar,goArgumentName,goArgumentType,goSimpleArguments else - syn region goVar start='var (' end='^\s*)$' transparent - \ contains=ALLBUT,goParen,goBlock,goFunction,goTypeName,goReceiverType,goReceiverVar + syn region goVar start='var (' end='^\s*)$' transparent + \ contains=ALLBUT,goParen,goBlock,goFunction,goTypeName,goReceiverType,goReceiverVar,goArgumentName,goArgumentType,goSimpleArguments syn region goConst start='const (' end='^\s*)$' transparent - \ contains=ALLBUT,goParen,goBlock,goFunction,goTypeName,goReceiverType,goReceiverVar + \ contains=ALLBUT,goParen,goBlock,goFunction,goTypeName,goReceiverType,goReceiverVar,goArgumentName,goArgumentType,goSimpleArguments endif " Single-line var, const, and import. @@ -345,14 +349,22 @@ endif hi def link goOperator Operator " Functions; -if g:go_highlight_functions != 0 - syn match goDeclaration /\<func\>/ nextgroup=goReceiver,goFunction skipwhite skipnl - syn match goReceiver /(\(\w\|[ *]\)\+)/ contained nextgroup=goFunction contains=goReceiverVar skipwhite skipnl - syn match goReceiverVar /\w\+/ nextgroup=goPointerOperator,goReceiverType skipwhite skipnl contained +if g:go_highlight_functions isnot 0 || g:go_highlight_function_arguments isnot 0 + syn match goFunctionCall /\w\+\ze(/ contains=goBuiltins,goDeclaration + syn match goDeclaration /\<func\>/ nextgroup=goReceiver,goFunction,goSimpleArguments skipwhite skipnl + syn match goReceiverVar /\w\+\ze\s\+\(\w\|\*\)/ nextgroup=goPointerOperator,goReceiverType skipwhite skipnl contained syn match goPointerOperator /\*/ nextgroup=goReceiverType contained skipwhite skipnl + syn match goFunction /\w\+/ nextgroup=goSimpleArguments contained skipwhite skipnl syn match goReceiverType /\w\+/ contained - syn match goFunction /\w\+/ contained - syn match goFunctionCall /\w\+\ze(/ contains=GoBuiltins,goDeclaration +if g:go_highlight_function_arguments isnot 0 + syn match goSimpleArguments /(\(\w\|\_s\|[*\.\[\],\{\}<>-]\)*)/ contained contains=goArgumentName nextgroup=goSimpleArguments skipwhite skipnl + syn match goArgumentName /\w\+\(\s*,\s*\w\+\)*\ze\s\+\(\w\|\.\|\*\|\[\)/ contained nextgroup=goArgumentType skipwhite skipnl + syn match goArgumentType /\([^,)]\|\_s\)\+,\?/ contained nextgroup=goArgumentName skipwhite skipnl + \ contains=goVarArgs,goType,goSignedInts,goUnsignedInts,goFloats,goComplexes,goDeclType,goBlock + hi def link goReceiverVar goArgumentName + hi def link goArgumentName Identifier +endif + syn match goReceiver /(\s*\w\+\(\s\+\*\?\s*\w\+\)\?\s*)\ze\s*\w/ contained nextgroup=goFunction contains=goReceiverVar skipwhite skipnl else syn keyword goDeclaration func endif diff --git a/syntax/latextoc.vim b/syntax/latextoc.vim new file mode 100644 index 00000000..0faca708 --- /dev/null +++ b/syntax/latextoc.vim @@ -0,0 +1,13 @@ +if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'latex') == -1 + +syntax match helpText /^.*: .*/ +syntax match secNum /^\S\+\(\.\S\+\)\?\s*/ contained conceal +syntax match secLine /^\S\+\t.\+/ contains=secNum +syntax match mainSecLine /^[^\.]\+\t.*/ contains=secNum +syntax match ssubSecLine /^[^\.]\+\.[^\.]\+\.[^\.]\+\t.*/ contains=secNum +highlight link helpText PreProc +highlight link secNum Number +highlight link mainSecLine Title +highlight link ssubSecLine Comment + +endif diff --git a/syntax/markdown.vim b/syntax/markdown.vim index 2d2ee521..79af3af7 100644 --- a/syntax/markdown.vim +++ b/syntax/markdown.vim @@ -110,11 +110,9 @@ syn match mkdCode /^\s*\n\(\(\s\{4,}[^ ]\|\t\+[^\t]\).*\n\)\+/ containe syn match mkdListItem /^\s*\%([-*+]\|\d\+\.\)\ze\s\+/ contained syn region mkdListItemLine start="^\s*\%([-*+]\|\d\+\.\)\s\+" end="$" oneline contains=@mkdNonListItem,mkdListItem,@Spell syn region mkdNonListItemBlock start="\(\%^\(\s*\([-*+]\|\d\+\.\)\s\+\)\@!\|\n\(\_^\_$\|\s\{4,}[^ ]\|\t+[^\t]\)\@!\)" end="^\(\s*\([-*+]\|\d\+\.\)\s\+\)\@=" contains=@mkdNonListItem,@Spell -syn match mkdRule /^\s*\*\s\{0,1}\*\s\{0,1}\*$/ -syn match mkdRule /^\s*-\s\{0,1}-\s\{0,1}-$/ -syn match mkdRule /^\s*_\s\{0,1}_\s\{0,1}_$/ -syn match mkdRule /^\s*-\{3,}$/ -syn match mkdRule /^\s*\*\{3,5}$/ +syn match mkdRule /^\s*\*\s\{0,1}\*\s\{0,1}\*\(\*\|\s\)*$/ +syn match mkdRule /^\s*-\s\{0,1}-\s\{0,1}-\(-\|\s\)*$/ +syn match mkdRule /^\s*_\s\{0,1}_\s\{0,1}_\(_\|\s\)*$/ " YAML frontmatter if get(g:, 'vim_markdown_frontmatter', 0) diff --git a/syntax/proto.vim b/syntax/proto.vim index 1f7c3c12..9c299770 100644 --- a/syntax/proto.vim +++ b/syntax/proto.vim @@ -61,6 +61,7 @@ syn keyword pbRepeat optional required repeated syn keyword pbDefault default syn keyword pbExtend extend extensions to max reserved syn keyword pbRPC service rpc returns +syn keyword pbStream stream syn keyword pbType int32 int64 uint32 uint64 sint32 sint64 syn keyword pbType fixed32 fixed64 sfixed32 sfixed64 @@ -92,6 +93,7 @@ if version >= 508 || !exists("did_proto_syn_inits") HiLink pbDefault Keyword HiLink pbExtend Keyword HiLink pbRPC Keyword + HiLink pbStream Keyword HiLink pbType Type HiLink pbTypedef Typedef HiLink pbBool Boolean diff --git a/syntax/qml.vim b/syntax/qml.vim index 2fef61ee..2832dfe0 100644 --- a/syntax/qml.vim +++ b/syntax/qml.vim @@ -59,7 +59,7 @@ syn keyword qmlLabel case default syn keyword qmlException try catch finally throw syn keyword qmlMessage alert confirm prompt status syn keyword qmlGlobal self -syn keyword qmlDeclaration property signal +syn keyword qmlDeclaration property signal readonly syn keyword qmlReserved abstract boolean byte char class const debugger enum export extends final float goto implements import interface long native package pragma private protected public short static super synchronized throws transient volatile if get(g:, 'qml_fold', 0) diff --git a/syntax/tmux.vim b/syntax/tmux.vim index 69153893..64dd0e4f 100644 --- a/syntax/tmux.vim +++ b/syntax/tmux.vim @@ -19,9 +19,9 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tmux') == -1 " - Switch on syntax highlighting by adding "syntax enable" to .vimrc. " -if version < 600 +if v:version < 600 syntax clear -elseif exists("b:current_syntax") +elseif exists('b:current_syntax') finish endif @@ -52,6 +52,7 @@ syn keyword tmuxCmds \ confirm \ confirm-before \ copy-mode + \ copy-mode-vi \ delete-buffer \ deleteb \ detach @@ -327,6 +328,6 @@ hi def link tmuxTodo Todo hi def link tmuxVariable Constant hi def link tmuxVariableExpansion Constant -let b:current_syntax = "tmux" +let b:current_syntax = 'tmux' endif diff --git a/syntax/toml.vim b/syntax/toml.vim index 17ea3cf9..7a5b44f2 100644 --- a/syntax/toml.vim +++ b/syntax/toml.vim @@ -38,7 +38,9 @@ syn match tomlBoolean /\<\%(true\|false\)\>/ display hi def link tomlBoolean Boolean " https://tools.ietf.org/html/rfc3339 -syn match tomlDate /\d\{4\}-\d\{2\}-\d\{2\}T\d\{2\}:\d\{2\}:\d\{2\}\%(\.\d\+\)\?\%(Z\|[+-]\d\{2\}:\d\{2\}\)/ display +syn match tomlDate /\d\{4\}-\d\{2\}-\d\{2\}/ display +syn match tomlDate /\d\{2\}:\d\{2\}:\d\{2\}\%(\.\d\+\)\?/ display +syn match tomlDate /\d\{4\}-\d\{2\}-\d\{2\}[T ]\d\{2\}:\d\{2\}:\d\{2\}\%(\.\d\+\)\?\%(Z\|[+-]\d\{2\}:\d\{2\}\)\?/ display hi def link tomlDate Constant syn region tomlKeyDq oneline start=/"/ end=/"/ contains=tomlEscape contained |