aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2017-11-20 09:12:30 +1300
committerTom Ryder <tom@sanctum.geek.nz>2017-11-20 09:12:30 +1300
commitc3d060ec836d4d7ed0707c9f36015ed6f58c057f (patch)
tree1b9ba533ebcf47c848be74691677a31d2d4541f2
parent062274de75e25ad96f52d39e17844048003b90dc (diff)
parent86fa780596e83cfd3fc14560eca3e4b2a534a23f (diff)
downloaddotfiles-c3d060ec836d4d7ed0707c9f36015ed6f58c057f.tar.gz
dotfiles-c3d060ec836d4d7ed0707c9f36015ed6f58c057f.zip
Merge branch 'release/v0.19.0'v0.19.0
* release/v0.19.0: Bump version number to 0.19.0 Add `php -l` check binding for PHP filetype Correct "fi" to "endif" in new compiler files
-rw-r--r--VERSION4
-rw-r--r--vim/after/ftplugin/php/check.vim57
-rw-r--r--vim/compiler/perlcritic.vim2
-rw-r--r--vim/compiler/vint.vim2
4 files changed, 61 insertions, 4 deletions
diff --git a/VERSION b/VERSION
index f399cc95..63f6126f 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v0.18.0
-Sun Nov 19 10:42:36 UTC 2017
+tejr dotfiles v0.19.0
+Sun Nov 19 20:12:02 UTC 2017
diff --git a/vim/after/ftplugin/php/check.vim b/vim/after/ftplugin/php/check.vim
new file mode 100644
index 00000000..33077a72
--- /dev/null
+++ b/vim/after/ftplugin/php/check.vim
@@ -0,0 +1,57 @@
+" Only do this when not done yet for this buffer
+" Also do nothing if 'compatible' enabled
+if exists('b:did_ftplugin_php_check') || &compatible
+ finish
+endif
+let b:did_ftplugin_php_check = 1
+if exists('b:undo_ftplugin')
+ let b:undo_ftplugin = b:undo_ftplugin
+ \ . '|unlet b:did_ftplugin_php_check'
+endif
+
+" Build function for checker
+if !exists('*s:PhpCheck')
+ function s:PhpCheck()
+ let l:save_makeprg = &l:makeprg
+ let l:save_errorformat = &l:errorformat
+ unlet! g:current_compiler
+ compiler php
+
+ " 7.4.191 is the earliest version with the :S file name modifier, which we
+ " really should use if we can
+ if v:version >= 704 || v:version == 704 && has('patch191')
+ make! %:S
+ else
+ make! %
+ endif
+
+ let &l:makeprg = l:save_makeprg
+ let &l:errorformat = l:save_errorformat
+ cwindow
+ endfunction
+endif
+
+" Set up a mapping for the checker, if we're allowed
+if !exists('g:no_plugin_maps') && !exists('g:no_php_maps')
+
+ " Define a mapping target
+ nnoremap <buffer> <silent> <unique>
+ \ <Plug>PhpCheck
+ \ :<C-U>call <SID>PhpCheck()<CR>
+ if exists('b:undo_ftplugin')
+ let b:undo_ftplugin = b:undo_ftplugin
+ \ . '|nunmap <buffer> <Plug>PhpCheck'
+ endif
+
+ " If there isn't a key mapping already, use a default one
+ if !hasmapto('<Plug>PhpCheck')
+ nmap <buffer> <unique>
+ \ <LocalLeader>c
+ \ <Plug>PhpCheck
+ if exists('b:undo_ftplugin')
+ let b:undo_ftplugin = b:undo_ftplugin
+ \ . '|nunmap <buffer> <LocalLeader>c'
+ endif
+ endif
+
+endif
diff --git a/vim/compiler/perlcritic.vim b/vim/compiler/perlcritic.vim
index ec151906..afbb73c7 100644
--- a/vim/compiler/perlcritic.vim
+++ b/vim/compiler/perlcritic.vim
@@ -13,5 +13,5 @@ if v:version >= 704 || v:version == 704 && has('patch191')
CompilerSet makeprg=perlcritic\ --verbose\ 1\ %:S
else
CompilerSet makeprg=perlcritic\ --verbose\ 1\ %
-fi
+endif
CompilerSet errorformat=%f:%l:%c:%m
diff --git a/vim/compiler/vint.vim b/vim/compiler/vint.vim
index 0dcd4720..54d0fc4d 100644
--- a/vim/compiler/vint.vim
+++ b/vim/compiler/vint.vim
@@ -13,5 +13,5 @@ if v:version >= 704 || v:version == 704 && has('patch191')
CompilerSet makeprg=vint\ %:S
else
CompilerSet makeprg=vint\ %
-fi
+endif
CompilerSet errorformat=%f:%l:%c:\ %m