# HG changeset patch # User nanaya # Date 1649134506 -32400 # Node ID 6cdd7d26260d49172b737aa4a811c3c22b88bbf6 # Parent 2febdacae5b4fc0c93d9c30a0884a03b65e18bb2 [vim] Update syntaxes and colors diff -r 2febdacae5b4 -r 6cdd7d26260d vendor/vim-colors/PaperColor.vim --- a/vendor/vim-colors/PaperColor.vim Tue Apr 05 13:54:42 2022 +0900 +++ b/vendor/vim-colors/PaperColor.vim Tue Apr 05 13:55:06 2022 +0900 @@ -1264,6 +1264,7 @@ hi! link DiagnosticUnderlineWarn LspDiagnosticsUnderlineWarning hi! link DiagnosticUnderlineInfo LspDiagnosticsUnderlineInformation hi! link DiagnosticUnderlineHint LspDiagnosticsUnderlineHint + endif " Extension {{{ @@ -2247,6 +2248,54 @@ exec 'hi CocInfoSign' . s:fg_todo_fg . s:bg_todo_bg . s:ft_bold exec 'hi CocHintSign' . s:fg_todo_fg . s:bg_todo_bg . s:ft_bold + " Debug Adapter Protocol (DAP) - Plugin: rcarriga/nvim-dap-ui + if has('nvim') + exec 'hi DapUIDecoration' . s:fg_blue + " DAP Scopes window + hi! link DapUIType Type + hi! link DapUIVariable Identifier + exec 'hi DapUIScope' . s:fg_red . s:ft_bold + hi! link DapUIValue Number + exec 'hi DapUIModifiedValue' . s:fg_orange . s:ft_bold . s:bg_error_bg + " DAP Breakpoints window + hi! link DapUILineNumber LineNr + hi! link DapUIBreakpointsDisabledLine LineNr + exec 'hi DapUIBreakpointsCurrentLine' . s:fg_linenumber_fg . s:ft_bold . s:bg_error_bg + exec 'hi DapUIBreakpointsInfo' . s:fg_green + exec 'hi DapUIBreakpointsPath' . s:fg_olive . s:ft_bold + " DAP Stacks window + exec 'hi DapUIFrameName' . s:fg_blue + exec 'hi DapUIThread' . s:fg_pink . s:ft_bold + exec 'hi DapUIStoppedThread' . s:fg_pink + " DAP Watches window + exec 'hi DapUIWatchesEmpty' . s:fg_pink . s:ft_bold + hi! link DapUIWatchesError DapUIWatchesEmpty + hi! link DapUIWatchesValue Number + " DAP Breakpoints window + exec 'hi DapUISource' . s:fg_olive + " DAP Floating window + exec 'hi DapUIFloatBorder' . s:fg_blue + endif + + " Plugin: hrsh7th/nvim-cmp + if has('nvim') + hi! link CmpItemKindValue Number + hi! link CmpItemKindVariable Identifier + hi! link CmpItemKindKeyword Keyword + hi! link CmpItemKindField CmpItemKindVariable + exec 'hi CmpItemKindFunction' . s:fg_blue + hi! link CmpItemKindMethod CmpItemKindFunction + hi! link CmpItemKindConstructor CmpItemKindFunction + hi! link CmpItemKindClass Structure + hi! link CmpItemKindInterface Structure + exec 'hi CmpItemKindSnippet' . s:fg_orange + exec 'hi CmpItemKindFile' . s:fg_orange + hi! link CmpItemKindFolder CmpItemKindFile + exec 'hi CmpItemAbbrMatch' . s:fg_blue . s:ft_bold + exec 'hi CmpItemAbbrMatchFuzzy' . s:fg_blue . s:ft_bold + exec 'hi CmpItemAbbrDeprecated' . s:fg_foreground . ' gui=strikethrough' + endif + endfun " }}} diff -r 2febdacae5b4 -r 6cdd7d26260d vendor/vim-colors/codedark.vim --- a/vendor/vim-colors/codedark.vim Tue Apr 05 13:54:42 2022 +0900 +++ b/vendor/vim-colors/codedark.vim Tue Apr 05 13:55:06 2022 +0900 @@ -107,6 +107,11 @@ let g:codedark_conservative=0 endif +" Italicized comments +if !exists("g:codedark_italics") + let g:codedark_italics=0 +endif + let s:cdGray = {'gui': '#808080', 'cterm': s:cterm04, 'cterm256': '08'} let s:cdViolet = {'gui': '#646695', 'cterm': s:cterm04, 'cterm256': '60'} let s:cdBlue = {'gui': '#569CD6', 'cterm': s:cterm0D, 'cterm256': '75'} @@ -125,6 +130,7 @@ if g:codedark_conservative | let s:cdYellow = s:cdFront | endif let s:cdPink = {'gui': '#C586C0', 'cterm': s:cterm0E, 'cterm256': '176'} if g:codedark_conservative | let s:cdPink = s:cdBlue | endif +let s:cdSilver = {'gui': '#C0C0C0', 'cterm': s:cterm05, 'cterm256': '7'} " Vim editor colors " hi(GROUP, FOREGROUND, BACKGROUND, ATTRIBUTE, SPECIAL) @@ -174,7 +180,7 @@ hi! link diffChanged DiffChange hi! link diffRemoved DiffDelete -call hi('Comment', s:cdGreen, {}, 'none', {}) +if g:codedark_italics | call hi('Comment', s:cdGreen, {}, 'italic', {}) | else | call hi('Comment', s:cdGreen, {}, 'none', {}) | endif call hi('Constant', s:cdBlue, {}, 'none', {}) call hi('String', s:cdOrange, {}, 'none', {}) @@ -209,7 +215,7 @@ call hi('SpecialChar', s:cdFront, {}, 'none', {}) call hi('Tag', s:cdFront, {}, 'none', {}) call hi('Delimiter', s:cdFront, {}, 'none', {}) -call hi('SpecialComment', s:cdGreen, {}, 'none', {}) +if g:codedark_italics | call hi('SpecialComment', s:cdGreen, {}, 'italic', {}) | else | call hi('SpecialComment', s:cdGreen, {}, 'none', {}) | endif call hi('Debug', s:cdFront, {}, 'none', {}) call hi('Underlined', s:cdNone, {}, 'underline', {}) @@ -261,7 +267,7 @@ call hi('TSRepeat', s:cdPink, {}, 'none', {}) call hi('TSLabel', s:cdLightBlue, {}, 'none', {}) call hi('TSKeyword', s:cdBlue, {}, 'none', {}) -call hi('TSKeywordFunction', s:cdPink, {}, 'none', {}) +call hi('TSKeywordFunction', s:cdBlue, {}, 'none', {}) call hi('TSKeywordOperator', s:cdBlue, {}, 'none', {}) call hi('TSOperator', s:cdFront, {}, 'none', {}) call hi('TSException', s:cdPink, {}, 'none', {}) @@ -536,6 +542,7 @@ call hi('luaLocal', s:cdPink, {}, 'none', {}) call hi('luaBuiltIn', s:cdBlue, {}, 'none', {}) + " SH: call hi('shDeref', s:cdLightBlue, {}, 'none', {}) call hi('shVariable', s:cdLightBlue, {}, 'none', {}) @@ -549,5 +556,59 @@ call hi('yamlKey', s:cdBlue, {}, 'none', {}) call hi('yamlConstant', s:cdBlue, {}, 'none', {}) +" C++: +call hi('CTagsClass', s:cdBlueGreen, {}, 'none', {}) +call hi('CTagsStructure', s:cdBlueGreen, {}, 'none', {}) +call hi('CTagsNamespace', s:cdBlueGreen, {}, 'none', {}) +call hi('CTagsGlobalVariable', s:cdBlueGreen, {}, 'none', {}) +call hi('CTagsDefinedName ', s:cdBlue, {}, 'none', {}) +highlight def link CTagsFunction Function +highlight def link CTagsMember Identifier + +" C++ color_coded +call hi('StructDecl', s:cdBlueGreen, {}, 'none', {}) +call hi('UnionDecl', s:cdBlueGreen, {}, 'none', {}) +call hi('ClassDecl', s:cdBlueGreen, {}, 'none', {}) +call hi('TypeRef', s:cdBlueGreen, {}, 'none', {}) +call hi('TypedefDecl', s:cdBlueGreen, {}, 'none', {}) +call hi('TypeAliasDecl', s:cdBlueGreen, {}, 'none', {}) +call hi('EnumDecl', s:cdBlueGreen, {}, 'none', {}) +call hi('TemplateTypeParameter', s:cdBlueGreen, {}, 'none', {}) +call hi('TypeAliasTemplateDecl', s:cdBlueGreen, {}, 'none', {}) +call hi('ClassTemplate', s:cdBlueGreen, {}, 'none', {}) +call hi('ClassTemplatePartialSpecialization', s:cdBlueGreen, {}, 'none', {}) +call hi('FunctionTemplate', s:cdBlueGreen, {}, 'none', {}) +call hi('TemplateRef', s:cdBlueGreen, {}, 'none', {}) +call hi('TemplateTemplateParameter', s:cdBlueGreen, {}, 'none', {}) +call hi('UsingDeclaration', s:cdBlueGreen, {}, 'none', {}) +call hi('MemberRef', s:cdLightBlue, {}, 'italic', {}) +call hi('MemberRefExpr', s:cdYellow, {}, 'italic', {}) +call hi('Namespace', s:cdSilver, {}, 'none', {}) +call hi('NamespaceRef', s:cdSilver, {}, 'none', {}) +call hi('NamespaceAlias', s:cdSilver, {}, 'none', {}) + +" C++ lsp-cxx-highlight +call hi('LspCxxHlSymClass', s:cdBlueGreen, {}, 'none', {}) +call hi('LspCxxHlSymStruct', s:cdBlueGreen, {}, 'none', {}) +call hi('LspCxxHlSymEnum', s:cdBlueGreen, {}, 'none', {}) +call hi('LspCxxHlSymTypeAlias', s:cdBlueGreen, {}, 'none', {}) +call hi('LspCxxHlSymTypeParameter', s:cdBlueGreen, {}, 'none', {}) +call hi('LspCxxHlSymConcept', s:cdBlueGreen, {}, 'italic', {}) +call hi('LspCxxHlSymNamespace', s:cdSilver, {}, 'none', {}) + " Coc Explorer: +call hi('CocHighlightText', {}, s:cdSelection, 'none', {}) call hi('CocExplorerIndentLine', s:cdCursorDark, {}, 'none', {}) + +" nvim-cmp +call hi('CmpItemAbbrDeprecated', s:cdGray, {}, 'strikethrough', {}) +call hi('CmpItemAbbrMatch', s:cdBlue, {}, 'none', {}) +call hi('CmpItemAbbrMatchFuzzy', s:cdBlue, {}, 'none', {}) +call hi('CmpItemKindVariable', s:cdLightBlue, {}, 'none', {}) +call hi('CmpItemKindInterface', s:cdLightBlue, {}, 'none', {}) +call hi('CmpItemKindText', s:cdLightBlue, {}, 'none', {}) +call hi('CmpItemKindFunction', s:cdPink, {}, 'none', {}) +call hi('CmpItemKindMethod ', s:cdPink, {}, 'none', {}) +call hi('CmpItemKindKeyword', s:cdFront, {}, 'none', {}) +call hi('CmpItemKindProperty', s:cdFront, {}, 'none', {}) +call hi('CmpItemKindUnit', s:cdFront, {}, 'none', {}) diff -r 2febdacae5b4 -r 6cdd7d26260d vendor/vim-syntax/css.vim --- a/vendor/vim-syntax/css.vim Tue Apr 05 13:54:42 2022 +0900 +++ b/vendor/vim-syntax/css.vim Tue Apr 05 13:55:06 2022 +0900 @@ -7,7 +7,7 @@ " Nikolai Weibull (Add CSS2 support) " URL: https://github.com/vim-language-dept/css-syntax.vim " Maintainer: Jay Sitter -" Last Change: 2021 Oct 15 +" Last Change: 2021 Oct 20 " quit when a syntax file was already loaded if !exists("main_syntax") @@ -116,7 +116,7 @@ syn case ignore syn match cssImportant contained "!\s*important\>" -syn match cssCustomProp contained "--[a-zA-Z0-9-_]*" +syn match cssCustomProp contained "\<--[a-zA-Z0-9-_]*\>" syn match cssColor contained "\" syn match cssColor contained "\" @@ -126,6 +126,7 @@ syn match cssColor contained "#\x\{8\}\>" contains=cssUnitDecorators syn region cssURL contained matchgroup=cssFunctionName start="\<$uri\|url\|local\|format$\s*(" end=")" contains=cssStringQ,cssStringQQ oneline +syn region cssMathGroup contained matchgroup=cssMathParens start="(" end=")" containedin=cssFunction,cssMathGroup contains=cssCustomProp,cssValue.*,cssFunction,cssColor,cssStringQ,cssStringQQ oneline syn region cssFunction contained matchgroup=cssFunctionName start="\<$var\|calc$\s*(" end=")" contains=cssCustomProp,cssValue.*,cssFunction,cssColor,cssStringQ,cssStringQQ oneline syn region cssFunction contained matchgroup=cssFunctionName start="\<$rgb\|clip\|attr\|counter\|rect\|cubic-bezier\|steps$\s*(" end=")" oneline contains=cssValueInteger,cssValueNumber,cssValueLength,cssFunctionComma syn region cssFunction contained matchgroup=cssFunctionName start="\<$rgba\|hsl\|hsla\|color-stop\|from\|to$\s*(" end=")" oneline contains=cssColor,cssValueInteger,cssValueNumber,cssValueLength,cssFunctionComma,cssFunction @@ -395,9 +396,9 @@ syn match cssIEUIAttr contained '\' " Webkit/iOS specific properties -syn match cssUIProp contained '\' +syn match cssUIProp contained '\<$tap-highlight-color\|user-select\|touch-callout$\>' " IE specific properties -syn match cssIEUIProp contained '\' +syn match cssIEUIProp contained '\<$interpolation-mode\|zoom\|filter$\>' " Webkit/Firebox specific properties/attributes syn keyword cssUIProp contained appearance @@ -423,11 +424,15 @@ syn match cssMobileTextProp contained "\" syn keyword cssMediaProp contained width height orientation scan -syn match cssMediaProp contained /$\(max\|min$-\)\=$\(device$-\)\=aspect-ratio/ -syn match cssMediaProp contained /$\(max\|min$-\)\=device-pixel-ratio/ -syn match cssMediaProp contained /$\(max\|min$-\)\=device-$height\|width$/ -syn match cssMediaProp contained /$\(max\|min$-\)\=$height\|width\|resolution\|monochrome\|color\(-index$\=\)/ +syn keyword cssMediaProp contained any-hover any-pointer color-gamut grid hover +syn keyword cssMediaProp contained overflow-block overflow-inline pointer update +syn match cssMediaProp contained /\<$\(max\|min$-\)\=$\(device$-\)\=aspect-ratio\>/ +syn match cssMediaProp contained /\<$\(max\|min$-\)\=device-pixel-ratio\>/ +syn match cssMediaProp contained /\<$\(max\|min$-\)\=device-$height\|width$\>/ +syn match cssMediaProp contained /\<$\(max\|min$-\)\=$height\|width\|resolution\|monochrome\|color\(-index$\=\)\>/ syn keyword cssMediaAttr contained portrait landscape progressive interlace +syn keyword cssMediaAttr contained coarse fast fine hover infinite p3 paged +syn keyword cssMediaAttr contained rec2020 scroll slow srgb syn match cssKeyFrameProp contained /$\d\+\(\.\d\+$\?%\|$\$\)/ nextgroup=cssDefinition syn match cssPageMarginProp /@$\(top\|left\|right\|bottom$-$left\|center\|right\|middle\|bottom$\)$-corner$\=/ contained nextgroup=cssDefinition syn keyword cssPageProp contained content size @@ -445,17 +450,17 @@ syn match cssAttrComma "," " Pseudo class -" http://www.w3.org/TR/css3-selectors/ +" https://www.w3.org/TR/selectors-4/ syn match cssPseudoClass ":[A-Za-z0-9_-]*" contains=cssNoise,cssPseudoClassId,cssUnicodeEscape,cssVendor,cssPseudoClassFn syn keyword cssPseudoClassId contained link visited active hover before after left right -syn keyword cssPseudoClassId contained root empty target enable disabled checked invalid +syn keyword cssPseudoClassId contained root empty target enabled disabled checked invalid syn match cssPseudoClassId contained "\" syn match cssPseudoClassId contained "\<$first\|last\|only$-$of-type\|child$\>" -syn region cssPseudoClassFn contained matchgroup=cssFunctionName start="\<$not\|lang\|\(nth\|nth-last$-$of-type\|child$\)(" end=")" contains=cssStringQ,cssStringQQ +syn match cssPseudoClassId contained "\" +syn region cssPseudoClassFn contained matchgroup=cssFunctionName start="\<$not\|is\|lang\|\(nth\|nth-last$-$of-type\|child$\)(" end=")" contains=cssStringQ,cssStringQQ,cssTagName,cssAttributeSelector,cssClassName,cssIdentifier " ------------------------------------ " Vendor specific properties syn match cssPseudoClassId contained "\" -syn match cssPseudoClassId contained "\" syn match cssPseudoClassId contained "\<$input-$\=placeholder\>" " Misc highlight groups diff -r 2febdacae5b4 -r 6cdd7d26260d vendor/vim-syntax/eruby.vim --- a/vendor/vim-syntax/eruby.vim Tue Apr 05 13:54:42 2022 +0900 +++ b/vendor/vim-syntax/eruby.vim Tue Apr 05 13:55:06 2022 +0900 @@ -3,9 +3,9 @@ " Maintainer: Tim Pope " URL: https://github.com/vim-ruby/vim-ruby " Release Coordinator: Doug Kearns -" Last Change: 2018 Jul 04 +" Last Change: 2022 Mar 18 -if &syntax !~# '\' || get(b:, 'current_syntax') =~# '\' +if exists("b:current_syntax") finish endif @@ -19,8 +19,6 @@ if &filetype =~ '^eruby\.' let b:eruby_subtype = matchstr(&filetype,'^eruby\.\zs\w\+') -elseif &filetype =~ '^.*\.eruby\>' - let b:eruby_subtype = matchstr(&filetype,'^.\{-\}\ze\.eruby\>') elseif !exists("b:eruby_subtype") && main_syntax == 'eruby' let s:lines = getline(1)."\n".getline(2)."\n".getline(3)."\n".getline(4)."\n".getline(5)."\n".getline("$") let b:eruby_subtype = matchstr(s:lines,'eruby_subtype=\zs\w\+') @@ -54,10 +52,10 @@ let b:eruby_nest_level = 1 endif -if get(b:, 'eruby_subtype', '') !~# '^\%(eruby\)\=$' && &syntax =~# '^eruby\>' +if exists("b:eruby_subtype") && b:eruby_subtype != '' && b:eruby_subtype !=? 'eruby' exe "runtime! syntax/".b:eruby_subtype.".vim" + unlet! b:current_syntax endif -unlet! b:current_syntax syn include @rubyTop syntax/ruby.vim syn cluster erubyRegions contains=erubyOneLiner,erubyBlock,erubyExpression,erubyComment @@ -72,7 +70,7 @@ hi def link erubyDelimiter PreProc hi def link erubyComment Comment -let b:current_syntax = matchstr(&syntax, '^.*\') +let b:current_syntax = 'eruby' if main_syntax == 'eruby' unlet main_syntax diff -r 2febdacae5b4 -r 6cdd7d26260d vendor/vim-syntax/nginx.vim --- a/vendor/vim-syntax/nginx.vim Tue Apr 05 13:54:42 2022 +0900 +++ b/vendor/vim-syntax/nginx.vim Tue Apr 05 13:55:06 2022 +0900 @@ -5,6 +5,9 @@ finish end +let s:save_cpo = &cpo +set cpo&vim + " general syntax if has("patch-7.4.1142") @@ -152,6 +155,7 @@ syn keyword ngxDirective contained auth_jwt_key_file syn keyword ngxDirective contained auth_jwt_key_request syn keyword ngxDirective contained auth_jwt_leeway +syn keyword ngxDirective contained auth_jwt_require syn keyword ngxDirective contained auth_jwt_type syn keyword ngxDirective contained auth_request syn keyword ngxDirective contained auth_request_set @@ -335,6 +339,10 @@ syn keyword ngxDirective contained js_access syn keyword ngxDirective contained js_body_filter syn keyword ngxDirective contained js_content +syn keyword ngxDirective contained js_fetch_ciphers +syn keyword ngxDirective contained js_fetch_protocols +syn keyword ngxDirective contained js_fetch_trusted_certificate +syn keyword ngxDirective contained js_fetch_verify_depth syn keyword ngxDirective contained js_filter syn keyword ngxDirective contained js_header_filter syn keyword ngxDirective contained js_import @@ -402,6 +410,7 @@ syn keyword ngxDirective contained mp4_limit_rate syn keyword ngxDirective contained mp4_limit_rate_after syn keyword ngxDirective contained mp4_max_buffer_size +syn keyword ngxDirective contained mp4_start_key_frame syn keyword ngxDirective contained msie_padding syn keyword ngxDirective contained msie_refresh syn keyword ngxDirective contained multi_accept @@ -458,6 +467,7 @@ syn keyword ngxDirective contained proxy_cookie_path syn keyword ngxDirective contained proxy_download_rate syn keyword ngxDirective contained proxy_force_ranges +syn keyword ngxDirective contained proxy_half_close syn keyword ngxDirective contained proxy_headers_hash_bucket_size syn keyword ngxDirective contained proxy_headers_hash_max_size syn keyword ngxDirective contained proxy_hide_header @@ -597,6 +607,7 @@ syn keyword ngxDirective contained ssi_silent_errors syn keyword ngxDirective contained ssi_types syn keyword ngxDirective contained ssi_value_length +syn keyword ngxDirective contained ssl_alpn syn keyword ngxDirective contained ssl_buffer_size syn keyword ngxDirective contained ssl_certificate syn keyword ngxDirective contained ssl_certificate_key @@ -788,11 +799,15 @@ syn keyword ngxDirectiveThirdParty contained auth_gss syn keyword ngxDirectiveThirdParty contained auth_gss_allow_basic_fallback syn keyword ngxDirectiveThirdParty contained auth_gss_authorized_principal +syn keyword ngxDirectiveThirdParty contained auth_gss_authorized_principal_regex +syn keyword ngxDirectiveThirdParty contained auth_gss_constrained_delegation +syn keyword ngxDirectiveThirdParty contained auth_gss_delegate_credentials syn keyword ngxDirectiveThirdParty contained auth_gss_force_realm syn keyword ngxDirectiveThirdParty contained auth_gss_format_full syn keyword ngxDirectiveThirdParty contained auth_gss_keytab syn keyword ngxDirectiveThirdParty contained auth_gss_map_to_local syn keyword ngxDirectiveThirdParty contained auth_gss_realm +syn keyword ngxDirectiveThirdParty contained auth_gss_service_ccache syn keyword ngxDirectiveThirdParty contained auth_gss_service_name " LDAP Authentication @@ -969,7 +984,6 @@ syn keyword ngxDirectiveThirdParty contained fancyindex_hide_symlinks syn keyword ngxDirectiveThirdParty contained fancyindex_ignore syn keyword ngxDirectiveThirdParty contained fancyindex_localtime -syn keyword ngxDirectiveThirdParty contained fancyindex_name_length syn keyword ngxDirectiveThirdParty contained fancyindex_show_dotfiles syn keyword ngxDirectiveThirdParty contained fancyindex_show_path syn keyword ngxDirectiveThirdParty contained fancyindex_time_format @@ -1059,7 +1073,9 @@ syn keyword ngxDirectiveThirdParty contained nchan_pubsub syn keyword ngxDirectiveThirdParty contained nchan_pubsub_channel_id syn keyword ngxDirectiveThirdParty contained nchan_pubsub_location +syn keyword ngxDirectiveThirdParty contained nchan_redis_cluster_check_interval syn keyword ngxDirectiveThirdParty contained nchan_redis_connect_timeout +syn keyword ngxDirectiveThirdParty contained nchan_redis_discovered_ip_range_blacklist syn keyword ngxDirectiveThirdParty contained nchan_redis_fakesub_timer_interval syn keyword ngxDirectiveThirdParty contained nchan_redis_idle_channel_cache_timeout syn keyword ngxDirectiveThirdParty contained nchan_redis_namespace @@ -1067,12 +1083,29 @@ syn keyword ngxDirectiveThirdParty contained nchan_redis_optimize_target syn keyword ngxDirectiveThirdParty contained nchan_redis_pass syn keyword ngxDirectiveThirdParty contained nchan_redis_pass_inheritable +syn keyword ngxDirectiveThirdParty contained nchan_redis_password syn keyword ngxDirectiveThirdParty contained nchan_redis_ping_interval syn keyword ngxDirectiveThirdParty contained nchan_redis_publish_msgpacked_max_size syn keyword ngxDirectiveThirdParty contained nchan_redis_server +syn keyword ngxDirectiveThirdParty contained nchan_redis_ssl +syn keyword ngxDirectiveThirdParty contained nchan_redis_ssl_ciphers +syn keyword ngxDirectiveThirdParty contained nchan_redis_ssl_client_certificate +syn keyword ngxDirectiveThirdParty contained nchan_redis_ssl_client_certificate_key +syn keyword ngxDirectiveThirdParty contained nchan_redis_ssl_server_name +syn keyword ngxDirectiveThirdParty contained nchan_redis_ssl_trusted_certificate +syn keyword ngxDirectiveThirdParty contained nchan_redis_ssl_trusted_certificate_path +syn keyword ngxDirectiveThirdParty contained nchan_redis_ssl_verify_certificate syn keyword ngxDirectiveThirdParty contained nchan_redis_storage_mode syn keyword ngxDirectiveThirdParty contained nchan_redis_subscribe_weights +syn keyword ngxDirectiveThirdParty contained nchan_redis_tls +syn keyword ngxDirectiveThirdParty contained nchan_redis_tls_ciphers +syn keyword ngxDirectiveThirdParty contained nchan_redis_tls_client_certificate +syn keyword ngxDirectiveThirdParty contained nchan_redis_tls_server_name +syn keyword ngxDirectiveThirdParty contained nchan_redis_tls_trusted_certificate +syn keyword ngxDirectiveThirdParty contained nchan_redis_tls_trusted_certificate_path +syn keyword ngxDirectiveThirdParty contained nchan_redis_tls_verify_certificate syn keyword ngxDirectiveThirdParty contained nchan_redis_url +syn keyword ngxDirectiveThirdParty contained nchan_redis_username syn keyword ngxDirectiveThirdParty contained nchan_redis_wait_after_connecting syn keyword ngxDirectiveThirdParty contained nchan_shared_memory_size syn keyword ngxDirectiveThirdParty contained nchan_storage_engine @@ -1385,6 +1418,7 @@ syn keyword ngxDirectiveThirdParty contained lua_socket_send_lowat syn keyword ngxDirectiveThirdParty contained lua_socket_send_timeout syn keyword ngxDirectiveThirdParty contained lua_ssl_ciphers +syn keyword ngxDirectiveThirdParty contained lua_ssl_conf_command syn keyword ngxDirectiveThirdParty contained lua_ssl_crl syn keyword ngxDirectiveThirdParty contained lua_ssl_protocols syn keyword ngxDirectiveThirdParty contained lua_ssl_trusted_certificate @@ -1392,6 +1426,7 @@ syn keyword ngxDirectiveThirdParty contained lua_thread_cache_max_entries syn keyword ngxDirectiveThirdParty contained lua_transform_underscores_in_response_headers syn keyword ngxDirectiveThirdParty contained lua_use_default_type +syn keyword ngxDirectiveThirdParty contained lua_worker_thread_vm_pool_size syn keyword ngxDirectiveThirdParty contained rewrite_by_lua syn keyword ngxDirectiveThirdParty contained rewrite_by_lua_block syn keyword ngxDirectiveThirdParty contained rewrite_by_lua_file @@ -1401,6 +1436,8 @@ syn keyword ngxDirectiveThirdParty contained set_by_lua_file syn keyword ngxDirectiveThirdParty contained ssl_certificate_by_lua_block syn keyword ngxDirectiveThirdParty contained ssl_certificate_by_lua_file +syn keyword ngxDirectiveThirdParty contained ssl_client_hello_by_lua_block +syn keyword ngxDirectiveThirdParty contained ssl_client_hello_by_lua_file syn keyword ngxDirectiveThirdParty contained ssl_session_fetch_by_lua_block syn keyword ngxDirectiveThirdParty contained ssl_session_fetch_by_lua_file syn keyword ngxDirectiveThirdParty contained ssl_session_store_by_lua_block @@ -1719,15 +1756,18 @@ syn keyword ngxDirectiveThirdParty contained set_base32_padding syn keyword ngxDirectiveThirdParty contained set_decode_base32 syn keyword ngxDirectiveThirdParty contained set_decode_base64 +syn keyword ngxDirectiveThirdParty contained set_decode_base64url syn keyword ngxDirectiveThirdParty contained set_decode_hex syn keyword ngxDirectiveThirdParty contained set_encode_base32 syn keyword ngxDirectiveThirdParty contained set_encode_base64 +syn keyword ngxDirectiveThirdParty contained set_encode_base64url syn keyword ngxDirectiveThirdParty contained set_encode_hex syn keyword ngxDirectiveThirdParty contained set_escape_uri syn keyword ngxDirectiveThirdParty contained set_formatted_gmt_time syn keyword ngxDirectiveThirdParty contained set_formatted_local_time syn keyword ngxDirectiveThirdParty contained set_hashed_upstream syn keyword ngxDirectiveThirdParty contained set_hmac_sha1 +syn keyword ngxDirectiveThirdParty contained set_hmac_sha256 syn keyword ngxDirectiveThirdParty contained set_if_empty syn keyword ngxDirectiveThirdParty contained set_local_today syn keyword ngxDirectiveThirdParty contained set_misc_base32_padding @@ -1849,6 +1889,7 @@ syn keyword ngxDirectiveThirdParty contained vod_open_file_thread_pool syn keyword ngxDirectiveThirdParty contained vod_output_buffer_pool syn keyword ngxDirectiveThirdParty contained vod_parse_hdlr_name +syn keyword ngxDirectiveThirdParty contained vod_parse_udta_name syn keyword ngxDirectiveThirdParty contained vod_path_response_postfix syn keyword ngxDirectiveThirdParty contained vod_path_response_prefix syn keyword ngxDirectiveThirdParty contained vod_performance_counters @@ -2447,4 +2488,7 @@ hi def link ngxListenOptions Keyword hi def link ngxListenOptionsDeprecated Error +let &cpo = s:save_cpo +unlet s:save_cpo + let b:current_syntax = "nginx" diff -r 2febdacae5b4 -r 6cdd7d26260d vendor/vim-syntax/ruby.vim --- a/vendor/vim-syntax/ruby.vim Tue Apr 05 13:54:42 2022 +0900 +++ b/vendor/vim-syntax/ruby.vim Tue Apr 05 13:55:06 2022 +0900 @@ -3,7 +3,7 @@ " Maintainer: Doug Kearns " URL: https://github.com/vim-ruby/vim-ruby " Release Coordinator: Doug Kearns -" Last Change: 2021 Jun 06 +" Last Change: 2021 Nov 03 " ---------------------------------------------------------------------------- " " Previous Maintainer: Mirko Nasato @@ -66,7 +66,7 @@ com! -nargs=* SynFold call s:run_syntax_fold() " Not-Top Cluster {{{1 -syn cluster rubyNotTop contains=@rubyCommentNotTop,@rubyStringNotTop,@rubyRegexpSpecial,@rubyDeclaration,@rubyExceptionHandler,@rubyClassOperator,rubyConditional,rubyModuleName,rubyClassName,rubySymbolDelimiter,rubyParentheses,@Spell +syn cluster rubyNotTop contains=@rubyCommentNotTop,@rubyStringNotTop,@rubyRegexpSpecial,@rubyDeclaration,@rubyExceptionHandler,@rubyClassOperator,rubyConditional,rubyModuleName,rubyClassName,rubySymbolDelimiter,rubyDoubleQuoteSymbolDelimiter,rubySingleQuoteSymbolDelimiter,rubyParentheses,@Spell " Whitespace Errors {{{1 if exists("ruby_space_errors") @@ -364,6 +364,9 @@ SynFold 'class' syn region rubyClassBlock start="\" matchgroup=rubyClass skip="\" @@ -430,9 +433,10 @@ " Comments and Documentation {{{1 syn match rubySharpBang "\%^#!.*" display syn keyword rubyTodo FIXME NOTE TODO OPTIMIZE HACK REVIEW XXX todo contained -syn match rubyEncoding "[[:alnum:]-]\+" contained display +syn match rubyEncoding "[[:alnum:]-_]\+" contained display syn match rubyMagicComment "\c\%<3l#\s*\zs\%(coding\|encoding\):" contained nextgroup=rubyEncoding skipwhite syn match rubyMagicComment "\c\%<10l#\s*\zs\%(frozen_string_literal\|warn_indent\|warn_past_scope\):" contained nextgroup=rubyBoolean skipwhite +syn match rubyMagicComment "\c\%<10l#\s*\zs\%(shareable_constant_value\):" contained nextgroup=rubyEncoding skipwhite syn match rubyComment "#.*" contains=@rubyCommentSpecial,rubySpaceError,@Spell syn cluster rubyCommentSpecial contains=rubySharpBang,rubyTodo,rubyMagicComment @@ -465,6 +469,10 @@ syn match rubySymbol "\%(\w\|[^\x00-\x7F]\)\%(\w\|[^\x00-\x7F]\)*[?!]\=::\@!"he=e-1 contained containedin=rubyBlockParameterList,rubyCurlyBlock syn match rubySymbol "[]})\"':]\@1