Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Tweak error formats
These are mostly in support of the omitted color codes in Rails 4.1+.
  • Loading branch information
tpope committed Apr 22, 2015
1 parent c7aeb5b commit 180feda
Showing 1 changed file with 5 additions and 8 deletions.
13 changes: 5 additions & 8 deletions autoload/rails.vim
Expand Up @@ -1191,7 +1191,6 @@ function! s:Rake(bang,lnum,arg)
let old_compiler = get(b:, 'current_compiler', '')
try
call s:push_chdir(1)
let b:current_compiler = 'rake'
if !empty(findfile('compiler/rake.vim', escape(&rtp, ' ')))
compiler rake
else
Expand Down Expand Up @@ -1220,7 +1219,7 @@ function! s:Rake(bang,lnum,arg)
let self.options['last_rake_task'] = arg
let withrubyargs = '-r ./config/boot -r '.s:rquote(self.path('config/environment')).' -e "puts \%((in \#{Dir.getwd}))" '
if arg =~# '^notes\>'
let &l:errorformat = '%-P%f:,\ \ *\ [%*[\ ]%l]\ [%t%*[^]]] %m,\ \ *\ [%*[\ ]%l] %m,%-Q'
let &l:errorformat = '%-P%f:,\ \ *\ [%\ %#%l]\ [%t%*[^]]] %m,\ \ *\ [%[\ ]%#%l] %m,%-Q'
call s:make(a:bang, arg)
elseif arg =~# '^\%(stats\|routes\|secret\|time:zones\|db:\%(charset\|collation\|fixtures:identify\>.*\|migrate:status\|version\)\)\%([: ]\|$\)'
let &l:errorformat = '%D(in\ %f),%+G%.%#'
Expand Down Expand Up @@ -1810,19 +1809,17 @@ function! s:app_server_command(bang,arg) dict
endfunction

function! s:color_efm(pre, before, after)
return a:pre . '%\S%\+ %#' . a:before . "\e[0m %#" . a:after . ',' .
return a:pre . '%\e%\S%\+ %#' . a:before . '%\e[0m %#' . a:after . ',' .
\ a:pre . '%\s %#'.a:before.' %#'.a:after . ','
endfunction

let s:efm_generate =
\ s:color_efm('%-G', 'invoke', '%f') .
\ s:color_efm('%-G', 'conflict', '%f') .
\ s:color_efm('%-G', 'run', '%f') .
\ s:color_efm('%-G', 'create', ' ') .
\ s:color_efm('%-G', 'exist', ' ') .
\ s:color_efm('Overwrite%.%#', '%m', '%f') .
\ s:color_efm('', '%m', ' %f') .
\ s:color_efm('', '%m', '%f') .
\ s:color_efm('%-G', '%\w%\+', ' ') .
\ 'Overwrite%.%#%\S%\+ %#%m%\e[0m %#%f,' .
\ s:color_efm('', '%m%\>', '%f') .
\ '%-G%.%#'

function! s:app_generator_command(bang,...) dict
Expand Down

0 comments on commit 180feda

Please sign in to comment.