diff options
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | autoload/polyglot/sleuth.vim | 1 | ||||
| -rw-r--r-- | ftdetect/polyglot.vim | 4 | ||||
| -rw-r--r-- | ftplugin/man.vim | 254 | ||||
| -rw-r--r-- | ftplugin/purescript.vim | 1 | ||||
| -rw-r--r-- | ftplugin/yaml.vim | 29 | ||||
| -rw-r--r-- | indent/yaml.vim | 159 | ||||
| -rw-r--r-- | packages.yaml | 9 | ||||
| -rw-r--r-- | syntax/man.vim | 60 | ||||
| -rw-r--r-- | syntax/svelte.vim | 3 | ||||
| -rw-r--r-- | syntax/zig.vim | 2 | ||||
| -rw-r--r-- | tests/filetypes.vim | 1 |
12 files changed, 191 insertions, 334 deletions
@@ -7,7 +7,7 @@ A collection of language packs for Vim. > One to rule them all, one to find them, one to bring them all and in the darkness bind them. - It **won't affect your startup time**, as scripts are loaded only on demand\*. -- It **installs and updates 120+ times faster** than the <!--Package Count-->591<!--/Package Count--> packages it consists of. +- It **installs and updates 120+ times faster** than the <!--Package Count-->590<!--/Package Count--> packages it consists of. - It is more secure because scripts loaded for all extensions are generated by vim-polyglot (ftdetect). - Solid syntax and indentation support (other features skipped). Only the best language packs. - All unnecessary files are ignored (like enormous documentation from php support). diff --git a/autoload/polyglot/sleuth.vim b/autoload/polyglot/sleuth.vim index db1c70d1..bc7822de 100644 --- a/autoload/polyglot/sleuth.vim +++ b/autoload/polyglot/sleuth.vim @@ -308,7 +308,6 @@ let s:globs = { \ 'mailcap': '.mailcap,mailcap', \ 'mako': '*.mako,*.mao', \ 'mallard': '*.page', - \ 'man': '*.man', \ 'manconf': 'man.config', \ 'map': '*.map', \ 'maple': '*.mv,*.mpl,*.mws', diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim index 4e1988b4..0dae0bd4 100644 --- a/ftdetect/polyglot.vim +++ b/ftdetect/polyglot.vim @@ -970,10 +970,6 @@ if !has_key(s:disabled_packages, 'manconf') au BufNewFile,BufRead */etc/man.conf,man.config setf manconf endif -if !has_key(s:disabled_packages, 'man') - au BufNewFile,BufRead *.man setf man -endif - if !has_key(s:disabled_packages, 'mallard') au BufNewFile,BufRead *.page setf mallard endif diff --git a/ftplugin/man.vim b/ftplugin/man.vim deleted file mode 100644 index 300129c2..00000000 --- a/ftplugin/man.vim +++ /dev/null @@ -1,254 +0,0 @@ -if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'man') == -1 - -" Vim filetype plugin file -" Language: man -" Maintainer: Jason Franklin <vim@justemail.net> -" Maintainer: SungHyun Nam <goweol@gmail.com> -" Last Change: 2020 Jun 01 - -" To make the ":Man" command available before editing a manual page, source -" this script from your startup vimrc file. - -" If 'filetype' isn't "man", we must have been called to only define ":Man". -if &filetype == "man" - - " Only do this when not done yet for this buffer - if exists("b:did_ftplugin") - finish - endif - let b:did_ftplugin = 1 -endif - -let s:cpo_save = &cpo -set cpo-=C - -if &filetype == "man" - " allow dot and dash in manual page name. - setlocal iskeyword+=\.,- - let b:undo_ftplugin = "setlocal iskeyword<" - - " Add mappings, unless the user didn't want this. - if !exists("no_plugin_maps") && !exists("no_man_maps") - if !hasmapto('<Plug>ManBS') - nmap <buffer> <LocalLeader>h <Plug>ManBS - let b:undo_ftplugin = b:undo_ftplugin - \ . '|silent! nunmap <buffer> <LocalLeader>h' - endif - nnoremap <buffer> <Plug>ManBS :%s/.\b//g<CR>:setl nomod<CR>'' - - nnoremap <buffer> <silent> <c-]> :call <SID>PreGetPage(v:count)<CR> - nnoremap <buffer> <silent> <c-t> :call <SID>PopPage()<CR> - nnoremap <buffer> <silent> q :q<CR> - - " Add undo commands for the maps - let b:undo_ftplugin = b:undo_ftplugin - \ . '|silent! nunmap <buffer> <Plug>ManBS' - \ . '|silent! nunmap <buffer> <c-]>' - \ . '|silent! nunmap <buffer> <c-t>' - \ . '|silent! nunmap <buffer> q' - endif - - if exists('g:ft_man_folding_enable') && (g:ft_man_folding_enable == 1) - setlocal foldmethod=indent foldnestmax=1 foldenable - let b:undo_ftplugin = b:undo_ftplugin - \ . '|silent! setl fdm< fdn< fen<' - endif - -endif - -if exists(":Man") != 2 - com -nargs=+ -complete=shellcmd Man call s:GetPage(<q-mods>, <f-args>) - nmap <Leader>K :call <SID>PreGetPage(0)<CR> - nmap <Plug>ManPreGetPage :call <SID>PreGetPage(0)<CR> -endif - -" Define functions only once. -if !exists("s:man_tag_depth") - -let s:man_tag_depth = 0 - -let s:man_sect_arg = "" -let s:man_find_arg = "-w" -try - if !has("win32") && $OSTYPE !~ 'cygwin\|linux' && system('uname -s') =~ "SunOS" && system('uname -r') =~ "^5" - let s:man_sect_arg = "-s" - let s:man_find_arg = "-l" - endif -catch /E145:/ - " Ignore the error in restricted mode -endtry - -func <SID>PreGetPage(cnt) - if a:cnt == 0 - let old_isk = &iskeyword - if &ft == 'man' - setl iskeyword+=(,) - endif - let str = expand("<cword>") - let &l:iskeyword = old_isk - let page = substitute(str, '(*\(\k\+\).*', '\1', '') - let sect = substitute(str, '\(\k\+\)(\([^()]*\)).*', '\2', '') - if match(sect, '^[0-9 ]\+$') == -1 - let sect = "" - endif - if sect == page - let sect = "" - endif - else - let sect = a:cnt - let page = expand("<cword>") - endif - call s:GetPage('', sect, page) -endfunc - -func <SID>GetCmdArg(sect, page) - if a:sect == '' - return a:page - endif - return s:man_sect_arg.' '.a:sect.' '.a:page -endfunc - -func <SID>FindPage(sect, page) - let where = system("man ".s:man_find_arg.' '.s:GetCmdArg(a:sect, a:page)) - if where !~ "^/" - if matchstr(where, " [^ ]*$") !~ "^ /" - return 0 - endif - endif - return 1 -endfunc - -func <SID>GetPage(cmdmods, ...) - if a:0 >= 2 - let sect = a:1 - let page = a:2 - elseif a:0 >= 1 - let sect = "" - let page = a:1 - else - return - endif - - " To support: nmap K :Man <cword> - if page == '<cword>' - let page = expand('<cword>') - endif - - if !exists('g:ft_man_no_sect_fallback') || (g:ft_man_no_sect_fallback == 0) - if sect != "" && s:FindPage(sect, page) == 0 - let sect = "" - endif - endif - if s:FindPage(sect, page) == 0 - let msg = 'man.vim: no manual entry for "' . page . '"' - if !empty(sect) - let msg .= ' in section ' . sect - endif - echomsg msg - return - endif - exec "let s:man_tag_buf_".s:man_tag_depth." = ".bufnr("%") - exec "let s:man_tag_lin_".s:man_tag_depth." = ".line(".") - exec "let s:man_tag_col_".s:man_tag_depth." = ".col(".") - let s:man_tag_depth = s:man_tag_depth + 1 - - let open_cmd = 'edit' - - " Use an existing "man" window if it exists, otherwise open a new one. - if &filetype != "man" - let thiswin = winnr() - exe "norm! \<C-W>b" - if winnr() > 1 - exe "norm! " . thiswin . "\<C-W>w" - while 1 - if &filetype == "man" - break - endif - exe "norm! \<C-W>w" - if thiswin == winnr() - break - endif - endwhile - endif - if &filetype != "man" - if exists("g:ft_man_open_mode") - if g:ft_man_open_mode == 'vert' - let open_cmd = 'vsplit' - elseif g:ft_man_open_mode == 'tab' - let open_cmd = 'tabedit' - else - let open_cmd = 'split' - endif - else - let open_cmd = a:cmdmods . ' split' - endif - endif - endif - - silent execute open_cmd . " $HOME/" . page . '.' . sect . '~' - - " Avoid warning for editing the dummy file twice - setl buftype=nofile noswapfile - - setl fdc=0 ma nofen nonu nornu - %delete _ - let unsetwidth = 0 - if empty($MANWIDTH) - let $MANWIDTH = winwidth(0) - let unsetwidth = 1 - endif - - " Ensure Vim is not recursively invoked (man-db does this) when doing ctrl-[ - " on a man page reference by unsetting MANPAGER. - " Some versions of env(1) do not support the '-u' option, and in such case - " we set MANPAGER=cat. - if !exists('s:env_has_u') - call system('env -u x true') - let s:env_has_u = (v:shell_error == 0) - endif - let env_cmd = s:env_has_u ? 'env -u MANPAGER' : 'env MANPAGER=cat' - let env_cmd .= ' GROFF_NO_SGR=1' - let man_cmd = env_cmd . ' man ' . s:GetCmdArg(sect, page) . ' | col -b' - silent exec "r !" . man_cmd - - if unsetwidth - let $MANWIDTH = '' - endif - " Remove blank lines from top and bottom. - while line('$') > 1 && getline(1) =~ '^\s*$' - 1delete _ - endwhile - while line('$') > 1 && getline('$') =~ '^\s*$' - $delete _ - endwhile - 1 - setl ft=man nomod - setl bufhidden=hide - setl nobuflisted - setl noma -endfunc - -func <SID>PopPage() - if s:man_tag_depth > 0 - let s:man_tag_depth = s:man_tag_depth - 1 - exec "let s:man_tag_buf=s:man_tag_buf_".s:man_tag_depth - exec "let s:man_tag_lin=s:man_tag_lin_".s:man_tag_depth - exec "let s:man_tag_col=s:man_tag_col_".s:man_tag_depth - exec s:man_tag_buf."b" - exec s:man_tag_lin - exec "norm! ".s:man_tag_col."|" - exec "unlet s:man_tag_buf_".s:man_tag_depth - exec "unlet s:man_tag_lin_".s:man_tag_depth - exec "unlet s:man_tag_col_".s:man_tag_depth - unlet s:man_tag_buf s:man_tag_lin s:man_tag_col - endif -endfunc - -endif - -let &cpo = s:cpo_save -unlet s:cpo_save - -" vim: set sw=2 ts=8 noet: - -endif diff --git a/ftplugin/purescript.vim b/ftplugin/purescript.vim index c2c85535..dba11b3b 100644 --- a/ftplugin/purescript.vim +++ b/ftplugin/purescript.vim @@ -1,6 +1,7 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'purescript') == -1 setlocal comments=s1fl:{-,mb:\ \ ,ex:-},:--\ \|,:-- +setlocal commentstring=--\ %s setlocal include=^import setlocal includeexpr=printf('%s.purs',substitute(v:fname,'\\.','/','g')) diff --git a/ftplugin/yaml.vim b/ftplugin/yaml.vim new file mode 100644 index 00000000..261d71ca --- /dev/null +++ b/ftplugin/yaml.vim @@ -0,0 +1,29 @@ +if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'yaml') == -1 + +" Vim filetype plugin file +" Language: YAML (YAML Ain't Markup Language) +" Previous Maintainer: Nikolai Weibull <now@bitwi.se> (inactive) +" Last Change: 2020 Mar 02 + +if exists("b:did_ftplugin") + finish +endif +let b:did_ftplugin = 1 + +let s:cpo_save = &cpo +set cpo&vim + +let b:undo_ftplugin = "setl com< cms< et< fo<" + +setlocal comments=:# commentstring=#\ %s expandtab +setlocal formatoptions-=t formatoptions+=croql + +if !exists("g:yaml_recommended_style") || g:yaml_recommended_style != 0 + let b:undo_ftplugin .= " sw< sts<" + setlocal shiftwidth=2 softtabstop=2 +endif + +let &cpo = s:cpo_save +unlet s:cpo_save + +endif diff --git a/indent/yaml.vim b/indent/yaml.vim new file mode 100644 index 00000000..c7fdebcf --- /dev/null +++ b/indent/yaml.vim @@ -0,0 +1,159 @@ +if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'yaml') == -1 + +" Vim indent file +" Language: YAML +" Maintainer: Nikolai Pavlov <zyx.vim@gmail.com> +" Last Change: 2019 Sep 28 + +" Only load this indent file when no other was loaded. +if exists('b:did_indent') + finish +endif + +let s:save_cpo = &cpo +set cpo&vim + +let b:did_indent = 1 + +setlocal indentexpr=GetYAMLIndent(v:lnum) +setlocal indentkeys=!^F,o,O,0#,0},0],<:>,0- +setlocal nosmartindent + +let b:undo_indent = 'setlocal indentexpr< indentkeys< smartindent<' + +" Only define the function once. +if exists('*GetYAMLIndent') + finish +endif + +function s:FindPrevLessIndentedLine(lnum, ...) + let prevlnum = prevnonblank(a:lnum-1) + let curindent = a:0 ? a:1 : indent(a:lnum) + while prevlnum + \&& indent(prevlnum) >= curindent + \&& getline(prevlnum) !~# '^\s*#' + let prevlnum = prevnonblank(prevlnum-1) + endwhile + return prevlnum +endfunction + +function s:FindPrevLEIndentedLineMatchingRegex(lnum, regex) + let plilnum = s:FindPrevLessIndentedLine(a:lnum, indent(a:lnum)+1) + while plilnum && getline(plilnum) !~# a:regex + let plilnum = s:FindPrevLessIndentedLine(plilnum) + endwhile + return plilnum +endfunction + +let s:mapkeyregex='\v^\s*\#@!\S@=%(\''%([^'']|\''\'')*\'''. + \ '|\"%([^"\\]|\\.)*\"'. + \ '|%(%(\:\ )@!.)*)\:%(\ |$)' +let s:liststartregex='\v^\s*%(\-%(\ |$))' + +let s:c_ns_anchor_char = '\v%([\n\r\uFEFF \t,[\]{}]@!\p)' +let s:c_ns_anchor_name = s:c_ns_anchor_char.'+' +let s:c_ns_anchor_property = '\v\&'.s:c_ns_anchor_name + +let s:ns_word_char = '\v[[:alnum:]_\-]' +let s:ns_tag_char = '\v%(%\x\x|'.s:ns_word_char.'|[#/;?:@&=+$.~*''()])' +let s:c_named_tag_handle = '\v\!'.s:ns_word_char.'+\!' +let s:c_secondary_tag_handle = '\v\!\!' +let s:c_primary_tag_handle = '\v\!' +let s:c_tag_handle = '\v%('.s:c_named_tag_handle. + \ '|'.s:c_secondary_tag_handle. + \ '|'.s:c_primary_tag_handle.')' +let s:c_ns_shorthand_tag = '\v'.s:c_tag_handle . s:ns_tag_char.'+' +let s:c_non_specific_tag = '\v\!' +let s:ns_uri_char = '\v%(%\x\x|'.s:ns_word_char.'\v|[#/;?:@&=+$,.!~*''()[\]])' +let s:c_verbatim_tag = '\v\!\<'.s:ns_uri_char.'+\>' +let s:c_ns_tag_property = '\v'.s:c_verbatim_tag. + \ '\v|'.s:c_ns_shorthand_tag. + \ '\v|'.s:c_non_specific_tag + +let s:block_scalar_header = '\v[|>]%([+-]?[1-9]|[1-9]?[+-])?' + +function GetYAMLIndent(lnum) + if a:lnum == 1 || !prevnonblank(a:lnum-1) + return 0 + endif + + let prevlnum = prevnonblank(a:lnum-1) + let previndent = indent(prevlnum) + + let line = getline(a:lnum) + if line =~# '^\s*#' && getline(a:lnum-1) =~# '^\s*#' + " Comment blocks should have identical indent + return previndent + elseif line =~# '^\s*[\]}]' + " Lines containing only closing braces should have previous indent + return indent(s:FindPrevLessIndentedLine(a:lnum)) + endif + + " Ignore comment lines when calculating indent + while getline(prevlnum) =~# '^\s*#' + let prevlnum = prevnonblank(prevlnum-1) + if !prevlnum + return previndent + endif + endwhile + + let prevline = getline(prevlnum) + let previndent = indent(prevlnum) + + " Any examples below assume that shiftwidth=2 + if prevline =~# '\v[{[:]$|[:-]\ [|>][+\-]?%(\s+\#.*|\s*)$' + " Mapping key: + " nested mapping: ... + " + " - { + " key: [ + " list value + " ] + " } + " + " - |- + " Block scalar without indentation indicator + return previndent+shiftwidth() + elseif prevline =~# '\v[:-]\ [|>]%(\d+[+\-]?|[+\-]?\d+)%(\#.*|\s*)$' + " - |+2 + " block scalar with indentation indicator + "#^^ indent+2, not indent+shiftwidth + return previndent + str2nr(matchstr(prevline, + \'\v([:-]\ [|>])@<=[+\-]?\d+%([+\-]?%(\s+\#.*|\s*)$)@=')) + elseif prevline =~# '\v\"%([^"\\]|\\.)*\\$' + " "Multiline string \ + " with escaped end" + let qidx = match(prevline, '\v\"%([^"\\]|\\.)*\\') + return virtcol([prevlnum, qidx+1]) + elseif line =~# s:liststartregex + " List line should have indent equal to previous list line unless it was + " caught by one of the previous rules + return indent(s:FindPrevLEIndentedLineMatchingRegex(a:lnum, + \ s:liststartregex)) + elseif line =~# s:mapkeyregex + " Same for line containing mapping key + let prevmapline = s:FindPrevLEIndentedLineMatchingRegex(a:lnum, + \ s:mapkeyregex) + if getline(prevmapline) =~# '^\s*- ' + return indent(prevmapline) + 2 + else + return indent(prevmapline) + endif + elseif prevline =~# '^\s*- ' + " - List with + " multiline scalar + return previndent+2 + elseif prevline =~# s:mapkeyregex . '\v\s*%(%('.s:c_ns_tag_property. + \ '\v|'.s:c_ns_anchor_property. + \ '\v|'.s:block_scalar_header. + \ '\v)%(\s+|\s*%(\#.*)?$))*' + " Mapping with: value + " that is multiline scalar + return previndent+shiftwidth() + endif + return previndent +endfunction + +let &cpo = s:save_cpo + +endif diff --git a/packages.yaml b/packages.yaml index ade2bd83..83121e15 100644 --- a/packages.yaml +++ b/packages.yaml @@ -3560,15 +3560,6 @@ filetypes: - pattern: "*.page" description: Mallard --- -name: man -remote: vim/vim:runtime -glob: "**/man.vim" -filetypes: -- name: man - patterns: - - pattern: "*.man" - description: Manpage ---- name: manconf remote: vim/vim:runtime glob: "**/manconf.vim" diff --git a/syntax/man.vim b/syntax/man.vim deleted file mode 100644 index c607f0e4..00000000 --- a/syntax/man.vim +++ /dev/null @@ -1,60 +0,0 @@ -if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'man') == -1 - -" Vim syntax file -" Language: Man page -" Maintainer: Jason Franklin <vim@justemail.net> -" Previous Maintainer: SungHyun Nam <goweol@gmail.com> -" Previous Maintainer: Gautam H. Mudunuri <gmudunur@informatica.com> -" Version Info: -" Last Change: 2020 Sep 19 - -" Additional highlighting by Johannes Tanzler <johannes.tanzler@aon.at>: -" * manSubHeading -" * manSynopsis (only for sections 2 and 3) - -" quit when a syntax file was already loaded -if exists("b:current_syntax") - finish -endif - -" Get the CTRL-H syntax to handle backspaced text -runtime! syntax/ctrlh.vim - -syn case ignore - -syn match manReference "\f\+([1-9][a-z]\=)" -syn match manSectionHeading "^\a.*$" -syn match manSubHeading "^\s\{3\}\a.*$" -syn match manOptionDesc "^\s*[+-][a-z0-9]\S*" -syn match manLongOptionDesc "^\s*--[a-z0-9-]\S*" -" syn match manHistory "^[a-z].*last change.*$" - -syn match manHeader '\%1l.*' -exe 'syn match manFooter ''\%' . line('$') . 'l.*''' - -if getline(1) =~ '^[a-zA-Z_]\+([23])' - syntax include @cCode <sfile>:p:h/c.vim - syn match manCFuncDefinition display "\<\h\w*\>\s*("me=e-1 contained - syn region manSynopsis start="^SYNOPSIS"hs=s+8 end="^\u\+\s*$"me=e-12 keepend contains=manSectionHeading,@cCode,manCFuncDefinition -endif - - -" Define the default highlighting. -" Only when an item doesn't have highlighting yet - -hi def link manHeader Title -hi def link manFooter PreProc - -hi def link manSectionHeading Statement -hi def link manOptionDesc Constant -hi def link manLongOptionDesc Constant -hi def link manReference PreProc -hi def link manSubHeading Function -hi def link manCFuncDefinition Function - - -let b:current_syntax = "man" - -" vim:ts=8 sts=2 sw=2: - -endif diff --git a/syntax/svelte.vim b/syntax/svelte.vim index 4a510beb..0654b203 100644 --- a/syntax/svelte.vim +++ b/syntax/svelte.vim @@ -26,9 +26,6 @@ syntax match htmlTagName contained "\<[a-zA-Z:\.]*\>" " "bind:something", etc. syntax match svelteKeyword "\<[a-z]\+:[a-zA-Z|]\+=" contained containedin=htmlTag -" Mixed-case attributes are likely props. -syntax match svelteKeyword "\<[a-z]\+:[a-zA-Z|]\+=" contained containedin=htmlTag - " The "slot" attribute has special meaning. syntax keyword svelteKeyword slot contained containedin=htmlTag diff --git a/syntax/zig.vim b/syntax/zig.vim index f9f889c5..f6819ef5 100644 --- a/syntax/zig.vim +++ b/syntax/zig.vim @@ -38,7 +38,7 @@ syn match zigBuiltinFn "\v\@(errorReturnTrace|fence|fieldParentPtr|field|unionIn syn match zigBuiltinFn "\v\@(frameAddress|import|newStackCall|asyncCall|intToPtr)>" syn match zigBuiltinFn "\v\@(memcpy|memset|mod|mulWithOverflow|splat|src)>" syn match zigBuiltinFn "\v\@(bitOffsetOf|byteOffsetOf|OpaqueType|panic|ptrCast)>" -syn match zigBuiltinFn "\v\@(ptrToInt|rem|returnAddress|setCold|Type|shuffle)>" +syn match zigBuiltinFn "\v\@(ptrToInt|rem|returnAddress|setCold|Type|shuffle|reduce)>" syn match zigBuiltinFn "\v\@(setRuntimeSafety|setEvalBranchQuota|setFloatMode)>" syn match zigBuiltinFn "\v\@(setGlobalLinkage|setGlobalSection|shlExact|This|hasDecl|hasField)>" syn match zigBuiltinFn "\v\@(shlWithOverflow|shrExact|sizeOf|bitSizeOf|sqrt|byteSwap|subWithOverflow|intCast|floatCast|intToFloat|floatToInt|boolToInt|errSetCast)>" diff --git a/tests/filetypes.vim b/tests/filetypes.vim index 00d19b7e..a5f556d7 100644 --- a/tests/filetypes.vim +++ b/tests/filetypes.vim @@ -419,7 +419,6 @@ call TestFiletype('mailaliases') call TestFiletype('mailcap') call TestFiletype('ist') call TestFiletype('mallard') -call TestFiletype('man') call TestFiletype('manconf') call TestFiletype('maple') call TestFiletype('map') |