Skip to content

Commit 0d2546a

Browse files
committed
Separate out railslog settings
1 parent 40cec48 commit 0d2546a

File tree

2 files changed

+20
-15
lines changed

2 files changed

+20
-15
lines changed

autoload/rails.vim

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3919,6 +3919,20 @@ function! rails#log_syntax()
39193919
hi def link railslogHTTP Special
39203920
endfunction
39213921

3922+
function! rails#log_setup() abort
3923+
nnoremap <buffer> <silent> R :checktime<CR>
3924+
nnoremap <buffer> <silent> G :checktime<Bar>$<CR>
3925+
nnoremap <buffer> <silent> q :bwipe<CR>
3926+
setlocal modifiable noswapfile autoread
3927+
if exists('+concealcursor')
3928+
setlocal concealcursor=nc conceallevel=2
3929+
else
3930+
silent %s/\%(\e\[[0-9;]*m\|\r$\)//ge
3931+
endif
3932+
setlocal readonly nomodifiable
3933+
$
3934+
endfunction
3935+
39223936
" }}}1
39233937
" Mappings {{{1
39243938

@@ -4430,19 +4444,6 @@ function! rails#buffer_init()
44304444
elseif expand('%:e') =~# '^\%(rjs\|rxml\|builder\|jbuilder\)$' && &filetype !=# 'ruby'
44314445
" setlocal filetype=ruby
44324446
endif
4433-
if expand('%:e') == 'log'
4434-
nnoremap <buffer> <silent> R :checktime<CR>
4435-
nnoremap <buffer> <silent> G :checktime<Bar>$<CR>
4436-
nnoremap <buffer> <silent> q :bwipe<CR>
4437-
setlocal modifiable filetype=railslog noswapfile autoread foldmethod=syntax
4438-
if exists('+concealcursor')
4439-
setlocal concealcursor=nc conceallevel=2
4440-
else
4441-
silent %s/\%(\e\[[0-9;]*m\|\r$\)//ge
4442-
endif
4443-
setlocal readonly nomodifiable
4444-
$
4445-
endif
44464447
call s:BufCommands()
44474448
if !empty(findfile('macros/rails.vim', escape(&runtimepath, ' ')))
44484449
runtime! macros/rails.vim

plugin/rails.vim

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,9 @@ endif
6868

6969
augroup railsPluginDetect
7070
autocmd!
71+
autocmd BufEnter * if exists("b:rails_root")|silent doau User BufEnterRails|endif
72+
autocmd BufLeave * if exists("b:rails_root")|silent doau User BufLeaveRails|endif
73+
7174
autocmd BufNewFile,BufReadPost *
7275
\ if s:Activate(expand("<afile>:p")) && empty(&filetype) |
7376
\ call rails#buffer_settings() |
@@ -82,11 +85,12 @@ augroup railsPluginDetect
8285
\ silent doau User BufEnterRails |
8386
\ endif
8487
autocmd FileType * if RailsDetect() | call rails#buffer_settings() | endif
88+
89+
autocmd BufReadPost *.log if RailsDetect() | set filetype=railslog | endif
90+
autocmd FileType railslog call rails#log_setup()
8591
autocmd Syntax railslog call rails#log_syntax()
8692
autocmd Syntax ruby,eruby,yaml,haml,javascript,coffee,sass,scss
8793
\ if RailsDetect() | call rails#buffer_syntax() | endif
88-
autocmd BufEnter * if exists("b:rails_root")|silent doau User BufEnterRails|endif
89-
autocmd BufLeave * if exists("b:rails_root")|silent doau User BufLeaveRails|endif
9094
augroup END
9195

9296
command! -bar -bang -nargs=* -complete=dir Rails execute rails#new_app_command(<bang>0,<f-args>)

0 commit comments

Comments
 (0)