summaryrefslogtreecommitdiffstats
path: root/indent/eruby.vim
diff options
context:
space:
mode:
Diffstat (limited to 'indent/eruby.vim')
-rw-r--r--indent/eruby.vim16
1 files changed, 8 insertions, 8 deletions
diff --git a/indent/eruby.vim b/indent/eruby.vim
index cdc5fedf..6fd76600 100644
--- a/indent/eruby.vim
+++ b/indent/eruby.vim
@@ -6,7 +6,7 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1
" URL: https://github.com/vim-ruby/vim-ruby
" Release Coordinator: Doug Kearns <dougkearns@gmail.com>
-if get(b:, 'did_indent') =~# '\<eruby\>'
+if exists("b:did_indent")
finish
endif
@@ -14,14 +14,12 @@ runtime! indent/ruby.vim
unlet! b:did_indent
setlocal indentexpr=
-if &filetype =~# '^eruby\>'
- if exists("b:eruby_subtype") && b:eruby_subtype != '' && b:eruby_subtype !=# 'eruby'
- exe "runtime! indent/".b:eruby_subtype.".vim"
- else
- runtime! indent/html.vim
- endif
+if exists("b:eruby_subtype") && b:eruby_subtype != '' && b:eruby_subtype !=# 'eruby'
+ exe "runtime! indent/".b:eruby_subtype.".vim"
+else
+ runtime! indent/html.vim
endif
-let b:did_indent = get(b:, 'did_indent', 1) . '.eruby'
+unlet! b:did_indent
" Force HTML indent to not keep state.
let b:html_indent_usestate = 0
@@ -35,6 +33,8 @@ if &l:indentexpr == ''
endif
let b:eruby_subtype_indentexpr = &l:indentexpr
+let b:did_indent = 1
+
setlocal indentexpr=GetErubyIndent()
setlocal indentkeys=o,O,*<Return>,<>>,{,},0),0],o,O,!^F,=end,=else,=elsif,=rescue,=ensure,=when