Skip to content

Commit edc0b46

Browse files
committed
Provide more :Rake defaults
1 parent 8e2cf13 commit edc0b46

File tree

3 files changed

+15
-12
lines changed

3 files changed

+15
-12
lines changed

autoload/rails.vim

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1227,7 +1227,7 @@ function! s:Rake(bang,lnum,arg)
12271227
if arg =~# '^notes\>'
12281228
let &l:errorformat = '%-P%f:,\ \ *\ [%\ %#%l]\ [%t%*[^]]] %m,\ \ *\ [%[\ ]%#%l] %m,%-Q'
12291229
call s:make(a:bang, arg)
1230-
elseif arg =~# '^\%(stats\|routes\|secret\|time:zones\|db:\%(charset\|collation\|fixtures:identify\>.*\|migrate:status\|version\)\)\%([: ]\|$\)'
1230+
elseif arg =~# '^\%(stats\|routes\|secret\|middleware\|time:zones\|db:\%(charset\|collation\|fixtures:identify\>.*\|migrate:status\|version\)\)\%([: ]\|$\)'
12311231
let &l:errorformat = '%D(in\ %f),%+G%.%#'
12321232
call s:make(a:bang, arg, 'copen')
12331233
else
@@ -1359,30 +1359,28 @@ function! s:readable_default_rake_task(...) dict abort
13591359
endif
13601360
elseif self.type_name('db-migration')
13611361
let ver = matchstr(self.name(),'\<db/migrate/0*\zs\d*\ze_')
1362-
if ver != ""
1362+
if !empty(ver)
13631363
let method = self.last_method(lnum)
13641364
if method == "down" || lnum == 1
13651365
return "db:migrate:down VERSION=".ver
13661366
elseif method == "up" || lnum == line('$')
13671367
return "db:migrate:up VERSION=".ver
13681368
else
1369-
return "db:migrate:down db:migrate:up VERSION=".ver
1369+
return "db:migrate:redo VERSION=".ver
13701370
endif
13711371
else
13721372
return 'db:migrate'
13731373
endif
13741374
elseif self.name() =~# '\<db/seeds\.rb$'
13751375
return 'db:seed'
1376-
elseif self.name() =~# '\<db/'
1376+
elseif self.name() =~# '\<db/\|\<config/database\.'
13771377
return 'db:migrate:status'
1378+
elseif self.name() =~# '\<config\.ru$'
1379+
return 'middleware'
1380+
elseif self.name() =~# '\<README'
1381+
return 'about'
13781382
elseif self.type_name('controller') && lnum
1379-
let lm = self.last_method(lnum)
1380-
if lm != ''
1381-
" rake routes doesn't support ACTION... yet...
1382-
return 'routes CONTROLLER='.self.controller_name().' ACTION='.lm
1383-
else
1384-
return 'routes CONTROLLER='.self.controller_name()
1385-
endif
1383+
return 'routes CONTROLLER='.self.controller_name()
13861384
else
13871385
let test = self.test_file()
13881386
let with_line = test
@@ -4860,7 +4858,7 @@ function! rails#buffer_setup() abort
48604858
call self.setvar('dispatch', ':Runner')
48614859
elseif self.name() ==# 'Rakefile'
48624860
call self.setvar('dispatch', ':Rake --tasks')
4863-
elseif self.name() =~# '^\%(app\|config\|db\|lib\|log\)'
4861+
elseif self.name() =~# '^\%(app\|config\|db\|lib\|log\|README\)'
48644862
call self.setvar('dispatch', ':Rake')
48654863
elseif self.name() =~# '^public'
48664864
call self.setvar('dispatch', ':Preview')

compiler/rails.vim

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ CompilerSet errorformat^=
3737
\%+G\ %#Status\ %#Migration\ ID%.%#,
3838
\%+G\ %#Prefix\ %#Verb%.%#,
3939
\%+G\ %#Code\ LOC:\ %.%#,
40+
\%+GAbout\ your\ application's\ environment,
41+
\%+Grun\ %\\S%#::Application.routes,
42+
\%+Eruby:%.%#(LoadError),
4043
\%+EUsage:%.%#,
4144
\%+ECould\ not\ find\ generator%.%#,
4245
\%+EType\ 'rails'\ for\ help.

doc/rails.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,9 @@ view test:functionals TEST=... spec SPEC=...
393393
fixtures db:fixtures:load FIXTURES=...
394394
migration db:migrate:redo VERSION=...
395395
config/routes.rb routes
396+
db/schema.rb db:migrate:status
396397
db/seeds.rb db:seed
398+
README about
397399

398400
Additionally, when :Rake is given a line number (e.g., :.Rake), the following
399401
additional tasks can be invoked:

0 commit comments

Comments
 (0)