From 2bcce63572e062f34527fbe42bb0f5756a08d8b8 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Sat, 30 Jun 2018 00:36:55 +1200 Subject: Refactor ftplugins into single files Each thereby effectively becomes its own .vimrc for that type. --- vim/after/ftplugin/sh/check.vim | 37 ------------------------------------- vim/after/ftplugin/sh/comments.vim | 22 ---------------------- vim/after/ftplugin/sh/han.vim | 26 -------------------------- vim/after/ftplugin/sh/lint.vim | 28 ---------------------------- vim/after/ftplugin/sh/maps.vim | 28 ---------------------------- 5 files changed, 141 deletions(-) delete mode 100644 vim/after/ftplugin/sh/check.vim delete mode 100644 vim/after/ftplugin/sh/comments.vim delete mode 100644 vim/after/ftplugin/sh/han.vim delete mode 100644 vim/after/ftplugin/sh/lint.vim delete mode 100644 vim/after/ftplugin/sh/maps.vim (limited to 'vim/after/ftplugin/sh') diff --git a/vim/after/ftplugin/sh/check.vim b/vim/after/ftplugin/sh/check.vim deleted file mode 100644 index 48bb72d0..00000000 --- a/vim/after/ftplugin/sh/check.vim +++ /dev/null @@ -1,37 +0,0 @@ -" sh/check.vim: Use appropriate shell binary to check scripts for errors - -" 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_sh_check') - finish -endif - -" Stop here if the user doesn't want ftplugin mappings -if exists('g:no_plugin_maps') || exists('g:no_sh_maps') - finish -endif - -" Flag as loaded -let b:did_ftplugin_sh_check = 1 -let b:undo_ftplugin = b:undo_ftplugin - \ . '|unlet b:did_ftplugin_sh_check' - -" Choose compiler based on file subtype -if exists('b:is_bash') - let b:sh_check_compiler = 'bash' -elseif exists('b:is_kornshell') - let b:sh_check_compiler = 'ksh' -else - let b:sh_check_compiler = 'sh' -endif - -" Define a mapping target -nnoremap - \ ShCheck - \ :call compiler#Make(b:sh_check_compiler) -let b:undo_ftplugin = b:undo_ftplugin - \ . '|nunmap ShCheck' diff --git a/vim/after/ftplugin/sh/comments.vim b/vim/after/ftplugin/sh/comments.vim deleted file mode 100644 index 97e8adc9..00000000 --- a/vim/after/ftplugin/sh/comments.vim +++ /dev/null @@ -1,22 +0,0 @@ -" sh/comments.vim: Set 'comments' and supporting 'formatoptions' for shell script - -" 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_sh_comments') - finish -endif - -" Flag as loaded -let b:did_ftplugin_sh_comments = 1 -let b:undo_ftplugin = b:undo_ftplugin - \ . '|unlet b:did_ftplugin_sh_comments' - -" Set comment formats -setlocal comments=:# -setlocal formatoptions+=or -let b:undo_ftplugin = b:undo_ftplugin - \ . '|setlocal comments< formatoptions<' diff --git a/vim/after/ftplugin/sh/han.vim b/vim/after/ftplugin/sh/han.vim deleted file mode 100644 index 3aacdb7e..00000000 --- a/vim/after/ftplugin/sh/han.vim +++ /dev/null @@ -1,26 +0,0 @@ -" sh/han.vim: Use han(1df) as 'keywordprg' for Bash scripts - -" 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_sh_han') - finish -endif - -" Don't load if this isn't Bash or if han(1df) isn't available -if !exists('b:is_bash') || !executable('han') - finish -endif - -" Flag as loaded -let b:did_ftplugin_sh_han = 1 -let b:undo_ftplugin = b:undo_ftplugin - \ . '|unlet b:did_ftplugin_sh_han' - -" Set 'keywordprg' to han(1df) -setlocal keywordprg=han -let b:undo_ftplugin = b:undo_ftplugin - \ . '|setlocal keywordprg<' diff --git a/vim/after/ftplugin/sh/lint.vim b/vim/after/ftplugin/sh/lint.vim deleted file mode 100644 index a24ba369..00000000 --- a/vim/after/ftplugin/sh/lint.vim +++ /dev/null @@ -1,28 +0,0 @@ -" sh/lint.vim: Use appropriate shell binary to lint scripts for errors - -" 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_sh_lint') - finish -endif - -" Don't load if the user doesn't want ftplugin mappings -if exists('g:no_plugin_maps') || exists('g:no_sh_maps') - finish -endif - -" Flag as loaded -let b:did_ftplugin_sh_lint = 1 -let b:undo_ftplugin = b:undo_ftplugin - \ . '|unlet b:did_ftplugin_sh_lint' - -" Define a mapping target -nnoremap - \ ShLint - \ :call compiler#Make('shellcheck') -let b:undo_ftplugin = b:undo_ftplugin - \ . '|nunmap ShLint' diff --git a/vim/after/ftplugin/sh/maps.vim b/vim/after/ftplugin/sh/maps.vim deleted file mode 100644 index 19d9300c..00000000 --- a/vim/after/ftplugin/sh/maps.vim +++ /dev/null @@ -1,28 +0,0 @@ -" sh/maps.vim: tejr's mappings for 'sh' filetypes - -" 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_sh_maps') - finish -endif - -" Don't load if the user doesn't want ftplugin mappings -if exists('g:no_plugin_maps') || exists('g:no_sh_maps') - finish -endif - -" Flag as loaded -let b:did_ftplugin_sh_maps = 1 -let b:undo_ftplugin = b:undo_ftplugin - \ . '|unlet b:did_ftplugin_sh_maps' - -" Set mappings -nmap c ShCheck -nmap l ShLint -let b:undo_ftplugin = b:undo_ftplugin - \ . '|nunmap c' - \ . '|nunmap l' -- cgit v1.2.3