diff options
Diffstat (limited to 'vim/after/ftplugin/html')
-rw-r--r-- | vim/after/ftplugin/html/lint.vim | 84 | ||||
-rw-r--r-- | vim/after/ftplugin/html/tidy.vim | 68 | ||||
-rw-r--r-- | vim/after/ftplugin/html/url_link.vim | 91 |
3 files changed, 127 insertions, 116 deletions
diff --git a/vim/after/ftplugin/html/lint.vim b/vim/after/ftplugin/html/lint.vim index b24b18c9..a3776d60 100644 --- a/vim/after/ftplugin/html/lint.vim +++ b/vim/after/ftplugin/html/lint.vim @@ -1,55 +1,55 @@ -" Only do this when not done yet for this buffer -" Also do nothing if 'compatible' enabled, or if the current filetype is -" actually markdown -if exists('b:did_ftplugin_html_lint') || &compatible +" html/lint.vim: Use tidy(1) to lint HTML documents for errors + +" Don't load if running compatible or too old +if &compatible || v:version < 700 finish endif -if &filetype ==# 'markdown' + +" Don't load if already loaded +if exists('b:did_ftplugin_html_lint') finish endif -let b:did_ftplugin_html_lint = 1 -" Initialise undo variable if not already done -if exists('b:undo_ftplugin') - let b:undo_ftplugin = b:undo_ftplugin - \ . '|unlet b:did_ftplugin_html_lint' +" Don't load if the primary filetype isn't HTML +if &filetype !=# 'html' + finish endif +" Flag as loaded +let b:did_ftplugin_html_lint = 1 +let b:undo_ftplugin = b:undo_ftplugin + \ . '|unlet b:did_ftplugin_html_lint' + " Build function for linter -if !exists('*s:HtmlLint') - function s:HtmlLint() - let l:save_makeprg = &l:makeprg - let l:save_errorformat = &l:errorformat - unlet! g:current_compiler - compiler tidy - make! - let &l:makeprg = l:save_makeprg - let &l:errorformat = l:save_errorformat - cwindow - endfunction +function! s:HtmlLint() + if exists('b:current_compiler') + let l:save_compiler = b:current_compiler + endif + compiler tidy + lmake! + lwindow + if exists('l:save_compiler') + execute 'compiler ' . l:save_compiler + endif +endfunction + +" Stop here if the user doesn't want ftplugin mappings +if exists('g:no_plugin_maps') || exists('g:no_html_maps') + finish endif -" Set up a mapping for the linter, if we're allowed -if !exists('g:no_plugin_maps') && !exists('g:no_html_maps') +" Define a mapping target +nnoremap <buffer> <silent> <unique> + \ <Plug>HtmlLint + \ :<C-U>call <SID>HtmlLint()<CR> +let b:undo_ftplugin = b:undo_ftplugin + \ . '|nunmap <buffer> <Plug>HtmlLint' - " Define a mapping target - nnoremap <buffer> <silent> <unique> +" If there isn't a key mapping already, use a default one +if !hasmapto('<Plug>HtmlLint') + nmap <buffer> <unique> + \ <LocalLeader>l \ <Plug>HtmlLint - \ :<C-U>call <SID>HtmlLint()<CR> - if exists('b:undo_ftplugin') - let b:undo_ftplugin = b:undo_ftplugin - \ . '|nunmap <buffer> <Plug>HtmlLint' - endif - - " If there isn't a key mapping already, use a default one - if !hasmapto('<Plug>HtmlLint') - nmap <buffer> <unique> - \ <LocalLeader>l - \ <Plug>HtmlLint - if exists('b:undo_ftplugin') - let b:undo_ftplugin = b:undo_ftplugin - \ . '|nunmap <buffer> <LocalLeader>l' - endif - endif - + let b:undo_ftplugin = b:undo_ftplugin + \ . '|nunmap <buffer> <LocalLeader>l' endif diff --git a/vim/after/ftplugin/html/tidy.vim b/vim/after/ftplugin/html/tidy.vim index 6e612feb..5a8ded7e 100644 --- a/vim/after/ftplugin/html/tidy.vim +++ b/vim/after/ftplugin/html/tidy.vim @@ -1,39 +1,49 @@ -" Only do this when not done yet for this buffer -" Also do nothing if 'compatible' enabled, or if the current filetype is -" actually markdown -if exists('b:did_ftplugin_html_tidy') || &compatible +" html/tidy.vim: Use tidy(1) to filter HTML documents + +" Don't load if running compatible or too old +if &compatible || v:version < 700 + finish +endif + +" Don't load if already loaded +if exists('b:did_ftplugin_html_tidy') finish endif -if &filetype ==# 'markdown' + +" Don't load if the primary filetype isn't HTML +if &filetype !=# 'html' finish endif + +" Flag as loaded let b:did_ftplugin_html_tidy = 1 -if exists('b:undo_ftplugin') - let b:undo_ftplugin = b:undo_ftplugin - \ . '|unlet b:did_ftplugin_html_tidy' +let b:undo_ftplugin = b:undo_ftplugin + \ . '|unlet b:did_ftplugin_html_tidy' + +" Plugin function +function s:HtmlTidy() + let l:view = winsaveview() + %!tidy -quiet + call winrestview(l:view) +endfunction + +" Stop here if the user doesn't want ftplugin mappings +if exists('g:no_plugin_maps') || exists('g:no_html_maps') + finish endif -" Set up a mapping for the tidier, if we're allowed -if !exists('g:no_plugin_maps') && !exists('g:no_html_maps') +" Define a mapping target +nnoremap <buffer> <silent> <unique> + \ <Plug>HtmlTidy + \ :<C-U>call <SID>HtmlTidy()<CR> +let b:undo_ftplugin = b:undo_ftplugin + \ . '|nunmap <buffer> <Plug>HtmlTidy' - " Define a mapping target - nnoremap <buffer> <silent> <unique> +" If there isn't a key mapping already, use a default one +if !hasmapto('<Plug>HtmlTidy') + nmap <buffer> <unique> + \ <LocalLeader>t \ <Plug>HtmlTidy - \ :<C-U>%!tidy -quiet<CR> - if exists('b:undo_ftplugin') - let b:undo_ftplugin = b:undo_ftplugin - \ . '|nunmap <buffer> <Plug>HtmlTidy' - endif - - " If there isn't a key mapping already, use a default one - if !hasmapto('<Plug>HtmlTidy') - nmap <buffer> <unique> - \ <LocalLeader>t - \ <Plug>HtmlTidy - if exists('b:undo_ftplugin') - let b:undo_ftplugin = b:undo_ftplugin - \ . '|nunmap <buffer> <LocalLeader>t' - endif - endif - + let b:undo_ftplugin = b:undo_ftplugin + \ . '|nunmap <buffer> <LocalLeader>t' endif diff --git a/vim/after/ftplugin/html/url_link.vim b/vim/after/ftplugin/html/url_link.vim index 2e600b5e..1cf57a7b 100644 --- a/vim/after/ftplugin/html/url_link.vim +++ b/vim/after/ftplugin/html/url_link.vim @@ -1,57 +1,58 @@ -" Only do this when not done yet for this buffer -" Also do nothing if 'compatible' enabled, or if the current filetype is -" actually markdown -if exists('b:did_ftplugin_html_url_link') || &compatible +" html/url_link.vim: Make a URL into a link + +" Don't load if running compatible or too old +if &compatible || v:version < 700 finish endif -if &filetype ==# 'markdown' + +" Don't load if already loaded +if exists('b:did_ftplugin_html_url_link') finish endif -let b:did_ftplugin_html_url_link = 1 -if exists('b:undo_ftplugin') - let b:undo_ftplugin = b:undo_ftplugin - \ . '|unlet b:did_ftplugin_html_url_link' + +" Don't load if the primary filetype isn't HTML +if &filetype !=# 'html' + finish endif +" Flag as loaded +let b:did_ftplugin_html_url_link = 1 +let b:undo_ftplugin = b:undo_ftplugin + \ . '|unlet b:did_ftplugin_html_url_link' + " Make a bare URL into a link to itself -if !exists('*s:HtmlUrlLink') - function! s:HtmlUrlLink() - - " Yank this whole whitespace-separated word - normal! yiW - " Open a link tag - normal! i<a href=""> - " Paste the URL into the quotes - normal! hP - " Move to the end of the link text URL - normal! E - " Close the link tag - normal! a</a> - - endfunction +function! s:HtmlUrlLink() + + " Yank this whole whitespace-separated word + normal! yiW + " Open a link tag + normal! i<a href=""> + " Paste the URL into the quotes + normal! hP + " Move to the end of the link text URL + normal! E + " Close the link tag + normal! a</a> + +endfunction + +" Stop here if the user doesn't want ftplugin mappings +if exists('g:no_plugin_maps') || exists('g:no_html_maps') + finish endif -" Set up a mapping for the function, if we're allowed -if !exists('g:no_plugin_maps') && !exists('g:no_html_maps') +" Define a mapping target +nnoremap <buffer> <silent> <unique> + \ <Plug>HtmlUrlLink + \ :<C-U>call <SID>HtmlUrlLink()<CR> +let b:undo_ftplugin = b:undo_ftplugin + \ . '|nunmap <buffer> <Plug>HtmlUrlLink' - " Define a mapping target - nnoremap <buffer> <silent> <unique> +" If there isn't a key mapping already, use a default one +if !hasmapto('<Plug>HtmlUrlLink') + nmap <buffer> <unique> + \ <LocalLeader>r \ <Plug>HtmlUrlLink - \ :<C-U>call <SID>HtmlUrlLink()<CR> - if exists('b:undo_ftplugin') - let b:undo_ftplugin = b:undo_ftplugin - \ . '|nunmap <buffer> <Plug>HtmlUrlLink' - endif - - " If there isn't a key mapping already, use a default one - if !hasmapto('<Plug>HtmlUrlLink') - nmap <buffer> <unique> - \ <LocalLeader>r - \ <Plug>HtmlUrlLink - if exists('b:undo_ftplugin') - let b:undo_ftplugin = b:undo_ftplugin - \ . '|nunmap <buffer> <LocalLeader>r' - endif - endif - + let b:undo_ftplugin = b:undo_ftplugin + \ . '|nunmap <buffer> <LocalLeader>r' endif |