summaryrefslogtreecommitdiff
path: root/runtime/compiler
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2013-06-12 21:29:15 +0200
committerBram Moolenaar <Bram@vim.org>2013-06-12 21:29:15 +0200
commitec7944aaf2d5fd67b7bd59a69d6a393424b6c8f8 (patch)
treed578871973ba7c87e0337dbe90b61d75de667100 /runtime/compiler
parentcab465a6d7a7d158c99b04ddc81650b468d82227 (diff)
downloadvim-git-ec7944aaf2d5fd67b7bd59a69d6a393424b6c8f8.tar.gz
Update runtime files.
Diffstat (limited to 'runtime/compiler')
-rw-r--r--runtime/compiler/eruby.vim4
-rw-r--r--runtime/compiler/rake.vim35
-rw-r--r--runtime/compiler/rspec.vim22
-rw-r--r--runtime/compiler/ruby.vim27
-rw-r--r--runtime/compiler/rubyunit.vim4
-rw-r--r--runtime/compiler/xmllint.vim11
6 files changed, 50 insertions, 53 deletions
diff --git a/runtime/compiler/eruby.vim b/runtime/compiler/eruby.vim
index 614fc17f6..45ad5eead 100644
--- a/runtime/compiler/eruby.vim
+++ b/runtime/compiler/eruby.vim
@@ -1,9 +1,7 @@
" Vim compiler file
" Language: eRuby
" Maintainer: Doug Kearns <dougkearns@gmail.com>
-" Last Change: 2008 Aug 1
-" URL: http://vim-ruby.rubyforge.org
-" Anon CVS: See above site
+" URL: https://github.com/vim-ruby/vim-ruby
" Release Coordinator: Doug Kearns <dougkearns@gmail.com>
if exists("current_compiler")
diff --git a/runtime/compiler/rake.vim b/runtime/compiler/rake.vim
new file mode 100644
index 000000000..3bd9da0da
--- /dev/null
+++ b/runtime/compiler/rake.vim
@@ -0,0 +1,35 @@
+" Vim compiler file
+" Language: Rake
+" Maintainer: Tim Pope <vimNOSPAM@tpope.org>
+" URL: https://github.com/vim-ruby/vim-ruby
+" Release Coordinator: Doug Kearns <dougkearns@gmail.com>
+
+if exists("current_compiler")
+ finish
+endif
+let current_compiler = "rake"
+
+if exists(":CompilerSet") != 2 " older Vim always used :setlocal
+ command -nargs=* CompilerSet setlocal <args>
+endif
+
+let s:cpo_save = &cpo
+set cpo-=C
+
+CompilerSet makeprg=rake
+
+CompilerSet errorformat=
+ \%D(in\ %f),
+ \%\\s%#from\ %f:%l:%m,
+ \%\\s%#from\ %f:%l:,
+ \%\\s%##\ %f:%l:%m,
+ \%\\s%##\ %f:%l,
+ \%\\s%#[%f:%l:\ %#%m,
+ \%\\s%#%f:%l:\ %#%m,
+ \%\\s%#%f:%l:,
+ \%m\ [%f:%l]:
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+" vim: nowrap sw=2 sts=2 ts=8:
diff --git a/runtime/compiler/rspec.vim b/runtime/compiler/rspec.vim
index f46527ef1..7c340bab1 100644
--- a/runtime/compiler/rspec.vim
+++ b/runtime/compiler/rspec.vim
@@ -1,9 +1,7 @@
" Vim compiler file
" Language: RSpec
" Maintainer: Tim Pope <vimNOSPAM@tpope.org>
-" Last Change: 2009 Dec 22
-" URL: http://vim-ruby.rubyforge.org
-" Anon CVS: See above site
+" URL: https://github.com/vim-ruby/vim-ruby
" Release Coordinator: Doug Kearns <dougkearns@gmail.com>
if exists("current_compiler")
@@ -18,21 +16,15 @@ endif
let s:cpo_save = &cpo
set cpo-=C
-CompilerSet makeprg=spec
+CompilerSet makeprg=rspec
CompilerSet errorformat=
- \%+W'%.%#'\ FAILED,
- \%+I'%.%#'\ FIXED,
- \%-Cexpected:%.%#,
- \%-C\ \ \ \ \ got:%.%#,
+ \%f:%l:\ %tarning:\ %m,
\%E%.%#:in\ `load':\ %f:%l:%m,
- \%C%f:%l:,
- \%W%f:%l:\ warning:\ %m,
- \%E%f:%l:in\ %*[^:]:\ %m,
- \%E%f:%l:\ %m,
- \%-Z%\tfrom\ %f:%l,
- \%-Z%p^%.%#,
- \%-C%.%#,
+ \%E%f:%l:in\ `%*[^']':\ %m,
+ \%-Z\ \ \ \ \ \#\ %f:%l:%.%#,
+ \%E\ \ %\\d%\\+)%.%#,
+ \%C\ \ \ \ \ %m,
\%-G%.%#
let &cpo = s:cpo_save
diff --git a/runtime/compiler/ruby.vim b/runtime/compiler/ruby.vim
index 9499ce189..dcf7a4012 100644
--- a/runtime/compiler/ruby.vim
+++ b/runtime/compiler/ruby.vim
@@ -1,33 +1,10 @@
" Vim compiler file
" Language: Ruby
" Function: Syntax check and/or error reporting
-" Maintainer: Tim Hammerquist <timh at rubyforge.org>
-" Last Change: 2008 Aug 1
-" URL: http://vim-ruby.rubyforge.org
-" Anon CVS: See above site
+" Maintainer: Tim Pope <vimNOSPAM@tpope.org>
+" URL: https://github.com/vim-ruby/vim-ruby
" Release Coordinator: Doug Kearns <dougkearns@gmail.com>
" ----------------------------------------------------------------------------
-"
-" Changelog:
-" 0.2: script saves and restores 'cpoptions' value to prevent problems with
-" line continuations
-" 0.1: initial release
-"
-" Contributors:
-" Hugh Sasse <hgs@dmu.ac.uk>
-" Doug Kearns <djkea2@gus.gscit.monash.edu.au>
-"
-" Todo:
-" match error type %m
-"
-" Comments:
-" I know this file isn't perfect. If you have any questions, suggestions,
-" patches, etc., please don't hesitate to let me know.
-"
-" This is my first experience with 'errorformat' and compiler plugins and
-" I welcome any input from more experienced (or clearer-thinking)
-" individuals.
-" ----------------------------------------------------------------------------
if exists("current_compiler")
finish
diff --git a/runtime/compiler/rubyunit.vim b/runtime/compiler/rubyunit.vim
index 524c205f8..93a0c8e65 100644
--- a/runtime/compiler/rubyunit.vim
+++ b/runtime/compiler/rubyunit.vim
@@ -1,9 +1,7 @@
" Vim compiler file
" Language: Test::Unit - Ruby Unit Testing Framework
" Maintainer: Doug Kearns <dougkearns@gmail.com>
-" Last Change: 2008 Aug 1
-" URL: http://vim-ruby.rubyforge.org
-" Anon CVS: See above site
+" URL: https://github.com/vim-ruby/vim-ruby
" Release Coordinator: Doug Kearns <dougkearns@gmail.com>
if exists("current_compiler")
diff --git a/runtime/compiler/xmllint.vim b/runtime/compiler/xmllint.vim
index 8fde4e10f..ddd496048 100644
--- a/runtime/compiler/xmllint.vim
+++ b/runtime/compiler/xmllint.vim
@@ -1,8 +1,7 @@
" Vim compiler file
" Compiler: xmllint
-" Maintainer: Doug Kearns <djkea2@gus.gscit.monash.edu.au>
-" URL: http://gus.gscit.monash.edu.au/~djkea2/vim/compiler/xmllint.vim
-" Last Change: 2004 Nov 27
+" Maintainer: Doug Kearns <dougkearns@gmail.com>
+" Last Change: 2013 Jun 1
if exists("current_compiler")
finish
@@ -18,10 +17,8 @@ set cpo-=C
CompilerSet makeprg=xmllint\ --valid\ --noout\
-CompilerSet errorformat=%E%f:%l:\ error:\ %m,
- \%W%f:%l:\ warning:\ %m,
- \%E%f:%l:\ validity\ error:\ %m,
- \%W%f:%l:\ validity\ warning:\ %m,
+CompilerSet errorformat=%+E%f:%l:\ %.%#\ error\ :\ %m,
+ \%+W%f:%l:\ %.%#\ warning\ :\ %m,
\%-Z%p^,
\%-G%.%#