diff options
| author | Bram Moolenaar <Bram@vim.org> | 2006-04-25 22:13:59 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2006-04-25 22:13:59 +0000 |
| commit | 551dbcc9b604c2992f908fb475e797fcc116315b (patch) | |
| tree | d48db26e4f3470df23fdd8e8593bcf067fab4142 /runtime/autoload/rubycomplete.vim | |
| parent | f9393ef5efde2f425fbd9e19363186f8c9103376 (diff) | |
updated for version 7.0f01v7.0f01
Diffstat (limited to 'runtime/autoload/rubycomplete.vim')
| -rw-r--r-- | runtime/autoload/rubycomplete.vim | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/runtime/autoload/rubycomplete.vim b/runtime/autoload/rubycomplete.vim index d1c8a26538..53dc869d6b 100644 --- a/runtime/autoload/rubycomplete.vim +++ b/runtime/autoload/rubycomplete.vim @@ -90,9 +90,15 @@ function! GetRubyVarType(v) return vtp endif call setpos('.',pos) - let [lnum,lcol] = searchpos(''.a:v.'\>\s*[+\-*/]*=\s*\([^ \t]\+.\(now\|new\|open\|get_instance\)\>\|[\[{"''/]\|%r{\)','nb',stopline) + if g:rubycomplete_rails == 1 && g:rubycomplete_rails_loaded == 1 + let ctors = '\(now\|new\|open\|get_instance\|find\|create\)' + else + let ctors = '\(now\|new\|open\|get_instance\)' + endif + + let [lnum,lcol] = searchpos(''.a:v.'\>\s*[+\-*/]*=\s*\([^ \t]\+.' . ctors .'\>\|[\[{"''/]\|%r{\)','nb',stopline) if lnum != 0 && lcol != 0 - let str = matchstr(getline(lnum),'=\s*\([^ \t]\+.\(now\|new\|open\|get_instance\)\>\|[\[{"''/]\|%r{\)',lcol) + let str = matchstr(getline(lnum),'=\s*\([^ \t]\+.' . ctors . '\>\|[\[{"''/]\|%r{\)',lcol) let str = substitute(str,'^=\s*','','') call setpos('.',pos) if str == '"' || str == '''' @@ -255,7 +261,7 @@ def load_rails() file_name = VIM::evaluate('expand("%:t")') path = buf_path.gsub( file_name, '' ) path.gsub!( /\\/, "/" ) - pup = [ "../", "../../", "../../../", "../../../../" ] + pup = [ "./", "../", "../../", "../../../", "../../../../" ] pok = nil pup.each do |sup| @@ -267,10 +273,19 @@ def load_rails() end return if pok == nil + bootfile = pok + "/boot.rb" - if File.exists?( bootfile ) - require bootfile - VIM::evaluate('let g:rubycomplete_rails_loaded = 1') + envfile = pok + "/environment.rb" + if File.exists?( bootfile ) && File.exists?( envfile ) + begin + require bootfile + require envfile + require 'console_app' + require 'console_with_helpers' + VIM::command('let g:rubycomplete_rails_loaded = 1') + rescue + print "Error loading rails environment" + end end end |