From 79d6eef63ff4984fa3f8631aec6da26fa19a6f34 Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Sat, 4 Nov 2017 20:16:43 +1300
Subject: Adjust plugin code layout a lot

Including renaming big_file.vim and accompanying functions yet again, to
big_file_options.vim.

Trying to keep complex autocmd and mapping definitions on long lines
broken up semantically; definition and options on one line, patterns or
mapping key on the next, and the command to run on the last.

Also trying to make sure that <silent>, <buffer>, and <unique> are
applied in the correct places, and that all mapping commands are using
the :<C-U> idiom for the command prefix.
---
 vim/ftplugin/html.vim | 15 ++++++++++-----
 vim/ftplugin/perl.vim | 15 +++++++++------
 vim/ftplugin/sh.vim   |  6 ++++--
 vim/ftplugin/vim.vim  |  5 +++--
 4 files changed, 26 insertions(+), 15 deletions(-)

(limited to 'vim/ftplugin')

diff --git a/vim/ftplugin/html.vim b/vim/ftplugin/html.vim
index c756eb80..3db5dcca 100644
--- a/vim/ftplugin/html.vim
+++ b/vim/ftplugin/html.vim
@@ -1,10 +1,12 @@
 " Run `tidy -errors -quiet` over buffer
-nnoremap <buffer> <silent> <LocalLeader>c
-      \ :write !tidy -errors -quiet<CR>
+nnoremap <buffer> <silent>
+      \ <LocalLeader>c
+      \ :<C-U>write !tidy -errors -quiet<CR>
 
 " Filter buffer through `tidy`
-nnoremap <buffer> <silent> <LocalLeader>t
-      \ :%!tidy -quiet<CR>
+nnoremap <buffer> <silent>
+      \ <LocalLeader>t
+      \ :<C-U>%!tidy -quiet<CR>
 
 " Make a bare URL into a link to itself
 function! s:UrlLink()
@@ -21,5 +23,8 @@ function! s:UrlLink()
   normal! a</a>
 
 endfunction
-nnoremap <buffer> <silent> <LocalLeader>r
+
+" Mapping for the function above
+nnoremap <buffer> <silent>
+      \ <LocalLeader>r
       \ :<C-U>call <SID>UrlLink()<CR>
diff --git a/vim/ftplugin/perl.vim b/vim/ftplugin/perl.vim
index 2ea4676b..07cf9a1f 100644
--- a/vim/ftplugin/perl.vim
+++ b/vim/ftplugin/perl.vim
@@ -1,11 +1,14 @@
 " Run `perl -c` over buffer
-nnoremap <buffer> <silent> <LocalLeader>c
-      \ :write !perl -c<CR>
+nnoremap <buffer> <silent>
+      \ <LocalLeader>c
+      \ :<C-U>write !perl -c<CR>
 
 " Run `perlcritic` over buffer
-nnoremap <buffer> <silent> <LocalLeader>l
-      \ :write !perlcritic<CR>
+nnoremap <buffer> <silent>
+      \ <LocalLeader>l
+      \ :<C-U>write !perlcritic<CR>
 
 " Filter buffer through `perltidy`
-nnoremap <buffer> <silent> <LocalLeader>t
-      \ :%!perltidy<CR>
+nnoremap <buffer> <silent>
+      \ <LocalLeader>t
+      \ :<C-U>%!perltidy<CR>
diff --git a/vim/ftplugin/sh.vim b/vim/ftplugin/sh.vim
index c09e4fe8..ae1974a0 100644
--- a/vim/ftplugin/sh.vim
+++ b/vim/ftplugin/sh.vim
@@ -33,7 +33,8 @@ elseif exists('b:is_ksh') && b:is_ksh
 else
   let b:check = 'sh -n'
 endif
-nnoremap <buffer> <silent> <LocalLeader>c
+nnoremap <buffer> <silent>
+      \ <LocalLeader>c
       \ :<C-U>execute ':write !' . b:check<CR>
 
 " Map linter based on shell family
@@ -44,5 +45,6 @@ elseif exists('b:is_ksh') && b:is_ksh
 else
   let b:lint = 'shellcheck -s sh -'
 endif
-nnoremap <buffer> <silent> <LocalLeader>l
+nnoremap <buffer> <silent>
+      \ <LocalLeader>l
       \ :<C-U>execute ':write !' . b:lint<CR>
diff --git a/vim/ftplugin/vim.vim b/vim/ftplugin/vim.vim
index e023553e..d4e55ace 100644
--- a/vim/ftplugin/vim.vim
+++ b/vim/ftplugin/vim.vim
@@ -1,5 +1,6 @@
 " Run `vint` over buffer
 " /dev/stdin is not optimal here; it's widely implemented, but not POSIX.
 " `vint` does not seem to have another way to parse standard input.
-nnoremap <buffer> <silent> <LocalLeader>l
-      \ :write !vint -s /dev/stdin<CR>
+nnoremap <buffer> <silent>
+      \ <LocalLeader>l
+      \ :<C-U>write !vint -s /dev/stdin<CR>
-- 
cgit v1.2.3