.netrwhist doc/EnhancedCommentify.txt doc/apidock.txt doc/example.taskpaper doc/taskpaper.html doc/taskpaper.txt doc/taskpaper_hacking.txt doc/taskpaper_licence.txt ftdetect/cucumber.vim ftdetect/taskpaper.vim ftplugin/cucumber.vim ftplugin/ocaml_enhcomm.vim ftplugin/php_enhcomm.vim ftplugin/taskpaper.vim indent/cucumber.vim plugin/EnhancedCommentify.vim plugin/SimpleFold.vim plugin/apidock.vim plugin/rubytest.vim syntax/cucumber.vim syntax/taskpaper.vim syntax/textile.vim syntax/yaml.vim @@ -55,3 +55,5 @@ exec "Snippet h1 <h1 id=\"".st.et."\">".st.et."</h1>".st.et exec "Snippet input <input type=\"".st.et."\" name=\"".st.et."\" value=\"".st.et."\" ".st.et."/>".st.et exec "Snippet style <style type=\"text/css\" media=\"screen\"><CR>/* <![CDATA[ */<CR>".st.et."<CR>/* ]]> */<CR></style><CR>".st.et exec "Snippet base <base href=\"".st.et."\"".st.et." />".st.et +exec "Snippet pe <%= ".st.et." %>" +exec "Snippet pr <%- ".st.et." %>" after/ftplugin/html_snippets.vim @@ -53,4 +53,4 @@ exec "Snippet ril render :inline => \"".st.et."\", :locals => { ".st.et." => \"" exec "Snippet rtl render :text => \"".st.et."\", :layout => \"".st.et."\"".st.et exec "Snippet reca redirect_to :controller => \"".st."items".et."\", :action => \"".st."list".et."\"".st.et exec "Snippet pe <%= ".st.et." %>" -exec "Snippet pr <%- ".st.et." -%>" +exec "Snippet pr <%- ".st.et." %>" after/ftplugin/rails_snippets.vim @@ -17,7 +17,7 @@ exec "Snippet h5 <h5>".st.et."</h5>".st.et exec "Snippet h6 <h6>".st.et."</h6>".st.et exec "Snippet fieldset <fieldset><CR>".st.et."<CR></fieldset>".st.et exec "Snippet noscript <noscript><CR>".st.et."<CR></noscript>".st.et -exec "Snippet ul <ul ".st.et."><CR>".st.et."<CR></ul>".st.et +exec "Snippet ul <ul".st.et."><CR>".st.et."<CR></ul>".st.et exec "Snippet xml <?xml version=\"1.0\" encoding=\"iso-8859-1\"?><CR><CR>".st.et exec "Snippet body <body id=\"".st.et."\" ".st.et."><CR>".st.et."<CR></body>".st.et exec "Snippet legend <legend align=\"".st.et."\" accesskey=\"".st.et."\"><CR>".st.et."<CR></legend>".st.et @@ -31,6 +31,7 @@ exec "Snippet td <td ".st.et.">".st.et."</td>".st.et exec "Snippet dt <dt>".st.et."<CR></dt><CR><dd>".st.et."</dd>".st.et exec "Snippet tfoot <tfoot><CR>".st.et."<CR></tfoot>".st.et exec "Snippet div <CR><div id=\"".st."id".et."\"><CR>".st.et."<CR></div><CR><CR>".st.et +exec "Snippet span <span>".st.et."</span>" exec "Snippet ol <ol ".st.et."><CR>".st.et."<CR></ol>".st.et exec "Snippet txtarea <textarea id=\"".st."ID".et."\" name=\"".st."Name".et."\" rows=\"".st.et."\" cols=\"".st.et."\" tabindex=\"".st.et."\" ".st.et.">".st.et."</textarea>".st.et exec "Snippet mailto <a href=\"mailto:".st.et."?subject=".st.et."\">".st.et."</a>".st.et @@ -46,3 +47,10 @@ exec "Snippet select <select id=\"".st."ID".et."\" name=\"".st."Name".et."\" siz exec "Snippet style <style type=\"text/css\" media=\"".st."screen".et."\"><CR>/* <![CDATA[ */<CR>".st.et."<CR>/* ]]> */<CR></style><CR>".st.et exec "Snippet divheader <CR><div id=\"HeaderDiv\"><CR><CR><h1>".st."CompanyName".et."</h1><CR></div><CR><CR>".st.et exec "Snippet base <base href=\"".st.et."\" ".st.et."/>".st.et +exec "Snippet pe <%= ".st.et." %>" +exec "Snippet pr <%- ".st.et." %>" +exec "Snippet li <li>".st.et."</li>".st.et +exec "Snippet p <p>".st.et."</p>".st.et +exec "Snippet dl <dl><CR>".st.et."</dl>" +exec "Snippet dt <dt>".st.et."</dt>" +exec "Snippet dd <dd>".st.et."</dd>" after/ftplugin/xhtml_snippets.vim @@ -13,13 +13,25 @@ if &cp || exists("g:autoloaded_rails") finish endif -let g:autoloaded_rails = '2.0' +let g:autoloaded_rails = '3.3' let s:cpo_save = &cpo set cpo&vim " Utility Functions {{{1 +let s:app_prototype = {} + +function! s:add_methods(namespace, method_names) + for name in a:method_names + let s:{a:namespace}_prototype[name] = s:function('s:'.a:namespace.'_'.name) + endfor +endfunction + +function! s:function(name) + return function(substitute(a:name,'^s:',matchstr(expand('<sfile>'), '<SNR>\d\+_'),'')) +endfunction + function! s:sub(str,pat,rep) return substitute(a:str,'\v\C'.a:pat,a:rep,'') endfunction @@ -28,12 +40,8 @@ function! s:gsub(str,pat,rep) return substitute(a:str,'\v\C'.a:pat,a:rep,'g') endfunction -function! s:string(str) - if exists("*string") - return string(a:str) - else - return "'" . s:gsub(a:str,"'","'.\"'\".'") . "'" - endif +function! s:startswith(string,prefix) + return strpart(a:string, 0, strlen(a:prefix)) ==# a:prefix endfunction function! s:compact(ary) @@ -48,7 +56,7 @@ function! s:scrub(collection,item) while idx != -1 && cnt < 100 let col = strpart(col,0,idx).strpart(col,idx+strlen(a:item)+1) let idx = stridx(col,"\n".a:item."\n") - let cnt = cnt + 1 + let cnt += 1 endwhile return strpart(col,1) endfunction @@ -61,28 +69,6 @@ function! s:esccmd(p) return s:gsub(a:p,'[!%#]','\\&') endfunction -function! s:ra() - " Rails root, escaped for use as single argument - return s:escarg(RailsRoot()) -endfunction - -function! s:rc() - " Rails root, escaped for use with a command (spaces not escaped) - return s:esccmd(RailsRoot()) -endfunction - -function! s:escvar(r) - let r = fnamemodify(a:r,':~') - let r = s:gsub(r,'\W','\="_".char2nr(submatch(0))."_"') - let r = s:gsub(r,'^\d','_&') - return r -endfunction - -function! s:rv() - " Rails root, escaped to be a variable name - return s:escvar(RailsRoot()) -endfunction - function! s:rquote(str) " Imperfect but adequate for Ruby arguments if a:str =~ '^[A-Za-z0-9_/.:-]\+$' @@ -98,90 +84,98 @@ function! s:sname() return fnamemodify(s:file,':t:r') endfunction -function! s:hasfile(file) - return filereadable(RailsRoot().'/'.a:file) +function! s:pop_command() + if exists("s:command_stack") && len(s:command_stack) > 0 + exe remove(s:command_stack,-1) + endif endfunction -function! s:rubyexestr(cmd) - if RailsRoot() =~ '://' - return "ruby ".a:cmd +function! s:push_chdir() + if !exists("s:command_stack") | let s:command_stack = [] | endif + if exists("b:rails_root") && !s:startswith(getcwd(), rails#app().path()) + let chdir = exists("*haslocaldir") && haslocaldir() ? "lchdir " : "chdir " + call add(s:command_stack,chdir.s:escarg(getcwd())) + exe chdir.s:escarg(rails#app().path()) else - return "ruby -C ".s:rquote(RailsRoot())." ".a:cmd + call add(s:command_stack,"") endif endfunction -function! s:rubyexestrwithfork(cmd) - if s:getopt("ruby_fork_port","ab") && executable("ruby_fork_client") - return "ruby_fork_client -p ".s:getopt("ruby_fork_port","ab")." ".a:cmd - else - return s:rubyexestr(a:cmd) - endif +function! s:app_path(...) dict + return join([self.root]+a:000,'/') endfunction -function! s:rubyexebg(cmd) - let cmd = s:esccmd(s:rubyexestr(a:cmd)) - if has("gui_win32") - if &shellcmdflag == "-c" && ($PATH . &shell) =~? 'cygwin' - silent exe "!cygstart -d ".s:rquote(RailsRoot())." ruby ".a:cmd - else - exe "!start ".cmd - endif - elseif exists("$STY") && !has("gui_running") && s:getopt("gnu_screen","abg") && executable("screen") - silent exe "!screen -ln -fn -t ".s:sub(s:sub(a:cmd,'\s.*',''),'^%(script|-rcommand)/','rails-').' '.cmd - else - exe "!".cmd - endif - return v:shell_error +function! s:app_has_file(file) dict + return filereadable(self.path(a:file)) endfunction -function! s:rubyexe(cmd,...) +function! s:app_find_file(name, ...) dict abort + let trim = strlen(self.path())+1 if a:0 - call s:rubyexebg(a:cmd) + let path = s:pathjoin(map(s:pathsplit(a:1),'self.path(v:val)')) else - exe "!".s:esccmd(s:rubyexestr(a:cmd)) - endif - return v:shell_error + let path = s:pathjoin([self.path()]) + endif + let suffixesadd = s:pathjoin(get(a:000,1,&suffixesadd)) + let default = get(a:000,2,'') + let oldsuffixesadd = &l:suffixesadd + try + let &suffixesadd = suffixesadd + " Versions before 7.1.256 returned directories from findfile + if type(default) == type(0) && (v:version < 702 || default == -1) + let all = findfile(a:name,path,-1) + if v:version < 702 + call filter(all,'!isdirectory(v:val)') + endif + call map(all,'s:gsub(strpart(fnamemodify(v:val,":p"),trim),"\\\\","/")') + return default < 0 ? all : get(all,default-1,'') + elseif type(default) == type(0) + let found = findfile(a:name,path,default) + else + let i = 1 + let found = findfile(a:name,path) + while v:version < 702 && found != "" && isdirectory(found) + let i += 1 + let found = findfile(a:name,path,i) + endwhile + endif + return found == "" ? found : s:gsub(strpart(fnamemodify(found,':p'),trim),'\\','/') + finally + let &l:suffixesadd = oldsuffixesadd + endtry endfunction -function! s:rubyeval(ruby,...) - if a:0 > 0 - let def = a:1 - else - let def = "" - endif - if !executable("ruby") - return def - endif - let cmd = s:rubyexestr('-e '.s:rquote('begin; require %{rubygems}; rescue LoadError; end; begin; require %{active_support}; rescue LoadError; end; '.a:ruby)) - "let g:rails_last_ruby_command = cmd - " If the shell is messed up, this command could cause an error message - silent! let results = system(cmd) - "let g:rails_last_ruby_result = results - if v:shell_error != 0 " results =~ '-e:\d' || results =~ 'ruby:.*(fatal)' - return def - else - return results - endif +call s:add_methods('app',['path','has_file','find_file']) + +" Split a path into a list. From pathogen.vim +function! s:pathsplit(path) abort + if type(a:path) == type([]) | return copy(a:path) | endif + let split = split(a:path,'\\\@<!\%(\\\\\)*\zs,') + return map(split,'substitute(v:val,''\\$[\\, ]$'',''\1'',"g")') endfunction -function! s:railseval(ruby,...) - if a:0 > 0 - let def = a:1 - else - let def = "" - endif - if !executable("ruby") - return def - endif - let args = "-r./config/boot -r ".s:rquote(RailsRoot()."/config/environment")." -e ".s:rquote(a:ruby) - let cmd = s:rubyexestrwithfork(args) - " If the shell is messed up, this command could cause an error message - silent! let results = system(cmd) - if v:shell_error != 0 " results =~ '-e:\d' || results =~ 'ruby:.*(fatal)' - return def - else - return results - endif +" Convert a list to a path. From pathogen.vim +function! s:pathjoin(...) abort + let i = 0 + let path = "" + while i < a:0 + if type(a:000[i]) == type([]) + let list = a:000[i] + let j = 0 + while j < len(list) + let escaped = substitute(list[j],'[\\, ]','\\&','g') + if exists("+shellslash") && !&shellslash + let escaped = substitute(escaped,'^$\w:\\$\\','\1','') + endif + let path .= ',' . escaped + let j += 1 + endwhile + else + let path .= "," . a:000[i] + endif + let i += 1 + endwhile + return substitute(path,'^,','','') endfunction function! s:endof(lnum) @@ -199,14 +193,14 @@ function! s:endof(lnum) endif let endl = a:lnum while endl <= line('$') - let endl = endl + 1 + let endl += 1 if getline(endl) =~ '^'.spc.endpat return endl elseif getline(endl) =~ '^=begin\>' while getline(endl) !~ '^=end\>' && endl <= line('$') - let endl = endl + 1 + let endl += 1 endwhile - let endl = endl + 1 + let endl += 1 elseif getline(endl) !~ '^'.spc && getline(endl) !~ '^\s*\%(#.*\)\=$' return 0 endif @@ -214,25 +208,25 @@ function! s:endof(lnum) return 0 endfunction -function! s:lastmethodline(...) - if a:0 - let line = a:1 - else - let line = line(".") - endif - while line > 0 && getline(line) !~ &l:define - let line = line - 1 +function! s:lastopeningline(pattern,limit,...) + let line = a:0 ? a:1 : line(".") + while line > a:limit && getline(line) !~ a:pattern + let line -= 1 endwhile let lend = s:endof(line) - if lend < 0 || lend >= (a:0 ? a:1 : line(".")) + if line > a:limit && (lend < 0 || lend >= (a:0 ? a:1 : line("."))) return line else - return 0 + return -1 endif endfunction -function! s:lastmethod() - let line = s:lastmethodline() +function! s:lastmethodline(...) + return s:lastopeningline(&l:define,0,a:0 ? a:1 : line(".")) +endfunction + +function! s:lastmethod(...) + let line = s:lastmethodline(a:0 ? a:1 : line(".")) if line return s:sub(matchstr(getline(line),'\%('.&define.'\)\zs\h\%(\k\|[:.]\)*[?!=]\='),':$','') else @@ -241,21 +235,7 @@ function! s:lastmethod() endfunction function! s:lastrespondtoline(...) - let mline = s:lastmethodline() - if a:0 - let line = a:1 - else - let line = line(".") - endif - while line > mline && getline(line) !~ '\C^\s*respond_to\s*\%(\<do\)\s*|\zs\h\k*\ze|' - let line = line - 1 - endwhile - let lend = s:endof(line) - if lend >= (a:0 ? a:1 : line(".")) - return line - else - return -1 - endif + return s:lastopeningline('\C^\s*respond_to\s*\%(\<do\)\s*|\zs\h\k*\ze|',s:lastmethodline(), a:0 ? a:1 : line(".")) endfunction function! s:lastformat() @@ -268,7 +248,7 @@ function! s:lastformat() if match != '' return match endif - let line = line - 1 + let line -= 1 endwhile endif return "" @@ -281,15 +261,7 @@ function! s:format(...) let format = s:lastformat() endif if format == '' - if fnamemodify(RailsFilePath(),':e') == 'rhtml' - let format = 'html' - elseif fnamemodify(RailsFilePath(),':e') == 'rxml' - let format = 'xml' - elseif fnamemodify(RailsFilePath(),':e') == 'rjs' - let format = 'js' - elseif a:0 - return a:1 - endif + return get({'rhtml': 'html', 'rxml': 'xml', 'rjs': 'js'},fnamemodify(RailsFilePath(),':e'),a:0 ? a:1 : '') endif return format endfunction @@ -333,7 +305,7 @@ function! s:controller(...) elseif f =~ '\<public/stylesheets/.*\.css$' return s:sub(f,'.*<public/stylesheets/(.{-})\.css$','\1') elseif a:0 && a:1 - return s:pluralize(s:model()) + return rails#pluralize(s:model()) endif return "" endfunction @@ -354,62 +326,29 @@ function! s:model(...) elseif f =~ '\<spec/models/.*_spec\.rb$' return s:sub(f,'.*<spec/models/(.*)_spec\.rb$','\1') elseif f =~ '\<\%(test\|spec\)/fixtures/.*\.\w*\~\=$' - return s:singularize(s:sub(f,'.*<%(test|spec)/fixtures/(.*)\.\w*\~=$','\1')) + return rails#singularize(s:sub(f,'.*<%(test|spec)/fixtures/(.*)\.\w*\~=$','\1')) + elseif f =~ '\<\%(test\|spec\)/exemplars/.*_exemplar\.rb$' + return s:sub(f,'.*<%(test|spec)/exemplars/(.*)_exemplar\.rb$','\1') elseif a:0 && a:1 - return s:singularize(s:controller()) + return rails#singularize(s:controller()) endif return "" endfunction -function! s:underscore(str) - let str = s:gsub(a:str,'::','/') - let str = s:gsub(str,'(\u+)(\u\l)','\1_\2') - let str = s:gsub(str,'(\l|\d)(\u)','\1_\2') - let str = s:gsub(str,'-','_') - let str = tolower(str) - return str -endfunction - -function! s:camelize(str) - let str = s:gsub(a:str,'/(.)','::\u\1') - let str = s:gsub(str,'%([_-]|<)(.)','\u\1') - return str -endfunction - -function! s:singularize(word) - " Probably not worth it to be as comprehensive as Rails but we can - " still hit the common cases. - let word = a:word - if word =~? '\.js$' || word == '' - return word - endif - let word = s:sub(word,'eople$','ersons') - let word = s:sub(word,'[aeio]@<!ies$','ys') - let word = s:sub(word,'xe[ns]$','xs') - let word = s:sub(word,'ves$','fs') - let word = s:sub(word,'ss%(es)=$','sss') - let word = s:sub(word,'s$','') - return word -endfunction - -function! s:pluralize(word) - let word = a:word - if word == '' - return word +function! s:readfile(path,...) + let nr = bufnr('^'.a:path.'$') + if nr < 0 && exists('+shellslash') && ! &shellslash + let nr = bufnr('^'.s:gsub(a:path,'/','\\').'$') endif - let word = s:sub(word,'[aeio]@<!y$','ie') - let word = s:sub(word,'%([osxz]|[cs]h)$','&e') - let word = s:sub(word,'f@<!f$','ve') - let word = word."s" - let word = s:sub(word,'ersons$','eople') - return word -endfunction - -function! s:usesubversion() - if !exists("b:rails_use_subversion") - let b:rails_use_subversion = s:getopt("subversion","abg") && (RailsRoot()!="") && isdirectory(RailsRoot()."/.svn") + if bufloaded(nr) + return getbufline(nr,1,a:0 ? a:1 : '$') + elseif !filereadable(a:path) + return [] + elseif a:0 + return readfile(a:path,'',a:1) + else + return readfile(a:path) endif - return b:rails_use_subversion endfunction function! s:environment() @@ -420,13 +359,8 @@ function! s:environment() endif endfunction -function! s:environments(...) - let e = s:getopt("environment","abg") - if e == '' - return "development\ntest\nproduction" - else - return s:gsub(e,'[:;,- ]',"\n") - endif +function! s:Complete_environments(...) + return s:completion_filter(rails#app().environments(),a:0 ? a:1 : "") endfunction function! s:warn(str) @@ -446,7 +380,7 @@ function! s:error(str) endfunction function! s:debug(str) - if g:rails_debug + if exists("g:rails_debug") && g:rails_debug echohl Debug echomsg a:str echohl None @@ -458,6 +392,59 @@ endfunction " RailsRoot() is the only official public function +function! rails#underscore(str) + let str = s:gsub(a:str,'::','/') + let str = s:gsub(str,'(\u+)(\u\l)','\1_\2') + let str = s:gsub(str,'(\l|\d)(\u)','\1_\2') + let str = tolower(str) + return str +endfunction + +function! rails#camelize(str) + let str = s:gsub(a:str,'/(.=)','::\u\1') + let str = s:gsub(str,'%([_-]|<)(.)','\u\1') + return str +endfunction + +function! rails#singularize(word) + " Probably not worth it to be as comprehensive as Rails but we can + " still hit the common cases. + let word = a:word + if word =~? '\.js$' || word == '' + return word + endif + let word = s:sub(word,'eople$','ersons') + let word = s:sub(word,'[aeio]@<!ies$','ys') + let word = s:sub(word,'xe[ns]$','xs') + let word = s:sub(word,'ves$','fs') + let word = s:sub(word,'ss%(es)=$','sss') + let word = s:sub(word,'s$','') + let word = s:sub(word,'%(tatus|lias)\zse$','') + let word = s:sub(word,'%(nd|rt)\zsice$','ex') + return word +endfunction + +function! rails#pluralize(word) + let word = a:word + if word == '' + return word + endif + let word = s:sub(word,'[aeio]@<!y$','ie') + let word = s:sub(word,'%(nd|rt)@<=ex$','ice') + let word = s:sub(word,'%([osxz]|[cs]h)$','&e') + let word = s:sub(word,'f@<!f$','ve') + let word .= 's' + let word = s:sub(word,'ersons$','eople') + return word +endfunction + +function! rails#app(...) + let root = a:0 ? a:1 : RailsRoot() + " TODO: populate dynamically + " TODO: normalize path + return get(s:apps,root,0) +endfunction + function! RailsRevision() return 1000*matchstr(g:autoloaded_rails,'^\d\+')+matchstr(g:autoloaded_rails,'[1-9]\d*$') endfunction @@ -478,9 +465,17 @@ function! RailsFilePath() endif let f = s:gsub(expand('%:p'),'\\ @!','/') let f = s:sub(f,'/$','') - if s:gsub(b:rails_root,'\\ @!','/') == strpart(f,0,strlen(b:rails_root)) + let sep = matchstr(f,'^[^\\/]\{3,\}\zs[\\/]') + if sep != "" + let f = getcwd().sep.f + endif + if s:startswith(f,s:gsub(b:rails_root,'\\ @!','/')) || f == "" return strpart(f,strlen(b:rails_root)+1) else + if !exists("s:path_warn") + let s:path_warn = 1 + call s:warn("File ".f." does not appear to be under the Rails root ".b:rails_root.". Please report to the rails.vim author!") + endif return f endif endfunction @@ -492,19 +487,28 @@ endfunction function! RailsFileType() if !exists("b:rails_root") return "" - elseif exists("b:rails_file_type") - return b:rails_file_type elseif exists("b:rails_cached_file_type") return b:rails_cached_file_type + else + return rails#app().calculate_file_type(RailsFilePath()) endif - let f = RailsFilePath() - let e = fnamemodify(RailsFilePath(),':e') +endfunction + +function! s:app_calculate_file_type(path) dict + let f = a:path + let e = fnamemodify(f,':e') let r = "" - let top = getline(1)." ".getline(2)." ".getline(3)." ".getline(4)." ".getline(5).getline(6)." ".getline(7)." ".getline(8)." ".getline(9)." ".getline(10) + let full_path = self.path(f) + let nr = bufnr('^'.full_path.'$') + if nr < 0 && exists('+shellslash') && ! &shellslash + let nr = bufnr('^'.s:gsub(full_path,'/','\\').'$') + endif if f == "" let r = f + elseif nr > 0 && getbufvar(nr,'rails_file_type') != '' + return getbufvar(nr,'rails_file_type') elseif f =~ '_controller\.rb$' || f =~ '\<app/controllers/.*\.rb$' - if top =~ '\<wsdl_service_name\>' + if join(s:readfile(full_path,50),"\n") =~ '\<wsdl_service_name\>' let r = "controller-api" else let r = "controller" @@ -518,12 +522,12 @@ function! RailsFileType() elseif f =~ '_helper\.rb$' let r = "helper" elseif f =~ '\<app/models\>' + let top = join(s:readfile(full_path,50),"\n") let class = matchstr(top,'\<Acti\w\w\u\w\+\%(::\h\w*\)\+\>') - if class == "ActiveResoure::Base" + if class == "ActiveResource::Base" let class = "ares" let r = "model-ares" elseif class != '' - "let class = s:sub(class,'::Base$','') let class = tolower(s:gsub(class,'[^A-Z]','')) let r = "model-".s:sub(class,'^amb>','mailer') elseif f =~ '_mailer\.rb$' @@ -545,8 +549,18 @@ function! RailsFileType() let r = "test-functional" elseif f =~ '\<test/integration/.*_test\.rb$' let r = "test-integration" + elseif f =~ '\<spec/lib/.*_spec\.rb$' + let r = 'spec-lib' + elseif f =~ '\<lib/.*\.rb$' + let r = 'lib' elseif f =~ '\<spec/\w*s/.*_spec\.rb$' let r = s:sub(f,'.*<spec/(\w*)s/.*','spec-\1') + elseif f =~ '\<features/.*\.feature$' + let r = 'cucumber-feature' + elseif f =~ '\<features/step_definitions/.*_steps\.rb$' + let r = 'cucumber-steps' + elseif f =~ '\<features/.*\.rb$' + let r = 'cucumber' elseif f =~ '\<\%(test\|spec\)/fixtures\>' if e == "yml" let r = "fixtures-yaml" @@ -573,39 +587,99 @@ function! RailsFileType() return r endfunction -function! RailsType() - return RailsFileType() +function! s:app_environments() dict + if self.cache.needs('environments') + call self.cache.set('environments',self.relglob('config/environments/','**/*','.rb')) + endif + return copy(self.cache.get('environments')) endfunction -function! RailsEval(ruby,...) - if !exists("b:rails_root") - return a:0 ? a:1 : "" - elseif a:0 - return s:railseval(a:ruby,a:1) +" Check for Test::Unit and rSpec by calling this method with an argument of +" 'test' or 'spec'. Given no arguments, returns a list. +function! s:app_test_suites(...) dict + if self.cache.needs('test_suites') + let suites = filter(['test','spec'],'isdirectory(self.path(v:val))') + call self.cache.set('test_suites',suites) + endif + if a:0 + return index(self.cache.get('test_suites'),a:1) + 1 else - return s:railseval(a:ruby) + return copy(self.cache.get('test_suites')) endif endfunction +call s:add_methods('app',['calculate_file_type','environments','test_suites']) + " }}}1 -" Autocommand Functions {{{1 +" Ruby Execution {{{1 -function! s:QuickFixCmdPre() - if exists("b:rails_root") - if strpart(getcwd(),0,strlen(RailsRoot())) != RailsRoot() - let s:last_dir = getcwd() - echo "lchdir ".s:ra() - "exe "lchdir ".s:ra() - lchdir `=RailsRoot()` +function! s:app_ruby_shell_command(cmd) dict abort + if self.path() =~ '://' + return "ruby ".a:cmd + else + return "ruby -C ".s:rquote(self.path())." ".a:cmd + endif +endfunction + +function! s:app_background_ruby_command(cmd) dict abort + let cmd = s:esccmd(self.ruby_shell_command(a:cmd)) + if has_key(self,'options') && has_key(self.options,'gnu_screen') + let screen = self.options.gnu_screen + else + let screen = g:rails_gnu_screen + endif + if has("gui_win32") + if &shellcmdflag == "-c" && ($PATH . &shell) =~? 'cygwin' + silent exe "!cygstart -d ".s:rquote(self.path())." ruby ".a:cmd + else + exe "!start ".cmd endif + elseif exists("$STY") && !has("gui_running") && screen && executable("screen") + silent exe "!screen -ln -fn -t ".s:sub(s:sub(a:cmd,'\s.*',''),'^%(script|-rcommand)/','rails-').' '.cmd + else + exe "!".cmd + endif + return v:shell_error +endfunction + +function! s:app_execute_ruby_command(cmd) dict abort + exe "!".s:esccmd(self.ruby_shell_command(a:cmd)) + return v:shell_error +endfunction + +function! s:app_lightweight_ruby_eval(ruby,...) dict abort + let def = a:0 ? a:1 : "" + if !executable("ruby") + return def endif + let args = '-e '.s:rquote('begin; require %{rubygems}; rescue LoadError; end; begin; require %{active_support}; rescue LoadError; end; '.a:ruby) + let cmd = self.ruby_shell_command(args) + " If the shell is messed up, this command could cause an error message + silent! let results = system(cmd) + return v:shell_error == 0 ? results : def endfunction -function! s:QuickFixCmdPost() - if exists("s:last_dir") - "exe "lchdir ".s:escarg(s:last_dir) - lchdir `=s:last_dir` - unlet s:last_dir +function! s:app_eval(ruby,...) dict abort + let def = a:0 ? a:1 : "" + if !executable("ruby") + return def + endif + let args = "-r./config/boot -r ".s:rquote(self.path("config/environment"))." -e ".s:rquote(a:ruby) + let cmd = self.ruby_shell_command(args) + " If the shell is messed up, this command could cause an error message + silent! let results = system(cmd) + return v:shell_error == 0 ? results : def +endfunction + +call s:add_methods('app', ['ruby_shell_command','execute_ruby_command','background_ruby_command','lightweight_ruby_eval','eval']) + +function! RailsEval(ruby,...) abort + if !exists("b:rails_root") + return a:0 ? a:1 : "" + elseif a:0 + return rails#app().eval(a:ruby,a:1) + else + return rails#app().eval(a:ruby) endif endfunction @@ -636,14 +710,14 @@ function! RailsHelpCommand(...) endfunction function! s:BufCommands() - call s:BufFinderCommands() " Provides Rcommand! + call s:BufFinderCommands() call s:BufNavCommands() call s:BufScriptWrappers() - Rcommand! -buffer -bar -nargs=? -bang -complete=custom,s:RakeComplete Rake :call s:Rake(<bang>0,<q-args>) - Rcommand! -buffer -bar -nargs=? -bang -complete=custom,s:PreviewComplete Rpreview :call s:Preview(<bang>0,<q-args>) - Rcommand! -buffer -bar -nargs=? -bang -complete=custom,s:environments Rlog :call s:Log(<bang>0,<q-args>) - Rcommand! -buffer -bar -nargs=* -bang -complete=custom,s:SetComplete Rset :call s:Set(<bang>0,<f-args>) - command! -buffer -bar -nargs=0 Rtags :call s:Tags(<bang>0) + command! -buffer -bar -nargs=? -bang -count -complete=customlist,s:Complete_rake Rake :call s:Rake(<bang>0,!<count> && <line1> ? -1 : <count>,<q-args>) + command! -buffer -bar -nargs=? -bang -range -complete=customlist,s:Complete_preview Rpreview :call s:Preview(<bang>0,<line1>,<q-args>) + command! -buffer -bar -nargs=? -bang -complete=customlist,s:Complete_environments Rlog :call s:Log(<bang>0,<q-args>) + command! -buffer -bar -nargs=* -bang -complete=customlist,s:Complete_set Rset :call s:Set(<bang>0,<f-args>) + command! -buffer -bar -nargs=0 Rtags :call rails#app().tags_command() " Embedding all this logic directly into the command makes the error " messages more concise. command! -buffer -bar -nargs=? -bang Rdoc : @@ -652,15 +726,17 @@ function! s:BufCommands() \ else | call s:Doc(<bang>0,<q-args>) | endif command! -buffer -bar -nargs=0 -bang Rrefresh :if <bang>0|unlet! g:autoloaded_rails|source `=s:file`|endif|call s:Refresh(<bang>0) if exists(":Project") - command! -buffer -bar -nargs=? -bang Rproject :call s:Project(<bang>0,<q-args>) + command! -buffer -bar -nargs=? Rproject :call s:Project(<bang>0,<q-args>) + elseif exists(":NERDTree") + command! -buffer -bar -nargs=? Rproject :NERDTree `=rails#app().path()` endif if exists("g:loaded_dbext") - Rcommand! -buffer -bar -nargs=? -bang -complete=custom,s:environments Rdbext :call s:BufDatabase(2,<q-args>,<bang>0) + command! -buffer -bar -nargs=? -bang -complete=customlist,s:Complete_environments Rdbext :call s:BufDatabase(2,<q-args>,<bang>0)|let b:dbext_buffer_defaulted = 1 endif let ext = expand("%:e") if ext =~ s:viewspattern() " TODO: complete controller names with trailing slashes here - Rcommand! -buffer -bar -nargs=? -range -complete=custom,s:controllerList Rextract :<line1>,<line2>call s:Extract(<bang>0,<f-args>) + command! -buffer -bar -nargs=? -range -complete=customlist,s:controllerList Rextract :<line1>,<line2>call s:Extract(<bang>0,<f-args>) command! -buffer -bar -nargs=? -range Rpartial :call s:warn("Warning: :Rpartial has been deprecated in favor of :Rextract") | <line1>,<line2>Rextract<bang> <args> endif if RailsFilePath() =~ '\<db/migrate/.*\.rb$' @@ -676,8 +752,8 @@ function! s:Doc(bang, string) else return s:error("specify a g:rails_search_url with %s for a query placeholder") endif - elseif isdirectory(RailsRoot()."/doc/api/classes") - let url = RailsRoot()."/doc/api/index.html" + elseif isdirectory(rails#app().path("doc/api/classes")) + let url = rails#app().path("/doc/api/index.html") elseif s:getpidfor("0.0.0.0","8808") > 0 let url = "http://localhost:8808" else @@ -697,7 +773,7 @@ function! s:Log(bang,arg) else let lf = "log/".a:arg.".log" endif - let size = getfsize(RailsRoot()."/".lf) + let size = getfsize(rails#app().path(lf)) if size >= 1048576 call s:warn("Log file is ".((size+512)/1024)."KB. Consider :Rake log:clear") endif @@ -706,16 +782,14 @@ function! s:Log(bang,arg) clast else if exists(":Tail") - " TODO: check if :Tail works with `=` - exe "Tail ".s:ra().'/'.lf + Tail `=rails#app().path(lf)` else - "exe "pedit ".s:ra().'/'.lf - pedit `=RailsRoot().'/'.lf` + pedit `=rails#app().path(lf)` endif endif endfunction -function! RailsNewApp(bang,...) +function! rails#new_app_command(bang,...) if a:0 == 0 if a:bang echo "rails.vim version ".g:autoloaded_rails @@ -735,30 +809,24 @@ function! RailsNewApp(bang,...) let str = "" let c = 1 while c <= a:0 - let str = str . " " . s:rquote(expand(a:{c})) - let c = c + 1 + let str .= " " . s:rquote(expand(a:{c})) + let c += 1 endwhile - "let str = s:sub(str,'^ ','') let dir = expand(dir) - if isdirectory(fnamemodify(dir,':h')."/.svn") && g:rails_subversion - let append = " -c" - else - let append = "" - endif + let append = "" if g:rails_default_database != "" && str !~ '-d \|--database=' - let append = append." -d ".g:rails_default_database + let append .= " -d ".g:rails_default_database endif if a:bang - let append = append." --force" + let append .= " --force" endif exe "!rails".append.str if filereadable(dir."/".g:rails_default_file) - "exe "edit ".s:escarg(dir)."/".g:rails_default_file edit `=dir.'/'.g:rails_default_file` endif endfunction -function! s:Tags(bang) +function! s:app_tags_command() dict if exists("g:Tlist_Ctags_Cmd") let cmd = g:Tlist_Ctags_Cmd elseif executable("exuberant-ctags") @@ -772,36 +840,37 @@ function! s:Tags(bang) else return s:error("ctags not found") endif - exe "!".cmd." -R ".s:ra() + exe "!".cmd." -f ".s:escarg(self.path("tmp/tags"))." --exclude=facebox.js --exclude=\"*.*.js\" --langmap=\"ruby:+.rake.builder.rjs\" -R ".s:escarg(self.path()) endfunction +call s:add_methods('app',['tags_command']) + function! s:Refresh(bang) - " What else? - if a:bang - unlet! s:rails_helper_methods - endif if exists("g:rubycomplete_rails") && g:rubycomplete_rails && has("ruby") silent! ruby ActiveRecord::Base.reset_subclasses if defined?(ActiveRecord) - silent! ruby Dependencies.clear if defined?(Dependencies) + silent! ruby if defined?(ActiveSupport::Dependencies); ActiveSupport::Dependencies.clear; elsif defined?(Dependencies); Dependencies.clear; end if a:bang silent! ruby ActiveRecord::Base.clear_reloadable_connections! if defined?(ActiveRecord) endif endif - call s:cacheclear() + call rails#app().cache.clear() silent doautocmd User BufLeaveRails - if a:bang && s:cacheworks() - let s:cache = {} + if a:bang + for key in keys(s:apps) + if type(s:apps[key]) == type({}) + call s:apps[key].cache.clear() + endif + call extend(s:apps[key],filter(copy(s:app_prototype),'type(v:val) == type(function("tr"))'),'force') + endfor endif let i = 1 let max = bufnr('$') while i <= max let rr = getbufvar(i,"rails_root") if rr != "" - unlet! s:user_classes_{s:escvar(rr)} - unlet! s:dbext_type_{s:escvar(rr)} call setbufvar(i,"rails_refresh",1) endif - let i = i + 1 + let i += 1 endwhile silent doautocmd User BufEnterRails endfunction @@ -809,7 +878,7 @@ endfunction function! s:RefreshBuffer() if exists("b:rails_refresh") && b:rails_refresh let oldroot = b:rails_root - unlet! b:rails_root b:rails_use_subversion + unlet! b:rails_root let b:rails_refresh = 0 call RailsBufInit(oldroot) unlet! b:rails_refresh @@ -819,7 +888,25 @@ endfunction " }}}1 " Rake {{{1 -" Depends: s:rubyexestrwithfork, s:sub, s:lastmethodline, s:getopt, s;rquote, s:QuickFixCmdPre, ... +function! s:app_rake_tasks() dict + if self.cache.needs('rake_tasks') + call s:push_chdir() + try + let lines = split(system("rake -T"),"\n") + finally + call s:pop_command() + endtry + if v:shell_error != 0 + return [] + endif + call map(lines,'matchstr(v:val,"^rake\\s\\+\\zs\\S*")') + call filter(lines,'v:val != ""') + call self.cache.set('rake_tasks',lines) + endif + return self.cache.get('rake_tasks') +endfunction + +call s:add_methods('app', ['rake_tasks']) " Current directory let s:efm='%D(in\ %f),' @@ -887,12 +974,18 @@ function! s:makewithruby(arg,...) endif endif let old_make = &makeprg - let &l:makeprg = s:rubyexestrwithfork(a:arg) + let &l:makeprg = rails#app().ruby_shell_command(a:arg) make let &l:makeprg = old_make endfunction -function! s:Rake(bang,arg) +function! s:Rake(bang,lnum,arg) + let self = rails#app() + let lnum = a:lnum < 0 ? 0 : a:lnum + if &l:makeprg !~# 'rake' + let old_make = &makeprg + let &makeprg = 'rake' + endif let oldefm = &efm if a:bang let &l:errorformat = s:efm_backtrace @@ -900,8 +993,8 @@ function! s:Rake(bang,arg) let t = RailsFileType() let arg = a:arg if &filetype == "ruby" && arg == '' && g:rails_modelines - let lnum = s:lastmethodline() - let str = getline(lnum)."\n".getline(lnum+1)."\n".getline(lnum+2)."\n" + let mnum = s:lastmethodline(lnum) + let str = getline(mnum)."\n".getline(mnum+1)."\n".getline(mnum+2)."\n" let pat = '\s\+\zs.\{-\}\ze\%(\n\|\s\s\|#{\@!\|$\)' let mat = matchstr(str,'#\s*rake'.pat) let mat = s:sub(mat,'\s+$','') @@ -915,25 +1008,25 @@ function! s:Rake(bang,arg) let arg = opt endif endif - let withrubyargs = '-r ./config/boot -r '.s:rquote(RailsRoot().'/config/environment').' -e "puts \%((in \#{Dir.getwd}))" ' - if arg =~# '^\%(stats\|routes\|notes\|db:\%(charset\|collation\|version\)\)\%(:\|$\)' + let withrubyargs = '-r ./config/boot -r '.s:rquote(self.path('config/environment')).' -e "puts \%((in \#{Dir.getwd}))" ' + if arg =~# '^\%(stats\|routes\|secret\|notes\|db:\%(charset\|collation\|fixtures:identify\|version\)\)\%(:\|$\)' " So you can see the output even with an inadequate redirect - call s:QuickFixCmdPre() + call s:push_chdir() exe "!".&makeprg." ".arg - call s:QuickFixCmdPost() + call s:pop_command() elseif arg =~ '^preview\>' - exe 'R'.s:gsub(arg,':','/') + exe (lnum == 0 ? '' : lnum).'R'.s:gsub(arg,':','/') elseif arg =~ '^runner:' let arg = s:sub(arg,'^runner:','') let root = matchstr(arg,'%\%(:\w\)*') let file = expand(root).matchstr(arg,'%\%(:\w\)*\zs.*') - if file =~ '[@#].*$' - let extra = " -- -n ".matchstr(file,'[@#]\zs.*') - let file = s:sub(file,'[@#].*','') + if file =~ '#.*$' + let extra = " -- -n ".matchstr(file,'#\zs.*') + let file = s:sub(file,'#.*','') else let extra = '' endif - if s:hasfile(file) || s:hasfile(file.'.rb') + if self.has_file(file) || self.has_file(file.'.rb') call s:makewithruby(withrubyargs.'-r"'.file.'"'.extra,file !~# '_\%(spec\|test\)\%(\.rb\)\=$') else call s:makewithruby(withrubyargs.'-e '.s:esccmd(s:rquote(arg))) @@ -943,28 +1036,40 @@ function! s:Rake(bang,arg) elseif arg =~ '^run:' let arg = s:sub(arg,'^run:','') let arg = s:sub(arg,'^%:h',expand('%:h')) - let arg = s:sub(arg,'^%(\%|$|[@#]@=)',expand('%')) - let arg = s:sub(arg,'[@#](\w+)$',' -- -n\1') + let arg = s:sub(arg,'^%(\%|$|#@=)',expand('%')) + let arg = s:sub(arg,'#(\w+[?!=]=)$',' -- -n\1') call s:makewithruby(withrubyargs.'-r'.arg,arg !~# '_\%(spec\|test\)\.rb$') elseif arg != '' exe 'make '.arg + elseif t =~ '^config-routes\>' + call s:push_chdir() + exe "!".&makeprg." routes" + call s:pop_command() + elseif t =~ '^fixtures-yaml\>' && lnum + call s:push_chdir() + exe "!".&makeprg." db:fixtures:identify LABEL=".s:lastmethod(lnum) + call s:pop_command() + elseif t =~ '^fixtures\>' && lnum == 0 + exe "make db:fixtures:load FIXTURES=".s:sub(fnamemodify(RailsFilePath(),':r'),'^.{-}/fixtures/','') elseif t =~ '^task\>' - let lnum = s:lastmethodline() - let line = getline(lnum) + let mnum = s:lastmethodline(lnum) + let line = getline(mnum) " We can't grab the namespace so only run tasks at the start of the line if line =~ '^\%(task\|file\)\>' - exe 'make '.s:lastmethod() + exe 'make '.s:lastmethod(lnum) else make endif elseif t =~ '^spec\>' - if RailsFilePath() =~# '\<test/test_helper\.rb$' + if RailsFilePath() =~# '\<spec/spec_helper\.rb$' make spec SPEC_OPTS= + elseif lnum > 0 + exe 'make spec SPEC="%:p" SPEC_OPTS=--line='.lnum else make spec SPEC="%:p" SPEC_OPTS= endif elseif t =~ '^test\>' - let meth = s:lastmethod() + let meth = s:lastmethod(lnum) if meth =~ '^test_' let call = " -n".meth."" else @@ -980,38 +1085,57 @@ function! s:Rake(bang,arg) elseif t=~ '^\%(db-\)\=migration\>' && RailsFilePath() !~# '\<db/schema\.rb$' let ver = matchstr(RailsFilePath(),'\<db/migrate/0*\zs\d*\ze_') if ver != "" - exe "make db:migrate VERSION=".ver + let method = s:lastmethod(lnum) + if method == "down" + exe "make db:migrate:down VERSION=".ver + elseif method == "up" + exe "make db:migrate:up VERSION=".ver + elseif lnum > 0 + exe "make db:migrate:down db:migrate:up VERSION=".ver + else + exe "make db:migrate VERSION=".ver + endif else make db:migrate endif + elseif self.test_suites('spec') && RailsFilePath() =~# '^app/.*\.rb' && self.has_file(s:sub(RailsFilePath(),'^app/(.*)\.rb$','spec/\1_spec.rb')) + make spec SPEC="%:p:r:s?[\/]app[\/]?/spec/?_spec.rb" SPEC_OPTS= elseif t=~ '^model\>' make test:units TEST="%:p:r:s?[\/]app[\/]models[\/]?/test/unit/?_test.rb" elseif t=~ '^api\>' make test:units TEST="%:p:r:s?[\/]app[\/]apis[\/]?/test/functional/?_test.rb" elseif t=~ '^\<\%(controller\|helper\|view\)\>' if RailsFilePath() =~ '\<app/' && s:controller() !~# '^\%(application\)\=$' - exe 'make test:functionals TEST="'.s:ra().'/test/functional/'.s:controller().'_controller_test.rb"' + exe 'make test:functionals TEST="'.s:escarg(rails#app().path('test/functional/'.s:controller().'_controller_test.rb')).'"' else make test:functionals endif + elseif t =~ '^cucumber-feature\>' + if lnum > 0 + exe 'make features FEATURE="%:p":'.lnum + else + make features FEATURE="%:p" + endif + elseif t =~ '^cucumber\>' + make features else make endif if oldefm != '' let &l:errorformat = oldefm endif + if exists('old_make') + let &l:makeprg = old_make + endif endfunction -function! s:RakeComplete(A,L,P) - return g:rails_rake_tasks +function! s:Complete_rake(A,L,P) + return s:completion_filter(rails#app().rake_tasks(),a:A) endfunction " }}}1 " Preview {{{1 -" Depends: s:getopt, s:sub, s:controller, s:lastmethod -" Provides: s:initOpenURL - function! s:initOpenURL() if !exists(":OpenURL") if has("gui_mac") || has("gui_macvim") || exists("$SECURITYSESSIONID") @@ -1032,12 +1156,7 @@ function! s:scanlineforuri(lnum) let method = matchstr(url,'^\u\+') let url = matchstr(url,'\s\+\zs.*') if method !=? "GET" - if url =~ '?' - let url = url.'&' - else - let url = url.'?' - endif - let url = url.'_method='.tolower(method) + let url .= (url =~ '?' ? '&' : '?') . '_method='.tolower(method) endif endif if url != "" @@ -1047,26 +1166,26 @@ function! s:scanlineforuri(lnum) endif endfunction -function! s:defaultpreview() +function! s:defaultpreview(lnum) let ret = '' - if s:getopt('preview','l') != '' - let uri = s:getopt('preview','l') + if s:getopt('preview','l',a:lnum) != '' + let uri = s:getopt('preview','l',a:lnum) elseif s:controller() != '' && s:controller() != 'application' && RailsFilePath() !~ '^public/' if RailsFileType() =~ '^controller\>' - let start = s:lastmethodline() - 1 + let start = s:lastmethodline(a:lnum) - 1 if start + 1 while getline(start) =~ '^\s*\%(#.*\)\=$' let ret = s:scanlineforuri(start).ret - let start = start - 1 + let start -= 1 endwhile - let ret = ret.s:controller().'/'.s:lastmethod().'/' + let ret .= s:controller().'/'.s:lastmethod(a:lnum).'/' else - let ret = ret.s:controller().'/' + let ret .= s:controller().'/' endif elseif s:getopt('preview','b') != '' let ret = s:getopt('preview','b') elseif RailsFileType() =~ '^view\%(-partial\|-layout\)\@!' - let ret = ret.s:controller().'/'.expand('%:t:r:r').'/' + let ret .= s:controller().'/'.expand('%:t:r:r').'/' endif elseif s:getopt('preview','b') != '' let uri = s:getopt('preview','b') @@ -1078,7 +1197,7 @@ function! s:defaultpreview() return ret endfunction -function! s:Preview(bang,arg) +function! s:Preview(bang,lnum,arg) let root = s:getopt("root_url") if root == '' let root = s:getopt("url") @@ -1089,7 +1208,7 @@ function! s:Preview(bang,arg) elseif a:arg != '' let uri = root.'/'.s:sub(a:arg,'^/','') else - let uri = matchstr(s:defaultpreview(),'.\{-\}\%(\n\@=\|$\)') + let uri = matchstr(s:defaultpreview(a:lnum),'.\{-\}\%(\n\@=\|$\)') let uri = root.'/'.s:sub(s:sub(uri,'^/',''),'/$','') endif call s:initOpenURL() @@ -1109,7 +1228,7 @@ function! s:Preview(bang,arg) setlocal filetype=xhtml endif endif - call RailsBufInit(RailsRoot()) + call RailsBufInit(rails#app().path()) map <buffer> <silent> q :bwipe<CR> wincmd p if !a:bang @@ -1118,47 +1237,61 @@ function! s:Preview(bang,arg) endif endfunction -function! s:PreviewComplete(A,L,P) - return s:defaultpreview() +function! s:Complete_preview(A,L,P) + return split(s:defaultpreview(a:L =~ '^\d' ? matchstr(a:L,'^\d\+') : line('.')),"\n") endfunction " }}}1 " Script Wrappers {{{1 -" Depends: s:rquote, s:rubyexebg, s:rubyexe, s:rubyexestrwithfork, s:sub, s:getopt, s:usesubversion, s:user_classes_..., ..., s:pluginList, ... - function! s:BufScriptWrappers() - Rcommand! -buffer -bar -nargs=+ -complete=custom,s:ScriptComplete Rscript :call s:Script(<bang>0,<f-args>) - Rcommand! -buffer -bar -nargs=* -complete=custom,s:ConsoleComplete Rconsole :call s:Console(<bang>0,'console',<f-args>) - "Rcommand! -buffer -bar -nargs=* Rbreakpointer :call s:Console(<bang>0,'breakpointer',<f-args>) - Rcommand! -buffer -bar -nargs=* -complete=custom,s:GenerateComplete Rgenerate :call s:Generate(<bang>0,<f-args>) - Rcommand! -buffer -bar -nargs=* -complete=custom,s:DestroyComplete Rdestroy :call s:Destroy(<bang>0,<f-args>) - Rcommand! -buffer -bar -nargs=? -bang -complete=custom,s:ServerComplete Rserver :call s:Server(<bang>0,<q-args>) - Rcommand! -buffer -bang -nargs=1 -range=0 -complete=custom,s:RubyComplete Rrunner :call s:Runner(<bang>0 ? -2 : (<count>==<line2>?<count>:-1),<f-args>) - Rcommand! -buffer -nargs=1 -range=0 -complete=custom,s:RubyComplete Rp :call s:Runner(<count>==<line2>?<count>:-1,'p begin '.<f-args>.' end') - Rcommand! -buffer -nargs=1 -range=0 -complete=custom,s:RubyComplete Rpp :call s:Runner(<count>==<line2>?<count>:-1,'require %{pp}; pp begin '.<f-args>.' end') - Rcommand! -buffer -nargs=1 -range=0 -complete=custom,s:RubyComplete Ry :call s:Runner(<count>==<line2>?<count>:-1,'y begin '.<f-args>.' end') -endfunction - -function! s:Script(bang,cmd,...) + command! -buffer -bar -nargs=* -complete=customlist,s:Complete_script Rscript :call rails#app().script_command(<bang>0,<f-args>) + command! -buffer -bar -nargs=* -complete=customlist,s:Complete_console Rconsole :call s:warn("Warning: :Rconsole has been deprecated in favor of :Rscript")|call rails#app().script_command(<bang>0,'console',<f-args>) + command! -buffer -bar -nargs=* -complete=customlist,s:Complete_generate Rgenerate :call rails#app().generate_command(<bang>0,<f-args>) + command! -buffer -bar -nargs=* -complete=customlist,s:Complete_destroy Rdestroy :call rails#app().destroy_command(<bang>0,<f-args>) + command! -buffer -bar -nargs=? -bang -complete=customlist,s:Complete_server Rserver :call rails#app().server_command(<bang>0,<q-args>) + command! -buffer -bang -nargs=1 -range=0 -complete=customlist,s:Complete_ruby Rrunner :call rails#app().runner_command(<bang>0 ? -2 : (<count>==<line2>?<count>:-1),<f-args>) + command! -buffer -nargs=1 -range=0 -complete=customlist,s:Complete_ruby Rp :call rails#app().runner_command(<count>==<line2>?<count>:-1,'p begin '.<f-args>.' end') + command! -buffer -nargs=1 -range=0 -complete=customlist,s:Complete_ruby Rpp :call rails#app().runner_command(<count>==<line2>?<count>:-1,'require %{pp}; pp begin '.<f-args>.' end') + command! -buffer -nargs=1 -range=0 -complete=customlist,s:Complete_ruby Ry :call rails#app().runner_command(<count>==<line2>?<count>:-1,'y begin '.<f-args>.' end') +endfunction + +function! s:app_generators() dict + if self.cache.needs('generators') + let generators = self.relglob("vendor/plugins/","*/generators/*") + let generators += self.relglob("","lib/generators/*") + call filter(generators,'v:val =~ "/$"') + let generators += split(glob(expand("~/.rails/generators")."/*"),"\n") + call map(generators,'s:sub(v:val,"^.*[\\\\/]generators[\\\\/]\\ze.","")') + call map(generators,'s:sub(v:val,"[\\\\/]$","")') + call self.cache.set('generators',generators) + endif + return sort(split(g:rails_generators,"\n") + self.cache.get('generators')) +endfunction + +function! s:app_script_command(bang,...) dict let str = "" - let c = 1 + let cmd = a:0 ? a:1 : "console" + let c = 2 while c <= a:0 - let str = str . " " . s:rquote(a:{c}) - let c = c + 1 + let str .= " " . s:rquote(a:{c}) + let c += 1 endwhile - if a:bang - call s:rubyexebg(s:rquote("script/".a:cmd).str) + if cmd ==# "plugin" + call self.cache.clear('generators') + endif + if a:bang || cmd =~# 'console' + return self.background_ruby_command(s:rquote("script/".cmd).str) else - call s:rubyexe(s:rquote("script/".a:cmd).str) + return self.execute_ruby_command(s:rquote("script/".cmd).str) endif endfunction -function! s:Runner(count,args) +function! s:app_runner_command(count,args) dict if a:count == -2 - call s:Script(a:bang,"runner",a:args) + return self.script_command(a:bang,"runner",a:args) else - let str = s:rubyexestrwithfork('-r./config/boot -e "require '."'commands/runner'".'" '.s:rquote(a:args)) + let str = self.ruby_shell_command('-r./config/boot -e "require '."'commands/runner'".'" '.s:rquote(a:args)) let res = s:sub(system(str),'\n$','') if a:count < 0 echo res @@ -1168,16 +1301,6 @@ function! s:Runner(count,args) endif endfunction -function! s:Console(bang,cmd,...) - let str = "" - let c = 1 - while c <= a:0 - let str = str . " " . s:rquote(a:{c}) - let c = c + 1 - endwhile - call s:rubyexebg(s:rquote("script/".a:cmd).str) -endfunction - function! s:getpidfor(bind,port) if has("win32") || has("win64") let netstat = system("netstat -anop tcp") @@ -1191,7 +1314,7 @@ function! s:getpidfor(bind,port) return pid endfunction -function! s:Server(bang,arg) +function! s:app_server_command(bang,arg) dict let port = matchstr(a:arg,'\%(-p\|--port=\=\)\s*\zs\d\+') if port == '' let port = "3000" @@ -1213,190 +1336,186 @@ function! s:Server(bang,arg) return endif endif - if has("win32") || has("win64") || (exists("$STY") && !has("gui_running") && s:getopt("gnu_screen","abg") && executable("screen")) - call s:rubyexebg(s:rquote("script/server")." ".a:arg) + if has_key(self,'options') && has_key(self.options,'gnu_screen') + let screen = self.options.gnu_screen + else + let screen = g:rails_gnu_screen + endif + if has("win32") || has("win64") || (exists("$STY") && !has("gui_running") && screen && executable("screen")) + call self.background_ruby_command(s:rquote("script/server")." ".a:arg) else "--daemon would be more descriptive but lighttpd does not support it - call s:rubyexe(s:rquote("script/server")." ".a:arg." -d") + call self.execute_ruby_command(s:rquote("script/server")." ".a:arg." -d") endif call s:setopt('a:root_url','http://'.(bind=='0.0.0.0'?'localhost': bind).':'.port.'/') endfunction -function! s:Destroy(bang,...) +function! s:app_destroy_command(bang,...) dict if a:0 == 0 - call s:rubyexe("script/destroy") - return + return self.execute_ruby_command("script/destroy") elseif a:0 == 1 - call s:rubyexe("script/destroy ".s:rquote(a:1)) - return + return self.execute_ruby_command("script/destroy ".s:rquote(a:1)) endif let str = "" let c = 1 while c <= a:0 - let str = str . " " . s:rquote(a:{c}) - let c = c + 1 + let str .= " " . s:rquote(a:{c}) + let c += 1 endwhile - call s:rubyexe(s:rquote("script/destroy").str.(s:usesubversion()?' -c':'')) - unlet! s:user_classes_{s:rv()} + call self.execute_ruby_command(s:rquote("script/destroy").str) + call self.cache.clear('user_classes') endfunction -function! s:Generate(bang,...) +function! s:app_generate_command(bang,...) dict if a:0 == 0 - call s:rubyexe("script/generate") - return + return self.execute_ruby_command("script/generate") elseif a:0 == 1 - call s:rubyexe("script/generate ".s:rquote(a:1)) - return + return self.execute_ruby_command("script/generate ".s:rquote(a:1)) endif let target = s:rquote(a:1) let str = "" let c = 2 while c <= a:0 - let str = str . " " . s:rquote(a:{c}) - let c = c + 1 + let str .= " " . s:rquote(a:{c}) + let c += 1 endwhile if str !~ '-p\>' && str !~ '--pretend\>' - let execstr = s:rubyexestr('-r./config/boot -e "require '."'commands/generate'".'" -- '.target." -p -f".str) + let execstr = self.ruby_shell_command('-r./config/boot -e "require '."'commands/generate'".'" -- '.target." -p -f".str) let res = system(execstr) let file = matchstr(res,'\s\+\%(create\|force\)\s\+\zs\f\+\.rb\ze\n') if file == "" let file = matchstr(res,'\s\+\%(exists\)\s\+\zs\f\+\.rb\ze\n') endif - "echo file else let file = "" endif - if !s:rubyexe("script/generate ".target.(s:usesubversion()?' -c':'').str) && file != "" - unlet! s:user_classes_{s:rv()} - "exe "edit ".s:ra()."/".file - edit `=RailsRoot().'/'.file` + if !self.execute_ruby_command("script/generate ".target.str) && file != "" + call self.cache.clear('user_classes') + call self.cache.clear('test_suites') + if file =~ '^db/migrate/\d\d\d\d' + let file = get(self.relglob('',s:sub(file,'\d+','[0-9]*[0-9]')),-1,file) + endif + edit `=self.path(file)` endif endfunction -function! s:ScriptComplete(ArgLead,CmdLine,P) +call s:add_methods('app', ['generators','script_command','runner_command','server_command','destroy_command','generate_command']) + +function! s:Complete_script(ArgLead,CmdLine,P) let cmd = s:sub(a:CmdLine,'^\u\w*\s+','') - let P = a:P - strlen(a:CmdLine)+strlen(cmd) - if cmd !~ '^[ A-Za-z0-9_=-]*$' - " You're on your own, bud - return "" - elseif cmd =~ '^\w*$' - return "about\nconsole\ndestroy\ngenerate\nperformance/benchmarker\nperformance/profiler\nplugin\nproccess/reaper\nprocess/spawner\nrunner\nserver" - elseif cmd =~ '^\%(plugin\)\s\+'.a:ArgLead.'$' - return "discover\nlist\ninstall\nupdate\nremove\nsource\nunsource\nsources" - elseif cmd =~ '\%(plugin\)\s\+\%(install\|remove\)\s\+'.a:ArgLead.'$' || cmd =~ '\%(generate\|destroy\)\s\+plugin\s\+'.a:ArgLead.'$' + "let P = a:P - strlen(a:CmdLine)+strlen(cmd) + if cmd !~ '^[ A-Za-z0-9_=:-]*$' + return [] + elseif cmd =~# '^\w*$' + return s:completion_filter(rails#app().relglob("script/","**/*"),a:ArgLead) + elseif cmd =~# '^\%(plugin\)\s\+'.a:ArgLead.'$' + return s:completion_filter(["discover","list","install","update","remove","source","unsource","sources"],a:ArgLead) + elseif cmd =~# '\%(plugin\)\s\+\%(install\|remove\)\s\+'.a:ArgLead.'$' || cmd =~ '\%(generate\|destroy\)\s\+plugin\s\+'.a:ArgLead.'$' return s:pluginList(a:ArgLead,a:CmdLine,a:P) - elseif cmd =~ '^\%(generate\|destroy\)\s\+'.a:ArgLead.'$' - return g:rails_generators - elseif cmd =~ '^\%(generate\|destroy\)\s\+\w\+\s\+'.a:ArgLead.'$' + elseif cmd =~# '^\%(generate\|destroy\)\s\+'.a:ArgLead.'$' + return s:completion_filter(rails#app().generators(),a:ArgLead) + elseif cmd =~# '^\%(generate\|destroy\)\s\+\w\+\s\+'.a:ArgLead.'$' let target = matchstr(cmd,'^\w\+\s\+\zs\w\+\ze\s\+') - let pattern = "" " TODO if target =~# '^\%(\w*_\)\=controller$' - return s:sub(s:controllerList(pattern,"",""),'^application\n=','') - elseif target =~# '^\%(\w*_\)\=model$' || target =~# '^scaffold\%(_resource\)\=$' || target == 'mailer' - return s:modelList(pattern,"","") - elseif target == 'migration' || target == 'session_migration' - return s:migrationList(pattern,"","") - elseif target == 'integration_test' - return s:integrationtestList(pattern,"","") - elseif target == 'observer' - " script/generate observer is in Edge Rails - let observers = s:observerList(pattern,"","") - let models = s:modelList(pattern,"","") - if cmd =~ '^destroy\>' - let models = "" + return filter(s:controllerList(a:ArgLead,"",""),'v:val !=# "application"') + elseif target =~# '^\%(\w*_\)\=model$' || target =~# '^scaffold\%(_resource\)\=$' || target ==# 'mailer' + return s:modelList(a:ArgLead,"","") + elseif target ==# 'migration' || target ==# 'session_migration' + return s:migrationList(a:ArgLead,"","") + elseif target ==# 'integration_test' + return s:integrationtestList(a:ArgLead,"","") + elseif target ==# 'observer' + let observers = s:observerList("","","") + let models = s:modelList("","","") + if cmd =~# '^destroy\>' + let models = [] endif - while strlen(models) > 0 - let tmp = matchstr(models."\n",'.\{-\}\ze\n') - let models = s:sub(models,'.{-}%(\n|$)','') - if stridx("\n".observers."\n","\n".tmp."\n") == -1 && tmp !~'_observer$' - let observers = observers."\n".tmp - endif - endwhile - return s:sub(observers,'^\n','') - elseif target == 'web_service' - return s:apiList(pattern,"","") + call filter(models,'index(observers,v:val) < 0') + return s:completion_filter(observers + models,a:ArgLead) + elseif target ==# 'web_service' + return s:apiList(a:ArgLead,"","") + else + return [] + endif + elseif cmd =~# '^\%(generate\|destroy\)\s\+scaffold\s\+\w\+\s\+'.a:ArgLead.'$' + return filter(s:controllerList(a:ArgLead,"",""),'v:val !=# "application"') + return s:completion_filter(rails#app().environments()) + elseif cmd =~# '^\%(console\)\s\+$--\=\w\+\s\+$\='.a:ArgLead."$" + return s:completion_filter(rails#app().environments()+["-s","--sandbox"],a:ArgLead) + elseif cmd =~# '^\%(server\)\s\+.*-e\s\+'.a:ArgLead."$" + return s:completion_filter(rails#app().environments(),a:ArgLead) + elseif cmd =~# '^\%(server\)\s\+' + if a:ArgLead =~# '^--environment=' + return s:completion_filter(map(copy(rails#app().environments()),'"--environment=".v:val'),a:ArgLead) else - return "" + return filter(["-p","-b","-e","-m","-d","-u","-c","-h","--port=","--binding=","--environment=","--mime-types=","--daemon","--debugger","--charset=","--help"],'s:startswith(v:val,a:ArgLead)') endif - elseif cmd =~ '^\%(generate\|destroy\)\s\+scaffold\s\+\w\+\s\+'.a:ArgLead.'$' - return s:sub(s:controllerList("","",""),'^application\n=','') - elseif cmd =~ '^\%(console\)\s\+$--\=\w\+\s\+$\='.a:ArgLead."$" - return s:environments()."\n-s\n--sandbox" - elseif cmd =~ '^\%(server\)\s\+.*-e\s\+'.a:ArgLead."$" - return s:environments() - elseif cmd =~ '^\%(server\)\s\+' - return "-p\n-b\n-e\n-m\n-d\n-u\n-c\n-h\n--port=\n--binding=\n--environment=\n--mime-types=\n--daemon\n--debugger\n--charset=\n--help\n" endif return "" -" return s:relglob(RailsRoot()."/script/",a:ArgLead."*") endfunction function! s:CustomComplete(A,L,P,cmd) let L = "Rscript ".a:cmd." ".s:sub(a:L,'^\h\w*\s+','') let P = a:P - strlen(a:L) + strlen(L) - return s:ScriptComplete(a:A,L,P) + return s:Complete_script(a:A,L,P) endfunction -function! s:ServerComplete(A,L,P) +function! s:Complete_server(A,L,P) return s:CustomComplete(a:A,a:L,a:P,"server") endfunction -function! s:ConsoleComplete(A,L,P) +function! s:Complete_console(A,L,P) return s:CustomComplete(a:A,a:L,a:P,"console") endfunction -function! s:GenerateComplete(A,L,P) +function! s:Complete_generate(A,L,P) return s:CustomComplete(a:A,a:L,a:P,"generate") endfunction -function! s:DestroyComplete(A,L,P) +function! s:Complete_destroy(A,L,P) return s:CustomComplete(a:A,a:L,a:P,"destroy") endfunction -function! s:RubyComplete(A,L,R) - return s:gsub(RailsUserClasses(),' ','\n')."\nActiveRecord::Base" +function! s:Complete_ruby(A,L,P) + return s:completion_filter(rails#app().user_classes()+["ActiveRecord::Base"],a:A) endfunction " }}}1 " Navigation {{{1 function! s:BufNavCommands() - " TODO: completion - "silent exe "command! -bar -buffer -nargs=? Rcd :cd ".s:ra()."/<args>" - "silent exe "command! -bar -buffer -nargs=? Rlcd :lcd ".s:ra()."/<args>" - command! -buffer -bar -nargs=? Rcd :cd `=RailsRoot().'/'.<q-args>` - command! -buffer -bar -nargs=? Rlcd :lcd `=RailsRoot().'/'.<q-args>` - " Vim 6.2 chokes on script local completion functions (e.g., s:FindList). - " :Rcommand! is a thin wrapper arround :command! which works around this - Rcommand! -buffer -bar -nargs=* -count=1 -complete=custom,s:FindList Rfind :call s:Find(<bang>0,<count>,'' ,<f-args>) - Rcommand! -buffer -bar -nargs=* -count=1 -complete=custom,s:FindList REfind :call s:Find(<bang>0,<count>,'E',<f-args>) - Rcommand! -buffer -bar -nargs=* -count=1 -complete=custom,s:FindList RSfind :call s:Find(<bang>0,<count>,'S',<f-args>) - Rcommand! -buffer -bar -nargs=* -count=1 -complete=custom,s:FindList RVfind :call s:Find(<bang>0,<count>,'V',<f-args>) - Rcommand! -buffer -bar -nargs=* -count=1 -complete=custom,s:FindList RTfind :call s:Find(<bang>0,<count>,'T',<f-args>) - Rcommand! -buffer -bar -nargs=* -count=1 -complete=custom,s:FindList Rsfind :<count>RSfind<bang> <args> - Rcommand! -buffer -bar -nargs=* -count=1 -complete=custom,s:FindList Rtabfind :<count>RTfind<bang> <args> - Rcommand! -buffer -bar -nargs=* -bang -complete=custom,s:EditList Redit :call s:Edit(<bang>0,<count>,'' ,<f-args>) - Rcommand! -buffer -bar -nargs=* -bang -complete=custom,s:EditList REedit :call s:Edit(<bang>0,<count>,'E',<f-args>) - Rcommand! -buffer -bar -nargs=* -bang -complete=custom,s:EditList RSedit :call s:Edit(<bang>0,<count>,'S',<f-args>) - Rcommand! -buffer -bar -nargs=* -bang -complete=custom,s:EditList RVedit :call s:Edit(<bang>0,<count>,'V',<f-args>) - Rcommand! -buffer -bar -nargs=* -bang -complete=custom,s:EditList RTedit :call s:Edit(<bang>0,<count>,'T',<f-args>) - command! -buffer -bar -nargs=0 A :call s:Alternate(<bang>0,"") - command! -buffer -bar -nargs=0 AE :call s:Alternate(<bang>0,"E") - command! -buffer -bar -nargs=0 AS :call s:Alternate(<bang>0,"S") - command! -buffer -bar -nargs=0 AV :call s:Alternate(<bang>0,"V") - command! -buffer -bar -nargs=0 AT :call s:Alternate(<bang>0,"T") - command! -buffer -bar -nargs=0 AN :call s:Related(<bang>0,"") - command! -buffer -bar -nargs=0 R :call s:Related(<bang>0,"") - command! -buffer -bar -nargs=0 RE :call s:Related(<bang>0,"E") - command! -buffer -bar -nargs=0 RS :call s:Related(<bang>0,"S") - command! -buffer -bar -nargs=0 RV :call s:Related(<bang>0,"V") - command! -buffer -bar -nargs=0 RT :call s:Related(<bang>0,"T") - "command! -buffer -bar -nargs=0 RN :call s:Alternate(<bang>0,"") + command! -buffer -bar -nargs=? -complete=customlist,s:Complete_cd Rcd :cd `=rails#app().path(<q-args>)` + command! -buffer -bar -nargs=? -complete=customlist,s:Complete_cd Rlcd :lcd `=rails#app().path(<q-args>)` + command! -buffer -bar -nargs=* -count=1 -complete=customlist,s:Complete_find Rfind :call s:Find(<bang>0,<count>,'' ,<f-args>) + command! -buffer -bar -nargs=* -count=1 -complete=customlist,s:Complete_find REfind :call s:Find(<bang>0,<count>,'E',<f-args>) + command! -buffer -bar -nargs=* -count=1 -complete=customlist,s:Complete_find RSfind :call s:Find(<bang>0,<count>,'S',<f-args>) + command! -buffer -bar -nargs=* -count=1 -complete=customlist,s:Complete_find RVfind :call s:Find(<bang>0,<count>,'V',<f-args>) + command! -buffer -bar -nargs=* -count=1 -complete=customlist,s:Complete_find RTfind :call s:Find(<bang>0,<count>,'T',<f-args>) + command! -buffer -bar -nargs=* -count=1 -complete=customlist,s:Complete_find Rsfind :<count>RSfind<bang> <args> + command! -buffer -bar -nargs=* -count=1 -complete=customlist,s:Complete_find Rtabfind :<count>RTfind<bang> <args> + command! -buffer -bar -nargs=* -bang -complete=customlist,s:Complete_edit Redit :call s:Edit(<bang>0,<count>,'' ,<f-args>) + command! -buffer -bar -nargs=* -bang -complete=customlist,s:Complete_edit REedit :call s:Edit(<bang>0,<count>,'E',<f-args>) + command! -buffer -bar -nargs=* -bang -complete=customlist,s:Complete_edit RSedit :call s:Edit(<bang>0,<count>,'S',<f-args>) + command! -buffer -bar -nargs=* -bang -complete=customlist,s:Complete_edit RVedit :call s:Edit(<bang>0,<count>,'V',<f-args>) + command! -buffer -bar -nargs=* -bang -complete=customlist,s:Complete_edit RTedit :call s:Edit(<bang>0,<count>,'T',<f-args>) + command! -buffer -bar -nargs=* -complete=customlist,s:Complete_find A :call s:Alternate(<bang>0,"", <f-args>) + command! -buffer -bar -nargs=* -complete=customlist,s:Complete_find AE :call s:Alternate(<bang>0,"E",<f-args>) + command! -buffer -bar -nargs=* -complete=customlist,s:Complete_find AS :call s:Alternate(<bang>0,"S",<f-args>) + command! -buffer -bar -nargs=* -complete=customlist,s:Complete_find AV :call s:Alternate(<bang>0,"V",<f-args>) + command! -buffer -bar -nargs=* -complete=customlist,s:Complete_find AT :call s:Alternate(<bang>0,"T",<f-args>) + command! -buffer -bar -nargs=* -complete=customlist,s:Complete_edit AN :call s:Related(<bang>0,"" ,<f-args>) + command! -buffer -bar -nargs=* -complete=customlist,s:Complete_edit R :call s:Related(<bang>0,"" ,<f-args>) + command! -buffer -bar -nargs=* -complete=customlist,s:Complete_edit RE :call s:Related(<bang>0,"E",<f-args>) + command! -buffer -bar -nargs=* -complete=customlist,s:Complete_edit RS :call s:Related(<bang>0,"S",<f-args>) + command! -buffer -bar -nargs=* -complete=customlist,s:Complete_edit RV :call s:Related(<bang>0,"V",<f-args>) + command! -buffer -bar -nargs=* -complete=customlist,s:Complete_edit RT :call s:Related(<bang>0,"T",<f-args>) endfunction function! s:djump(def) - let def = s:sub(a:def,'^[@#]','') - if def != '' + let def = s:sub(a:def,'^[#:]','') + if def =~ '^\d\+$' + exe def + elseif def != '' let ext = matchstr(def,'\.\zs.*') let def = matchstr(def,'[^.]*') let v:errmsg = '' @@ -1406,7 +1525,6 @@ function! s:djump(def) let end = s:endof(line('.')) let rline = search(rpat,'',end) if rline > 0 - "call cursor(rline,1) let variable = matchstr(getline(rline),rpat) let success = search('\C^\s*'.variable.'\s*\.\s*\zs'.ext.'\>','',end) if !success @@ -1423,13 +1541,13 @@ function! s:Find(bang,count,arg,...) if a:0 let i = 1 while i < a:0 - let str = str . s:escarg(a:{i}) . " " - let i = i + 1 + let str .= s:escarg(a:{i}) . " " + let i += 1 endwhile let file = a:{i} - let tail = matchstr(file,'[@#].*$') + let tail = matchstr(file,'#.*$\|:\d*\%(:in\>.*\)\=$') if tail != "" - let file = s:sub(file,'[@#].*$','') + let file = s:sub(file,'#.*$|:\d*%(:in>.*)=$','') endif if file != "" let file = s:RailsIncludefind(file) @@ -1438,17 +1556,7 @@ function! s:Find(bang,count,arg,...) let file = s:RailsFind() let tail = "" endif - if file =~ '^\%(app\|config\|db\|public\|spec\|test\|vendor\)/.*\.' || !a:0 || 1 - call s:findedit((a:count==1?'' : a:count).cmd,file.tail,str) - else - " Old way - let fcmd = (a:count==1?'' : a:count).s:findcmdfor(cmd) - let fcmd = s:sub(fcmd,'(\d+)vert ','vert \1') - if file != "" - exe fcmd.' '.str.s:escarg(file) - endif - call s:djump(tail) - endif + call s:findedit((a:count==1?'' : a:count).cmd,file.tail,str) endfunction function! s:Edit(bang,count,arg,...) @@ -1457,9 +1565,8 @@ function! s:Edit(bang,count,arg,...) let str = "" let i = 1 while i < a:0 - "let str = str . s:escarg(a:{i}) . " " - let str = str . "`=a:".i."` " - let i = i + 1 + let str .= "`=a:".i."` " + let i += 1 endwhile let file = a:{i} call s:findedit(s:editcmdfor(cmd),file,str) @@ -1468,16 +1575,33 @@ function! s:Edit(bang,count,arg,...) endif endfunction -function! s:FindList(ArgLead, CmdLine, CursorPos) - if exists("*UserFileComplete") " genutils.vim - return UserFileComplete(s:RailsIncludefind(a:ArgLead), a:CmdLine, a:CursorPos, 1, &path) - else - return "" - endif +function! s:fuzzyglob(arg) + return '*'.s:gsub(s:gsub(a:arg,'[^/]','[&]*'),'/','/*') endfunction -function! s:EditList(ArgLead, CmdLine, CursorPos) - return s:relglob("",a:ArgLead."*[^~]") +function! s:Complete_find(ArgLead, CmdLine, CursorPos) + let paths = s:pathsplit(&l:path) + let seen = {} + for path in paths + if s:startswith(path,rails#app().path()) && path !~ '[][*]' + let path = path[strlen(rails#app().path()) + 1 : ] + for file in rails#app().relglob(path == '' ? '' : path.'/',s:fuzzyglob(rails#underscore(a:ArgLead)), a:ArgLead =~# '\u' ? '.rb' : '') + let seen[file] = 1 + endfor + endif + endfor + let results = sort(map(keys(seen),'s:sub(v:val,"[.]rb$","")')) + return s:autocamelize(results,a:ArgLead) +endfunction + +function! s:Complete_edit(ArgLead, CmdLine, CursorPos) + return s:completion_filter(rails#app().relglob("",s:fuzzyglob(a:ArgLead)),a:ArgLead) +endfunction + +function! s:Complete_cd(ArgLead, CmdLine, CursorPos) + let all = rails#app().relglob("",a:ArgLead."*") + call filter(all,'v:val =~ "/$"') + return filter(all,'s:startswith(v:val,a:ArgLead)') endfunction function! RailsIncludeexpr() @@ -1541,15 +1665,17 @@ function! s:RailsFind() if res != ""|return res.(fnamemodify(res,':e') == '' ? '.rb' : '')|endif let res = s:findit('\v<File.dirname$__FILE__$\s*\+\s*[:'."'".'"](\f+)>['."'".'"]=',expand('%:h').'\1') if res != ""|return res|endif + let res = rails#underscore(s:findit('\v\s*<%(include|extend)\(=\s*<(\f+)>','\1')) + if res != ""|return res.".rb"|endif let res = s:findamethod('require','\1') if res != ""|return res.(fnamemodify(res,':e') == '' ? '.rb' : '')|endif let res = s:findamethod('belongs_to\|has_one\|composed_of\|validates_associated\|scaffold','app/models/\1.rb') if res != ""|return res|endif - let res = s:singularize(s:findamethod('has_many\|has_and_belongs_to_many','app/models/\1')) + let res = rails#singularize(s:findamethod('has_many\|has_and_belongs_to_many','app/models/\1')) if res != ""|return res.".rb"|endif - let res = s:singularize(s:findamethod('create_table\|drop_table\|add_column\|rename_column\|remove_column\|add_index','app/models/\1')) + let res = rails#singularize(s:findamethod('create_table\|change_table\|drop_table\|add_column\|rename_column\|remove_column\|add_index','app/models/\1')) if res != ""|return res.".rb"|endif - let res = s:singularize(s:findasymbol('through','app/models/\1')) + let res = rails#singularize(s:findasymbol('through','app/models/\1')) if res != ""|return res.".rb"|endif let res = s:findamethod('fixtures','fixtures/\1') if res != "" @@ -1557,9 +1683,11 @@ function! s:RailsFind() endif let res = s:findamethod('map\.resources','app/controllers/\1_controller.rb') if res != ""|return res|endif - let res = s:findamethod('layout','app/views/layouts/\1') + let res = s:findamethod('map\.resource','app/controllers/\1') + if res != ""|return rails#pluralize(res)."_controller.rb"|endif + let res = s:findamethod('layout','\=s:findlayout(submatch(1))') if res != ""|return res|endif - let res = s:findasymbol('layout','app/views/layouts/\1') + let res = s:findasymbol('layout','\=s:findlayout(submatch(1))') if res != ""|return res|endif let res = s:findamethod('helper','app/helpers/\1_helper.rb') if res != ""|return res|endif @@ -1567,6 +1695,8 @@ function! s:RailsFind() if res != ""|return res|endif let res = s:findasymbol('action','\1') if res != ""|return res|endif + let res = s:findasymbol('template','app/views/\1') + if res != ""|return res|endif let res = s:sub(s:sub(s:findasymbol('partial','\1'),'^/',''),'\k+$','_&') if res != ""|return res."\n".s:findview(res)|endif let res = s:sub(s:sub(s:findfromview('render\s*(\=\s*:partial\s\+=>\s*','\1'),'^/',''),'\k+$','_&') @@ -1580,7 +1710,9 @@ function! s:RailsFind() let res = s:sub(s:findfromview('javascript_include_tag','public/javascripts/\1.js'),'/defaults>','/application') if res != ""|return res|endif if RailsFileType() =~ '^controller\>' - let res = s:findit('\s*\<def\s\+$\k\+$\>(\=',s:sub(s:sub(RailsFilePath(),'/controllers/','/views/'),'_controller\.rb$','').'/\1') + let contr = s:controller() + let view = s:findit('\s*\<def\s\+$\k\+$\>(\=','/\1') + let res = s:findview(contr.'/'.view) if res != ""|return res|endif endif let isf_keep = &isfname @@ -1592,57 +1724,40 @@ function! s:RailsFind() return res endfunction -function! s:initnamedroutes() - if s:cacheneeds("named_routes") +function! s:app_named_route_file(route) dict + call self.route_names() + if self.cache.has("named_routes") && has_key(self.cache.get("named_routes"),a:route) + return self.cache.get("named_routes")[a:route] + endif + return "" +endfunction + +function! s:app_route_names() dict + if self.cache.needs("named_routes") let exec = "ActionController::Routing::Routes.named_routes.each {|n,r| puts %{#{n} app/controllers/#{r.requirements[:controller]}_controller.rb##{r.requirements[:action]}}}" - let string = s:railseval(exec) + let string = self.eval(exec) let routes = {} - let list = split(string,"\n") - let i = 0 - " If we use for, Vim 6.2 dumbly treats endfor like endfunction - while i < len(list) - let route = split(list[i]," ") + for line in split(string,"\n") + let route = split(line," ") let name = route[0] let routes[name] = route[1] - let i = i + 1 - endwhile - call s:cacheset("named_routes",routes) + endfor + call self.cache.set("named_routes",routes) endif -endfunction -function! s:namedroutefile(route) - call s:initnamedroutes() - if s:cachehas("named_routes") && has_key(s:cache("named_routes"),a:route) - return s:cache("named_routes")[a:route] - endif - return "" + return keys(self.cache.get("named_routes")) endfunction +call s:add_methods('app', ['route_names','named_route_file']) + function! RailsNamedRoutes() - call s:initnamedroutes() - if s:cachehas("named_routes") - return keys(s:cache("named_routes")) - else - " Dead code - if s:cacheneeds("route_names") - let lines = readfile(RailsRoot()."/config/routes.rb") - let plurals = map(filter(copy(lines),'v:val =~# "^ map\\.resources\\s\\+:\\w"'),'matchstr(v:val,"^ map\\.resources\\=\\s\\+:\\zs\\w\\+")') - let singulars = map(copy(plurals),'s:singularize(v:val)') - let extras = map(copy(singulars),'"new_".v:val')+map(copy(singulars),'"edit_".v:val') - let all = plurals + singulars + extras - let named = map(filter(copy(lines),'v:val =~# "^ map\\.\\%(connect\\>\\|resources\\=\\>\\)\\@!\\w\\+"'),'matchstr(v:val,"^ map\\.\\zs\\w\\+")') - call s:cacheset("route_names",named+all+map(copy(all),'"formatted_".v:val')) - endif - if s:cachehas("route_names") - return s:cache("route_names") - endif - endif + return rails#app().route_names() endfunction function! s:RailsIncludefind(str,...) - if a:str == "ApplicationController" + if a:str ==# "ApplicationController" return "app/controllers/application.rb" - elseif a:str == "Test::Unit::TestCase" + elseif a:str ==# "Test::Unit::TestCase" return "test/unit/testcase.rb" elseif a:str == "<%=" " Probably a silly idea @@ -1659,73 +1774,71 @@ function! s:RailsIncludefind(str,...) endif let str = s:sub(str,'^\s*','') let str = s:sub(str,'\s*$','') - let str = s:sub(str,'^[:@]','') - "let str = s:sub(str,"\$[\"']\$\$.*\$\\1",'\2') + let str = s:sub(str,'^:=[:@]','') let str = s:sub(str,':0x\x+$','') " For #<Object:0x...> style output let str = s:gsub(str,"[\"']",'') - if line =~ '\<$require\|load$\s*(\s*$' + if line =~# '\<$require\|load$\s*(\s*$' return str endif - let str = s:underscore(str) + let str = rails#underscore(str) let fpat = '$\s*\%("\f*"\|:\f*\|'."'\\f*'".'$\s*,\s*\)*' - if a:str =~ '\u' + if a:str =~# '\u' " Classes should always be in .rb files - let str = str . '.rb' - elseif line =~ ':partial\s*=>\s*' + let str .= '.rb' + elseif line =~# ':partial\s*=>\s*' let str = s:sub(str,'([^/]+)$','_\1') let str = s:findview(str) - elseif line =~ '\<layout\s*(\=\s*' || line =~ ':layout\s*=>\s*' + elseif line =~# '\<layout\s*(\=\s*' || line =~# ':layout\s*=>\s*' let str = s:findview(s:sub(str,'^/=','layouts/')) - elseif line =~ ':controller\s*=>\s*' + elseif line =~# ':controller\s*=>\s*' let str = 'app/controllers/'.str.'_controller.rb' - elseif line =~ '\<helper\s*(\=\s*' + elseif line =~# '\<helper\s*(\=\s*' let str = 'app/helpers/'.str.'_helper.rb' - elseif line =~ '\<fixtures\s*(\='.fpat + elseif line =~# '\<fixtures\s*(\='.fpat if RailsFilePath() =~# '\<spec/' let str = s:sub(str,'^/@!','spec/fixtures/') else let str = s:sub(str,'^/@!','test/fixtures/') endif - elseif line =~ '\<stylesheet_$link_tag\|path$\s*(\='.fpat + elseif line =~# '\<stylesheet_$link_tag\|path$\s*(\='.fpat let str = s:sub(str,'^/@!','/stylesheets/') let str = 'public'.s:sub(str,'^[^.]*$','&.css') - elseif line =~ '\<javascript_$include_tag\|path$\s*(\='.fpat - if str == "defaults" + elseif line =~# '\<javascript_$include_tag\|path$\s*(\='.fpat + if str ==# "defaults" let str = "application" endif let str = s:sub(str,'^/@!','/javascripts/') let str = 'public'.s:sub(str,'^[^.]*$','&.js') - elseif line =~ '\<$has_one\|belongs_to$\s*(\=\s*' + elseif line =~# '\<$has_one\|belongs_to$\s*(\=\s*' let str = 'app/models/'.str.'.rb' - elseif line =~ '\<has_$and_belongs_to_$\=many\s*(\=\s*' - let str = 'app/models/'.s:singularize(str).'.rb' - elseif line =~ '\<def\s\+' && expand("%:t") =~ '_controller\.rb' + elseif line =~# '\<has_$and_belongs_to_$\=many\s*(\=\s*' + let str = 'app/models/'.rails#singularize(str).'.rb' + elseif line =~# '\<def\s\+' && expand("%:t") =~# '_controller\.rb' let str = s:sub(s:sub(RailsFilePath(),'/controllers/','/views/'),'_controller\.rb$','/'.str) - "let str = s:sub(expand("%:p"),'.*[\/]app[\/]controllers[\/](.{-})_controller.rb','views/\1').'/'.str " FIXME: support nested extensions let vt = s:view_types."," while vt != "" let t = matchstr(vt,'[^,]*') let vt = s:sub(vt,'[^,]*,','') if filereadable(str.".".t) - let str = str.".".t + let str .= '.'.t break endif endwhile - elseif str =~ '_\%(path\|url\)$' + elseif str =~# '_\%(path\|url\)$' " REST helpers let str = s:sub(str,'_%(path|url)$','') let str = s:sub(str,'^hash_for_','') - let file = s:namedroutefile(str) + let file = rails#app().named_route_file(str) if file == "" let str = s:sub(str,'^formatted_','') - if str =~ '^\%(new\|edit\)_' - let str = 'app/controllers/'.s:sub(s:pluralize(str),'^(new|edit)_(.*)','\2_controller.rb#\1') - elseif str == s:singularize(str) + if str =~# '^\%(new\|edit\)_' + let str = 'app/controllers/'.s:sub(rails#pluralize(str),'^(new|edit)_(.*)','\2_controller.rb#\1') + elseif str ==# rails#singularize(str) " If the word can't be singularized, it's probably a link to the show " method. We should verify by checking for an argument, but that's " difficult the way things here are currently structured. - let str = 'app/controllers/'.s:pluralize(str).'_controller.rb#show' + let str = 'app/controllers/'.rails#pluralize(str).'_controller.rb#show' else let str = 'app/controllers/'.str.'_controller.rb#index' endif @@ -1734,13 +1847,13 @@ function! s:RailsIncludefind(str,...) endif elseif str !~ '/' " If we made it this far, we'll risk making it singular. - let str = s:singularize(str) + let str = rails#singularize(str) let str = s:sub(str,'_id$','') endif if str =~ '^/' && !filereadable(str) let str = s:sub(str,'^/','') endif - if str =~ '^lib/' && !filereadable(str) + if str =~# '^lib/' && !filereadable(str) let str = s:sub(str,'^lib/','') endif return str @@ -1754,7 +1867,7 @@ function! s:addfilecmds(type) let cmds = 'ESVT ' let cmd = '' while cmds != '' - let cplt = " -complete=custom,".s:sid.l."List" + let cplt = " -complete=customlist,".s:sid.l."List" exe "command! -buffer -bar -nargs=*".cplt." R".cmd.l." :call s:".l.'Edit(<bang>0,"'.cmd.'",<f-args>)' let cmd = strpart(cmds,0,1) let cmds = strpart(cmds,1) @@ -1762,7 +1875,8 @@ function! s:addfilecmds(type) endfunction function! s:BufFinderCommands() - command! -buffer -bar -bang -nargs=+ Rcommand :call s:Command(<bang>0,<f-args>) + command! -buffer -bar -nargs=+ Rnavcommand :call s:Navcommand(<bang>0,<f-args>) + command! -buffer -bar -nargs=+ Rcommand :call s:warn("Warning: :Rcommand has been deprecated in favor of :Rnavcommand")|call s:Navcommand(<bang>0,<f-args>) call s:addfilecmds("model") call s:addfilecmds("view") call s:addfilecmds("controller") @@ -1772,212 +1886,204 @@ function! s:BufFinderCommands() call s:addfilecmds("api") call s:addfilecmds("layout") call s:addfilecmds("fixtures") - call s:addfilecmds("unittest") - call s:addfilecmds("functionaltest") - call s:addfilecmds("integrationtest") + if rails#app().test_suites('test') || rails#app().test_suites('spec') + call s:addfilecmds("unittest") + call s:addfilecmds("functionaltest") + endif + if rails#app().test_suites('test') + call s:addfilecmds("integrationtest") + endif + if rails#app().test_suites('spec') + call s:addfilecmds("spec") + endif call s:addfilecmds("stylesheet") call s:addfilecmds("javascript") + call s:addfilecmds("plugin") call s:addfilecmds("task") call s:addfilecmds("lib") - call s:addfilecmds("plugin") + call s:addfilecmds("environment") + call s:addfilecmds("initializer") +endfunction + +function! s:completion_filter(results,A) + let results = sort(type(a:results) == type("") ? split(a:results,"\n") : copy(a:results)) + call filter(results,'v:val !~# "\\~$"') + let filtered = filter(copy(results),'s:startswith(v:val,a:A)') + if !empty(filtered) | return filtered | endif + let regex = s:gsub(a:A,'[^/]','[&].*') + let filtered = filter(copy(results),'v:val =~# "^".regex') + if !empty(filtered) | return filtered | endif + let regex = s:gsub(a:A,'.','[&].*') + let filtered = filter(copy(results),'v:val =~# regex') + return filtered endfunction function! s:autocamelize(files,test) if a:test =~# '^\u' - return s:camelize(a:files) + return s:completion_filter(map(copy(a:files),'rails#camelize(v:val)'),a:test) else - return a:files + return s:completion_filter(a:files,a:test) endif endfunction -function! RailsUserClasses() - if !exists("b:rails_root") - return "" - elseif s:getopt('classes','ab') != '' - return s:getopt('classes','ab') - endif - let var = "user_classes_".s:rv() - if !exists("s:".var) - let s:{var} = s:sub(s:sub(s:gsub(s:camelize( - \ s:relglob("app/models/","**/*",".rb") . "\n" . - \ s:sub(s:relglob("app/controllers/","**/*",".rb"),'<application>','&_controller') . "\n" . - \ s:relglob("app/helpers/","**/*",".rb") . "\n" . - \ s:relglob("lib/","**/*",".rb") . "\n" . - \ ""),'\n+',' '),'^\s+',''),'\s+$','') - endif - return s:{var} -endfunction - -function! s:relglob(path,glob,...) - " How could such a simple operation be so complicated? +function! s:app_relglob(path,glob,...) dict if exists("+shellslash") && ! &shellslash let old_ss = &shellslash let &shellslash = 1 endif - if a:path =~ '[\/]$' - let path = a:path - else - let path = a:path . '' - endif - if path !~ '^/' && path !~ '^\w:' && RailsRoot() != '' - let path = RailsRoot() . '/' . path + let path = a:path + if path !~ '^/' && path !~ '^\w:' + let path = self.path(path) endif let suffix = a:0 ? a:1 : '' - let badres = glob(path.a:glob.suffix)."\n" - if v:version <= 602 - " Nasty Vim bug in version 6.2 - let badres = glob(path.a:glob.suffix)."\n" - endif - let goodres = "" - let striplen = strlen(path) - let stripend = strlen(suffix) - while strlen(badres) > 0 - let idx = stridx(badres,"\n") - "if idx == -1 - "let idx = strlen(badres) - "endif - let tmp = strpart(badres,0,idx) - let badres = strpart(badres,idx+1) - let goodres = goodres.strpart(tmp,striplen,strlen(tmp)-striplen-stripend) - if suffix == '' && isdirectory(tmp) && goodres !~ '/$' - let goodres = goodres."/" + let full_paths = split(glob(path.a:glob.suffix),"\n") + let relative_paths = [] + for entry in full_paths + if suffix == '' && isdirectory(entry) && entry !~ '/$' + let entry .= '/' endif - let goodres = goodres."\n" - endwhile - "let goodres = s:gsub("\n".goodres,'\n.{-}\~\n','\n') + let relative_paths += [entry[strlen(path) : -strlen(suffix)-1]] + endfor if exists("old_ss") let &shellslash = old_ss endif - return s:compact(goodres) + return relative_paths endfunction -if v:version <= 602 - " Yet another Vim 6.2 limitation - let s:recurse = "*" -else - let s:recurse = "**/*" -endif +call s:add_methods('app', ['relglob']) + +function! s:relglob(...) + return join(call(rails#app().relglob,a:000,rails#app()),"\n") +endfunction function! s:helperList(A,L,P) - return s:autocamelize(s:relglob("app/helpers/",s:recurse,"_helper.rb"),a:A) + return s:autocamelize(rails#app().relglob("app/helpers/","**/*","_helper.rb"),a:A) endfunction function! s:controllerList(A,L,P) - let con = s:gsub(s:relglob("app/controllers/",s:recurse,".rb"),'_controller>','') + let con = rails#app().relglob("app/controllers/","**/*",".rb") + call map(con,'s:sub(v:val,"_controller$","")') return s:autocamelize(con,a:A) endfunction function! s:viewList(A,L,P) let c = s:controller(1) - let top = s:relglob("app/views/",a:A."*[^~]") - if c != '' - let local = s:relglob("app/views/".c."/",a:A."*.*[^~]") - if local != '' - return local."\n".top - endif + let top = rails#app().relglob("app/views/",s:fuzzyglob(a:A)) + call filter(top,'v:val !~# "\\~$"') + if c != '' && a:A !~ '/' + let local = rails#app().relglob("app/views/".c."/","*.*[^~]") + return s:completion_filter(local+top,a:A) endif - return top + return s:completion_filter(top,a:A) endfunction function! s:layoutList(A,L,P) - return s:relglob("app/views/layouts/","*") + return s:completion_filter(rails#app().relglob("app/views/layouts/","*"),a:A) endfunction function! s:stylesheetList(A,L,P) - return s:relglob("public/stylesheets/",s:recurse,".css") + return s:completion_filter(rails#app().relglob("public/stylesheets/","**/*",".css"),a:A) endfunction function! s:javascriptList(A,L,P) - return s:relglob("public/javascripts/",s:recurse,".js") + return s:completion_filter(rails#app().relglob("public/javascripts/","**/*",".js"),a:A) endfunction function! s:modelList(A,L,P) - let models = s:relglob("app/models/",s:recurse,".rb")."\n" - " . matches everything, and no good way to exclude newline. Lame. - let models = s:gsub(models,'[ -~]*_observer\n',"") - let models = s:compact(models) + let models = rails#app().relglob("app/models/","**/*",".rb") + call filter(models,'v:val !~# "_observer$"') return s:autocamelize(models,a:A) endfunction function! s:observerList(A,L,P) - return s:autocamelize(s:relglob("app/models/",s:recurse,"_observer.rb"),a:A) + return s:autocamelize(rails#app().relglob("app/models/","**/*","_observer.rb"),a:A) endfunction function! s:fixturesList(A,L,P) - return s:compact(s:relglob("test/fixtures/",s:recurse)."\n".s:relglob("spec/fixtures/",s:recurse)) + return s:completion_filter(rails#app().relglob("test/fixtures/","**/*")+rails#app().relglob("spec/fixtures/","**/*"),a:A) endfunction function! s:migrationList(A,L,P) if a:A =~ '^\d' - let migrations = s:relglob("db/migrate/",a:A."[0-9_]*",".rb") - let migrations = s:gsub(migrations,'_.{-}($|\n)','\1') - return migrations + let migrations = rails#app().relglob("db/migrate/",a:A."[0-9_]*",".rb") + return map(migrations,'matchstr(v:val,"^[0-9]*")') else - let migrations = s:relglob("db/migrate/","[0-9]*[0-9]_".a:A."*",".rb") - let migrations = s:gsub(migrations,'(^|\n)\d+_','\1') + let migrations = rails#app().relglob("db/migrate/","[0-9]*[0-9]_*",".rb") + call map(migrations,'s:sub(v:val,"^[0-9]*_","")') return s:autocamelize(migrations,a:A) endif endfunction function! s:apiList(A,L,P) - return s:autocamelize(s:relglob("app/apis/",s:recurse,"_api.rb"),a:A) + return s:autocamelize(rails#app().relglob("app/apis/","**/*","_api.rb"),a:A) endfunction function! s:unittestList(A,L,P) - return s:autocamelize(s:relglob("test/unit/",s:recurse,"_test.rb"),a:A) + let found = [] + if rails#app().test_suites('test') + let found += rails#app().relglob("test/unit/","**/*","_test.rb") + endif + if rails#app().test_suites('spec') + let found += rails#app().relglob("spec/models/","**/*","_spec.rb") + endif + return s:autocamelize(found,a:A) endfunction function! s:functionaltestList(A,L,P) - return s:autocamelize(s:relglob("test/functional/",s:recurse,"_test.rb"),a:A) + let found = [] + if rails#app().test_suites('test') + let found += rails#app().relglob("test/functional/","**/*","_test.rb") + endif + if rails#app().test_suites('spec') + let found += rails#app().relglob("spec/controllers/","**/*","_spec.rb") + endif + return s:autocamelize(found,a:A) endfunction function! s:integrationtestList(A,L,P) - return s:autocamelize(s:relglob("test/integration/",s:recurse,"_test.rb"),a:A) + return s:autocamelize(rails#app().relglob("test/integration/","**/*","_test.rb"),a:A) +endfunction + +function! s:specList(A,L,P) + return s:completion_filter(rails#app().relglob("spec/","**/*","_spec.rb"),a:A) endfunction function! s:pluginList(A,L,P) if a:A =~ '/' - return s:relglob('vendor/plugins/',matchstr(a:A,'.\{-\}/').'**/*') + return s:completion_filter(rails#app().relglob('vendor/plugins/',matchstr(a:A,'.\{-\}/').'**/*'),a:A) else - return s:relglob('vendor/plugins/',"*","/init.rb") + return s:completion_filter(rails#app().relglob('vendor/plugins/',"*","/init.rb"),a:A) endif endfunction " Task files, not actual rake tasks function! s:taskList(A,L,P) - let top = s:relglob("lib/tasks/",s:recurse,".rake") + let all = rails#app().relglob("lib/tasks/","**/*",".rake") if RailsFilePath() =~ '\<vendor/plugins/.' - let path = s:sub(RailsFilePath(),'<vendor/plugins/[^/]*/\zs.*','tasks/') - return s:relglob(path,s:recurse,".rake") . "\n" . top - else - return top + let path = s:sub(RailsFilePath(),'<vendor/plugins/[^/]*/\zs.*','') + let all = rails#app().relglob(path."tasks/","**/*",".rake")+rails#app().relglob(path."lib/tasks/","**/*",".rake")+all endif + return s:autocamelize(all,a:A) endfunction function! s:libList(A,L,P) - let all = s:relglob('lib/',s:recurse,".rb") + let all = rails#app().relglob('lib/',"**/*",".rb") if RailsFilePath() =~ '\<vendor/plugins/.' let path = s:sub(RailsFilePath(),'<vendor/plugins/[^/]*/\zs.*','lib/') - let all = s:relglob(path,s:recurse,".rb") . "\n" . all + let all = rails#app().relglob(path,"**/*",".rb") + all endif return s:autocamelize(all,a:A) endfunction -function! s:Command(bang,...) - if a:bang - let str = "" - let i = 0 - while i < a:0 - let i = i + 1 - if a:{i} =~# '^-complete=custom,s:' && v:version <= 602 - let str = str . " " . s:sub(a:{i},',s:',','.s:sid) - else - let str = str . " " . a:{i} - endif - endwhile - exe "command!".str - return - endif +function! s:environmentList(A,L,P) + return s:completion_filter(rails#app().relglob("config/environments/","**/*",".rb"),a:A) +endfunction + +function! s:initializerList(A,L,P) + return s:completion_filter(rails#app().relglob("config/initializers/","**/*",".rb"),a:A) +endfunction + +function! s:Navcommand(bang,...) let suffix = ".rb" let filter = "**/*" let prefix = "" @@ -1985,7 +2091,7 @@ function! s:Command(bang,...) let name = "" let i = 0 while i < a:0 - let i = i + 1 + let i += 1 let arg = a:{i} if arg =~# '^-suffix=' let suffix = matchstr(arg,'-suffix=\zs.*') @@ -1998,7 +2104,7 @@ function! s:Command(bang,...) if name == "" let name = arg else - let prefix = prefix."\\n".s:sub(arg,'/=$','/') + let prefix .= "\\n".s:sub(arg,'/=$','/') endif endif endwhile @@ -2009,7 +2115,7 @@ function! s:Command(bang,...) let cmds = 'ESVT ' let cmd = '' while cmds != '' - exe 'command! -buffer -bar -bang -nargs=* -complete=custom,'.s:sid.'CommandList R'.cmd.name." :call s:CommandEdit(<bang>0,'".cmd."','".name."',\"".prefix."\",".s:string(suffix).",".s:string(filter).",".s:string(default).",<f-args>)" + exe 'command! -buffer -bar -bang -nargs=* -complete=customlist,'.s:sid.'CommandList R'.cmd.name." :call s:CommandEdit(<bang>0,'".cmd."','".name."',\"".prefix."\",".string(suffix).",".string(filter).",".string(default).",<f-args>)" let cmd = strpart(cmds,0,1) let cmds = strpart(cmds,1) endwhile @@ -2019,17 +2125,16 @@ function! s:CommandList(A,L,P) let cmd = matchstr(a:L,'\CR[A-Z]\=\w\+') exe cmd." &" let lp = s:last_prefix . "\n" - let res = "" + let res = [] while lp != "" let p = matchstr(lp,'.\{-\}\ze\n') let lp = s:sub(lp,'.{-}\n','') - let res = res . s:relglob(p,s:last_filter,s:last_suffix)."\n" + let res += rails#app().relglob(p,s:last_filter,s:last_suffix) endwhile - let res = s:compact(res) if s:last_camelize return s:autocamelize(res,a:A) else - return res + return s:completion_filter(res,a:A) endif endfunction @@ -2061,58 +2166,54 @@ function! s:EditSimpleRb(bang,cmd,name,target,prefix,suffix) let cmd = s:findcmdfor(a:cmd.(a:bang?'!':'')) if a:target == "" " Good idea to emulate error numbers like this? - return s:error("E471: Argument required") " : R',a:name) - "else - "let g:target = a:target + return s:error("E471: Argument required") endif - let f = s:underscore(a:target) - let jump = matchstr(f,'[@#].*') - let f = s:sub(f,'[@#].*','') + let f = rails#underscore(a:target) + let jump = matchstr(f,'#.*\|:\d*\%(:in\)\=$') + let f = s:sub(f,'#.*|:\d*%(:in)=$','') if f == '.' let f = s:sub(f,'\.$','') else - let f = f.a:suffix.jump - if a:suffix !~ '\.' - "let f = f.".rb" - endif + let f .= a:suffix.jump endif let f = s:gsub(a:prefix,'\n',f.'\n').f return s:findedit(cmd,f) endfunction -function! s:migrationfor(file) - let tryagain = 0 +function! s:app_migration(file) dict let arg = a:file - if arg =~ '^\d$' + if arg =~ '^0\+$' + if self.has_file('db/schema.rb') + return 'db/schema.rb' + elseif self.has_file('db/'.s:environment().'_structure.sql') + return 'db/'.s:environment().'_structure.sql' + else + return 'db/schema.rb' + endif + elseif arg =~ '^\d$' let glob = '00'.arg.'_*.rb' elseif arg =~ '^\d\d$' let glob = '0'.arg.'_*.rb' elseif arg =~ '^\d\d\d$' let glob = ''.arg.'_*.rb' elseif arg == '' - if s:model(1) != '' - let glob = '*_'.s:pluralize(s:model(1)).'.rb' - let tryagain = 1 - else - let glob = '*.rb' - endif + let glob = '*.rb' else - let glob = '*'.arg.'*rb' - endif - let migr = s:sub(glob(RailsRoot().'/db/migrate/'.glob),'.*\n','') - if migr == '' && tryagain - let migr = s:sub(glob(RailsRoot().'/db/migrate/*.rb'),'.*\n','') + let glob = '*'.rails#underscore(arg).'*rb' endif - if strpart(migr,0,strlen(RailsRoot())) == RailsRoot() - let migr = strpart(migr,1+strlen(RailsRoot())) + let migr = s:sub(glob(self.path('db/migrate/').glob),'.*\n','') + if s:startswith(migr,self.path()) + let migr = strpart(migr,1+strlen(self.path())) endif return migr endfunction +call s:add_methods('app', ['migration']) + function! s:migrationEdit(bang,cmd,...) let cmd = s:findcmdfor(a:cmd.(a:bang?'!':'')) let arg = a:0 ? a:1 : '' - let migr = arg == "." ? "db/migrate" : s:migrationfor(arg) + let migr = arg == "." ? "db/migrate" : rails#app().migration(arg) if migr != '' call s:findedit(cmd,migr) else @@ -2122,9 +2223,9 @@ endfunction function! s:fixturesEdit(bang,cmd,...) if a:0 - let c = s:underscore(a:1) + let c = rails#underscore(a:1) else - let c = s:pluralize(s:model(1)) + let c = rails#pluralize(s:model(1)) endif if c == "" return s:error("E471: Argument required") @@ -2133,10 +2234,10 @@ function! s:fixturesEdit(bang,cmd,...) let e = e == '' ? e : '.'.e let c = fnamemodify(c,':r') let file = 'test/fixtures/'.c.e - if file =~ '\.\w\+$' && !s:hasfile("spec/fixtures/".c.e) + if file =~ '\.\w\+$' && !rails#app().has_file("spec/fixtures/".c.e) call s:edit(a:cmd.(a:bang?'!':''),file) else - call s:findedit(a:cmd.(a:bang?'!':''),file."\nspec/fixtures/".c.e) + call s:findedit(a:cmd.(a:bang?'!':''),rails#app().find_file(c.e,["test/fixtures","spec/fixtures"],[".yml",".csv"],file)) endif endfunction @@ -2176,8 +2277,8 @@ function! s:viewEdit(bang,cmd,...) call s:findedit(a:cmd.(a:bang?'!':''),file) else let format = s:format('html') - if glob(RailsRoot().'/'.file.'.'.format.'.*[^~]') != '' - let file = file . '.' . format + if glob(rails#app().path(file.'.'.format).'.*[^~]') != '' + let file .= '.' . format endif call s:findedit(a:cmd.(a:bang?'!':''),file) endif @@ -2196,9 +2297,9 @@ function! s:findview(name) endif if c =~ '\.\w\+\.\w\+$' || c =~ '\.'.s:viewspattern().'$' return pre.c - elseif s:hasfile(pre.c.".rhtml") + elseif rails#app().has_file(pre.c.".rhtml") let file = pre.c.".rhtml" - elseif s:hasfile(pre.c.".rxml") + elseif rails#app().has_file(pre.c.".rxml") let file = pre.c.".rxml" else let format = "." . s:format('html') @@ -2207,7 +2308,7 @@ function! s:findview(name) while vt != "" let t = matchstr(vt,'[^,]*') let vt = s:sub(vt,'[^,]*,','') - if s:hasfile(pre.c.format.".".t) + if rails#app().has_file(pre.c.format.".".t) let file = pre.c.format.".".t break endif @@ -2223,12 +2324,12 @@ function! s:findview(name) endfunction function! s:findlayout(name) - return s:findview("layouts/".a:name) + return s:findview("layouts/".(a:name == '' ? 'application' : a:name)) endfunction function! s:layoutEdit(bang,cmd,...) if a:0 - let c = s:underscore(a:1) + let c = rails#underscore(a:1) else let c = s:controller(1) endif @@ -2240,7 +2341,7 @@ function! s:layoutEdit(bang,cmd,...) let file = s:findlayout("application") endif if file == "" - let file = "app/views/layouts/application.rhtml" + let file = "app/views/layouts/application.html.erb" endif call s:edit(a:cmd.(a:bang?'!':''),s:sub(file,'^/','')) endfunction @@ -2250,12 +2351,12 @@ function! s:controllerEdit(bang,cmd,...) if a:0 == 0 let controller = s:controller(1) if RailsFileType() =~ '^view\%(-layout\|-partial\)\@!' - let suffix = suffix.'#'.expand('%:t:r') + let suffix .= '#'.expand('%:t:r') endif else let controller = a:1 endif - if s:hasfile("app/controllers/".controller."_controller.rb") || !s:hasfile("app/controllers/".controller.".rb") + if rails#app().has_file("app/controllers/".controller."_controller.rb") || !rails#app().has_file("app/controllers/".controller.".rb") let suffix = "_controller".suffix endif return s:EditSimpleRb(a:bang,a:cmd,"controller",controller,"app/controllers/",suffix) @@ -2278,40 +2379,62 @@ function! s:javascriptEdit(bang,cmd,...) endfunction function! s:unittestEdit(bang,cmd,...) - let f = a:0 ? a:1 : s:model(1) - if !a:0 && RailsFileType() =~ '^model-aro\>' && f != '' && f !~ '_observer$' - if s:hasfile("test/unit/".f."_observer.rb") || !s:hasfile("test/unit/".f.".rb") - let f = f . "_observer" + let cmd = s:findcmdfor(a:cmd.(a:bang?'!':'')) + let f = rails#underscore(a:0 ? a:1 : s:model(1)) + let mapping = {'test': ['test/unit/','_test.rb'], 'spec': ['spec/models/','_spec.rb']} + let tests = map(rails#app().test_suites(),'get(mapping,v:val,"test")') + if empty(tests) + let tests = [mapping[tests]] + endif + for [prefix, suffix] in tests + if !a:0 && RailsFileType() =~# '^model-aro\>' && f != '' && f !~# '_observer$' + if rails#app().has_file(prefix.f.'_observer'.suffix) + return s:findedit(cmd,prefix.f.'_observer'.suffix) + endif endif - endif - return s:EditSimpleRb(a:bang,a:cmd,"unittest",f,"test/unit/","_test.rb") + endfor + for [prefix, suffix] in tests + if rails#app().has_file(prefix.f.suffix) + return s:findedit(cmd,prefix.f.suffix) + endif + endfor + return s:findedit(cmd,tests[0][0].f.tests[0][1]) endfunction function! s:functionaltestEdit(bang,cmd,...) + let cmd = s:findcmdfor(a:cmd.(a:bang?'!':'')) + let f = rails#underscore(a:0 ? a:1 : s:controller(1)) + let mapping = {'test': ['test/functional/','_test.rb'], 'spec': ['spec/controllers/','_spec.rb']} + let tests = map(rails#app().test_suites(),'get(mapping,v:val,"test")') + if empty(tests) + let tests = [mapping[tests]] + endif + for [prefix, suffix] in tests + if rails#app().has_file(prefix.f.suffix) + return s:findedit(cmd,prefix.f.suffix) + elseif rails#app().has_file(prefix.f.'_controller'.suffix) + return s:findedit(cmd,prefix.f.'_controller'.suffix) + elseif rails#app().has_file(prefix.f.'_api'.suffix) + return s:findedit(cmd,prefix.f.'_api'.suffix) + endif + endfor + return s:findedit(cmd,tests[0][0].f.tests[0][1]) +endfunction + +function! s:integrationtestEdit(bang,cmd,...) if a:0 - let f = a:1 + return s:EditSimpleRb(a:bang,a:cmd,"integrationtest",a:1,"test/integration/","_test.rb") else - let f = s:controller() - endif - if f != '' && !s:hasfile("test/functional/".f."_test.rb") - if s:hasfile("test/functional/".f."_controller_test.rb") - let f = f . "_controller" - elseif s:hasfile("test/functional/".f."_api_test.rb") - let f = f . "_api" - endif + call s:EditSimpleRb(a:bang,a:cmd,"integrationtest","test_helper","test/",".rb") endif - return s:EditSimpleRb(a:bang,a:cmd,"functionaltest",f,"test/functional/","_test.rb") endfunction -function! s:integrationtestEdit(bang,cmd,...) +function! s:specEdit(bang,cmd,...) if a:0 - let f = a:1 - elseif s:model() != '' - let f = s:model() + return s:EditSimpleRb(a:bang,a:cmd,"spec",a:1,"spec/","_spec.rb") else - let f = s:controller() + call s:EditSimpleRb(a:bang,a:cmd,"spec","spec_helper","spec/",".rb") endif - return s:EditSimpleRb(a:bang,a:cmd,"integrationtest",f,"test/integration/","_test.rb") endfunction function! s:pluginEdit(bang,cmd,...) @@ -2323,13 +2446,13 @@ function! s:pluginEdit(bang,cmd,...) let extra = "vendor/plugins/" . plugin . "/\n" endif if a:0 - if a:1 =~ '^[^/.]*/\=$' && s:hasfile("vendor/plugins/".a:1."/init.rb") + if a:1 =~ '^[^/.]*/\=$' && rails#app().has_file("vendor/plugins/".a:1."/init.rb") return s:EditSimpleRb(a:bang,a:cmd,"plugin",s:sub(a:1,'/$',''),"vendor/plugins/","/init.rb") elseif plugin == "" call s:edit(cmd,"vendor/plugins/".s:sub(a:1,'\.$','')) elseif a:1 == "." call s:findedit(cmd,"vendor/plugins/".plugin) - elseif isdirectory(RailsRoot()."/vendor/plugins/".matchstr(a:1,'^[^/]*')) + elseif isdirectory(rails#app().path("vendor/plugins/".matchstr(a:1,'^[^/]*'))) call s:edit(cmd,"vendor/plugins/".a:1) else call s:findedit(cmd,"vendor/plugins/".a:1."\nvendor/plugins/".plugin."/".a:1) @@ -2344,7 +2467,7 @@ function! s:taskEdit(bang,cmd,...) let extra = "" if RailsFilePath() =~ '\<vendor/plugins/.' let plugin = matchstr(RailsFilePath(),'\<vendor/plugins/[^/]*') - let extra = plugin."/tasks/\n" + let extra = plugin."/tasks/\n".plugin."/lib/tasks/\n" endif if a:0 call s:EditSimpleRb(a:bang,a:cmd,"task",a:1,extra."lib/tasks/",".rake") @@ -2359,13 +2482,20 @@ function! s:libEdit(bang,cmd,...) let extra = s:sub(RailsFilePath(),'<vendor/plugins/[^/]*/\zs.*','lib/')."\n" endif if a:0 - call s:EditSimpleRb(a:bang,a:cmd,"task",a:0? a:1 : "",extra."lib/",".rb") + call s:EditSimpleRb(a:bang,a:cmd,"lib",a:0? a:1 : "",extra."lib/",".rb") else - " Easter egg - call s:EditSimpleRb(a:bang,a:cmd,"task","environment","config/",".rb") + call s:EditSimpleRb(a:bang,a:cmd,"lib","routes","config/",".rb") endif endfunction +function! s:environmentEdit(bang,cmd,...) + return s:EditSimpleRb(a:bang,a:cmd,"environment",a:0? a:1 : "../environment","config/environments/",".rb") +endfunction + +function! s:initializerEdit(bang,cmd,...) + return s:EditSimpleRb(a:bang,a:cmd,"initializer",a:0? a:1 : "../routes","config/initializers/",".rb") +endfunction + " }}}1 " Alternate/Related {{{1 @@ -2418,74 +2548,62 @@ function! s:try(cmd) abort return 1 endfunction -function! s:findedit(cmd,file,...) abort +function! s:findedit(cmd,files,...) abort let cmd = s:findcmdfor(a:cmd) - if a:file =~ '\n' - let filelist = a:file . "\n" - let file = '' - while file == '' && filelist != '' - let maybe = matchstr(filelist,'^.\{-\}\ze\n') - let filelist = s:sub(filelist,'^.{-}\n','') - if s:hasfile(s:sub(maybe,'[@#].*','')) - let file = maybe - endif - endwhile - if file == '' - let file = matchstr(a:file."\n",'^.\{-\}\ze\n') - endif + let files = type(a:files) == type([]) ? copy(a:files) : split(a:files,"\n") + if len(files) == 1 + let file = files[0] else - let file = a:file + let file = get(filter(copy(files),'rails#app().has_file(s:sub(v:val,"#.*|:\\d*$",""))'),0,get(files,0,'')) endif - if file =~ '[@#]' - let djump = matchstr(file,'[@#]\zs.*') - let file = matchstr(file,'.\{-\}\ze[@#]') + if file =~ '#\|:\d*\%(:in\)\=$' + let djump = matchstr(file,'#\zs.*\|:\zs\d*\ze\%(:in\)\=$') + let file = s:sub(file,'#.*|:\d*%(:in)=$','') else let djump = '' endif if file == '' let testcmd = "edit" - elseif RailsRoot() =~ '://' || cmd =~ 'edit' || cmd =~ 'split' + elseif isdirectory(rails#app().path(file)) + let arg = file == "." ? rails#app().path() : rails#app().path(file) + let testcmd = s:editcmdfor(cmd).' '.(a:0 ? a:1 . ' ' : '').s:escarg(arg) + exe testcmd + return + elseif rails#app().path() =~ '://' || cmd =~ 'edit' || cmd =~ 'split' if file !~ '^/' && file !~ '^\w:' && file !~ '://' - let file = s:ra().'/'.file + let file = s:escarg(rails#app().path(file)) endif let testcmd = s:editcmdfor(cmd).' '.(a:0 ? a:1 . ' ' : '').file - elseif isdirectory(RailsRoot().'/'.file) - let testcmd = s:editcmdfor(cmd).' '.(a:0 ? a:1 . ' ' : '').s:ra().'/'.file - exe testcmd - return else let testcmd = cmd.' '.(a:0 ? a:1 . ' ' : '').file endif if s:try(testcmd) - " Shorten the file name (I don't fully understand how Vim decides when to - " use a relative/absolute path for the file name, so lets blindly force it - " to be as short as possible) - "silent! file %:~:. - "silent! lcd . call s:djump(djump) endif endfunction function! s:edit(cmd,file,...) let cmd = s:editcmdfor(a:cmd) - let cmd = cmd.' '.(a:0 ? a:1 . ' ' : '') + let cmd .= ' '.(a:0 ? a:1 . ' ' : '') let file = a:file if file !~ '^/' && file !~ '^\w:' && file !~ '://' - "let file = s:ra().'/'.file - exe cmd."`=RailsRoot().'/'.file`" + exe cmd."`=fnamemodify(rails#app().path(file),':.')`" else exe cmd.file endif - "exe cmd.file endfunction -function! s:Alternate(bang,cmd) - let cmd = a:cmd.(a:bang?"!":"") - let file = s:AlternateFile() - if file != "" - call s:findedit(cmd,file) +function! s:Alternate(bang,cmd,...) + if a:0 + return call('s:Find',[a:bang,1,a:cmd]+a:000) else - call s:warn("No alternate file is defined") + let cmd = a:cmd.(a:bang?"!":"") + let file = s:AlternateFile() + if file != "" + call s:findedit(cmd,file) + else + call s:warn("No alternate file is defined") + endif endif endfunction @@ -2504,13 +2622,13 @@ function! s:AlternateFile() elseif f =~ '\<config/environment\.rb$' | return "config/database.yml" elseif f =~ '\<db/migrate/\d\d\d_' let num = matchstr(f,'\<db/migrate/0*\zs\d\+\ze_')-1 - return num ? s:migrationfor(num) : "db/schema.rb" + return rails#app().migration(num) elseif f =~ '\<application\.js$' return "app/helpers/application_helper.rb" elseif t =~ '^js\>' return "public/javascripts/application.js" elseif f =~ '\<db/schema\.rb$' - return s:migrationfor("") + return rails#app().migration('') elseif t =~ '^view\>' if t =~ '\<layout\>' let dest = fnamemodify(f,':r:s?/layouts\>??').'/layout.'.fnamemodify(f,':e') @@ -2518,18 +2636,24 @@ function! s:AlternateFile() let dest = f endif " Go to the (r)spec, helper, controller, or (mailer) model - let spec = fnamemodify(dest,':r:s?\<app/?spec/?')."_view_spec.rb" + let spec1 = fnamemodify(dest,':s?\<app/?spec/?')."_spec.rb" + let spec2 = fnamemodify(dest,':r:s?\<app/?spec/?')."_spec.rb" + let spec3 = fnamemodify(dest,':r:r:s?\<app/?spec/?')."_spec.rb" let helper = fnamemodify(dest,':h:s?/views/?/helpers/?')."_helper.rb" let controller = fnamemodify(dest,':h:s?/views/?/controllers/?')."_controller.rb" let model = fnamemodify(dest,':h:s?/views/?/models/?').".rb" - if s:hasfile(spec) - return spec - elseif s:hasfile(helper) + if rails#app().has_file(spec1) + return spec1 + elseif rails#app().has_file(spec2) + return spec2 + elseif rails#app().has_file(spec3) + return spec3 + elseif rails#app().has_file(helper) return helper - elseif s:hasfile(controller) + elseif rails#app().has_file(controller) let jumpto = expand("%:t:r") return controller.'#'.jumpto - elseif s:hasfile(model) + elseif rails#app().has_file(model) return model else return helper @@ -2541,37 +2665,36 @@ function! s:AlternateFile() let controller = s:sub(s:sub(f,'/helpers/','/controllers/'),'_helper\.rb$','_controller.rb') let controller = s:sub(controller,'application_controller','application') let spec = s:sub(s:sub(f,'<app/','spec/'),'\.rb$','_spec.rb') - if s:hasfile(spec) + if rails#app().has_file(spec) return spec else return controller endif elseif t =~ '\<fixtures\>' && f =~ '\<spec/' - let file = s:singularize(expand("%:t:r")).'_spec.rb' + let file = rails#singularize(expand("%:t:r")).'_spec.rb' return file elseif t =~ '\<fixtures\>' - let file = s:singularize(expand("%:t:r")).'_test.rb' " .expand('%:e') + let file = rails#singularize(expand("%:t:r")).'_test.rb' " .expand('%:e') return file elseif f == '' call s:warn("No filename present") elseif f =~ '\<test/unit/routing_test\.rb$' return 'config/routes.rb' elseif t=~ '^spec-view\>' - return s:sub(s:sub(f,'<spec/','app/'),'_view_spec\.rb$','') + return s:sub(s:sub(f,'<spec/','app/'),'_spec\.rb$','') elseif fnamemodify(f,":e") == "rb" let file = fnamemodify(f,":r") if file =~ '_\%(test\|spec\)$' let file = s:sub(file,'_%(test|spec)$','.rb') else - let file = file.'_test.rb' + let file .= '_test.rb' endif if t =~ '^model\>' return s:sub(file,'app/models/','test/unit/')."\n".s:sub(s:sub(file,'_test\.rb$','_spec.rb'),'app/models/','spec/models/') elseif t =~ '^controller\>' - "return s:sub(file,'app/controllers/','test/functional/') return s:sub(file,'<app/controllers/','test/functional/')."\n".s:sub(s:sub(file,'_test\.rb$','_spec.rb'),'app/controllers/','spec/controllers/') elseif t =~ '^test-unit\>' - return s:sub(file,'test/unit/','app/models/') + return s:sub(file,'test/unit/','app/models/')."\n".s:sub(file,'test/unit/','lib/') elseif t =~ '^test-functional\>' if file =~ '_api\.rb' return s:sub(file,'test/functional/','app/apis/') @@ -2580,6 +2703,10 @@ function! s:AlternateFile() else return s:sub(file,'test/functional/','') endif + elseif t == 'spec-lib' + return s:sub(file,'<spec/','') + elseif t == 'lib' + return s:sub(f, '<lib/(.*)\.rb$', 'test/unit/\1_test\.rb')."\n".s:sub(f, '<lib/(.*)\.rb$', 'spec/lib/\1_spec\.rb') elseif t =~ '^spec\>' return s:sub(file,'<spec/','app/') elseif file =~ '\<vendor/.*/lib/' @@ -2594,13 +2721,17 @@ function! s:AlternateFile() endif endfunction -function! s:Related(bang,cmd) - let cmd = a:cmd.(a:bang?"!":"") - let file = s:RelatedFile() - if file != "" - call s:findedit(cmd,file) +function! s:Related(bang,cmd,...) + if a:0 + return call('s:Edit',[a:bang,1,a:cmd]+a:000) else - call s:warn("No related file is defined") + let cmd = a:cmd.(a:bang?"!":"") + let file = s:RelatedFile() + if file != "" + call s:findedit(cmd,file) + else + call s:warn("No related file is defined") + endif endif endfunction @@ -2613,7 +2744,7 @@ function! s:RelatedFile() elseif t =~ '^\%(controller\|model-mailer\)\>' && lastmethod != "" let root = s:sub(s:sub(s:sub(f,'/application\.rb$','/shared_controller.rb'),'/%(controllers|models)/','/views/'),'%(_controller)=\.rb$','/'.lastmethod) let format = s:format('html') - if glob(RailsRoot().'/'.root.'.'.format.'.*[^~]') != '' + if glob(rails#app().path().'/'.root.'.'.format.'.*[^~]') != '' return root . '.' . format else return root @@ -2635,7 +2766,7 @@ function! s:RelatedFile() elseif f =~ '\<config/environment\.rb$' | return "config/routes.rb" elseif f =~ '\<db/migrate/\d\d\d_' let num = matchstr(f,'\<db/migrate/0*\zs\d\+\ze_')+1 - let migr = s:migrationfor(num) + let migr = rails#app().migration(num) return migr == '' ? "db/schema.rb" : migr elseif t =~ '^test\>' && f =~ '\<test/\w\+/' let target = s:sub(f,'.*<test/\w+/','test/mocks/test/') @@ -2647,8 +2778,6 @@ function! s:RelatedFile() return "public/javascripts/application.js" elseif t =~ '^view-layout\>' return s:sub(s:sub(s:sub(f,'/views/','/controllers/'),'/layouts/(\k+)\..*$','/\1_controller.rb'),'<application_controller\.rb$','application.rb') - "elseif t=~ '^view-partial\>' - "call s:warn("No related file is defined") elseif t =~ '^view\>' let controller = s:sub(s:sub(f,'/views/','/controllers/'),'/(\k+%(\.\k+)=)\..*$','_controller.rb#\1') let controller2 = s:sub(s:sub(f,'/views/','/controllers/'),'/(\k+%(\.\k+)=)\..*$','.rb#\1') @@ -2667,18 +2796,16 @@ function! s:RelatedFile() elseif t =~ '^controller\>' return s:sub(s:sub(f,'/controllers/','/helpers/'),'%(_controller)=\.rb$','_helper.rb') elseif t=~ '^helper\>' - return s:sub(s:sub(f,'/helpers/','/views/layouts/'),'%(_helper)=\.rb$','') + return s:findlayout(s:controller()) elseif t =~ '^model-arb\>' - "call s:migrationEdit(0,cmd,'create_'.s:pluralize(expand('%:t:r'))) - return s:migrationfor('create_'.s:pluralize(expand('%:t:r'))) + return rails#app().migration('create_'.rails#pluralize(s:gsub(s:model(),'/','_'))) elseif t =~ '^model-aro\>' return s:sub(f,'_observer\.rb$','.rb') elseif t =~ '^api\>' return s:sub(s:sub(f,'/apis/','/controllers/'),'_api\.rb$','_controller.rb') elseif f =~ '\<db/schema\.rb$' - return s:migrationfor(1) + return rails#app().migration(1) else - "call s:warn("No related file is defined") return "" endif endfunction @@ -2686,8 +2813,6 @@ endfunction " }}}1 " Partial Extraction {{{1 -" Depends: s:error, s:sub, s:viewspattern, s:warn - function! s:Extract(bang,...) range abort if a:0 == 0 || a:0 > 1 return s:error("Incorrect number of arguments") @@ -2695,9 +2820,9 @@ function! s:Extract(bang,...) range abort if a:1 =~ '[^a-z0-9_/.]' return s:error("Invalid partial name") endif - let rails_root = RailsRoot() + let rails_root = rails#app().path() let ext = expand("%:e") - let file = a:1 + let file = s:sub(a:1,'%(/|^)\zs_\ze[^/]*$','') let first = a:firstline let last = a:lastline let range = first.",".last @@ -2718,10 +2843,10 @@ function! s:Extract(bang,...) range abort let fname = fnamemodify(file,":t") if fnamemodify(fname,":e") == "" let name = fname - let fname = fname.".".matchstr(expand("%:t"),'\.\zs.*') + let fname .= ".".matchstr(expand("%:t"),'\.\zs.*') elseif fnamemodify(fname,":e") !~ '^'.s:viewspattern().'$' let name = fnamemodify(fname,":r") - let fname = fname.".".ext + let fname .= ".".ext else let name = fnamemodify(fname,":r:r") endif @@ -2729,7 +2854,7 @@ function! s:Extract(bang,...) range abort let collection = "" if dir =~ '^/' let out = (rails_root).dir."/_".fname - elseif dir == "" + elseif dir == "" || dir == "." let out = (curdir)."/_".fname elseif isdirectory(curdir."/".dir) let out = (curdir)."/".dir."/_".fname @@ -2738,8 +2863,6 @@ function! s:Extract(bang,...) range abort endif if filereadable(out) let partial_warn = 1 - "echoerr "Partial exists" - "return endif if bufnr(out) > 0 if bufloaded(out) @@ -2767,18 +2890,17 @@ function! s:Extract(bang,...) range abort if collection != '' let var = matchstr(collection,'^\k\+') let collection = s:sub(collection,'^\k+\>','') - let first = first - 1 - let last = last + 1 + let first -= 1 + let last += 1 endif else let fspaces = spaces endif - "silent exe range."write ".out let renderstr = "render :partial => '".fnamemodify(file,":r:r")."'" if collection != "" - let renderstr = renderstr.", :collection => ".collection + let renderstr .= ", :collection => ".collection elseif "@".name != var - let renderstr = renderstr.", :object => ".var + let renderstr .= ", :object => ".var endif if ext =~? '^\%(rhtml\|erb\|dryml\)$' let renderstr = "<%= ".renderstr." %>" @@ -2810,8 +2932,7 @@ function! s:Extract(bang,...) range abort else new endif - let shortout = fnamemodify(out,':~:.') - "exe "silent file ".s:escarg(shortout) + let shortout = fnamemodify(out,':.') silent file `=shortout` let &ft = ft let @@ = partial @@ -2832,8 +2953,6 @@ endfunction " }}}1 " Migration Inversion {{{1 -" Depends: s:sub, s:endof, s:gsub, s:error - function! s:mkeep(str) " Things to keep (like comments) from a migration statement return matchstr(a:str,' #[^{].*') @@ -2881,7 +3000,7 @@ function! s:invertrange(beg,end) let add = s:sub(add,'\)=$',', :column => '.mat.'&') endif endif - let add = add.s:mkeep(line) + let add .= s:mkeep(line) elseif line =~ '\<remove_index\>' let add = s:sub(s:sub(line,'<remove_index','add_index'),':column\s*=>\s*','') elseif line =~ '\<rename_\%(table\|column\)\>' @@ -2909,7 +3028,7 @@ function! s:invertrange(beg,end) let add = "" endif let str = add."\n".str - let lnum = lnum + 1 + let lnum += 1 endwhile let str = s:gsub(str,'(\s*raise ActiveRecord::IrreversableMigration\n)+','\1') return str @@ -2939,6 +3058,9 @@ function! s:Invert(bang) if !beg || !end return s:error(err) endif + if foldclosed(beg) > 0 + exe beg."foldopen!" + endif if beg + 1 < end exe (beg+1).",".(end-1)."delete _" endif @@ -2954,73 +3076,49 @@ endfunction " }}}1 " Cache {{{1 -function! s:cacheworks() - if v:version < 700 || RailsRoot() == "" - return 0 - endif - if !exists("s:cache") - let s:cache = {} - endif - if !has_key(s:cache,RailsRoot()) - let s:cache[RailsRoot()] = {} +let s:cache_prototype = {'dict': {}} + +function! s:cache_clear(...) dict + if a:0 == 0 + let self.dict = {} + elseif has_key(self,'dict') && has_key(self.dict,a:1) + unlet! self.dict[a:1] endif - return 1 endfunction -function! s:cacheclear(...) - if RailsRoot() == "" | return "" | endif - if !s:cacheworks() | return "" | endif - if a:0 == 1 - if s:cachehas(a:1) - unlet! s:cache[RailsRoot()][a:1] - endif - else - let s:cache[RailsRoot()] = {} +function! rails#cache_clear(...) + if exists('b:rails_root') + return call(rails#app().cache.clear,a:000,rails#app().cache) endif endfunction -function! s:cache(...) - if !s:cacheworks() | return "" | endif +function! s:cache_get(...) dict if a:0 == 1 - return s:cache[RailsRoot()][a:1] + return self.dict[a:1] else - return s:cache[RailsRoot()] + return self.dict endif endfunction -"function! RailsCache(...) - "if !s:cacheworks() | return "" | endif - "if a:0 == 1 - "if s:cachehas(a:1) - "return s:cache(a:1) - "else - "return "" - "endif - "else - "return s:cache() - "endif -"endfunction - -function! s:cachehas(key) - if !s:cacheworks() | return "" | endif - return has_key(s:cache(),a:key) +function! s:cache_has(key) dict + return has_key(self.dict,a:key) endfunction -function! s:cacheneeds(key) - if !s:cacheworks() | return "" | endif - return !has_key(s:cache(),a:key) +function! s:cache_needs(key) dict + return !has_key(self.dict,a:key) endfunction -function! s:cacheset(key,value) - if !s:cacheworks() | return "" | endif - let s:cache[RailsRoot()][a:key] = a:value +function! s:cache_set(key,value) dict + let self.dict[a:key] = a:value endfunction +call s:add_methods('cache', ['clear','needs','has','get','set']) + +let s:app_prototype.cache = s:cache_prototype + " }}}1 " Syntax {{{1 -" Depends: s:rubyeval, s:gsub, cache functions - function! s:resetomnicomplete() if exists("+completefunc") && &completefunc == 'syntaxcomplete#Complete' if exists("g:loaded_syntax_completion") @@ -3032,54 +3130,58 @@ function! s:resetomnicomplete() endfunction function! s:helpermethods() - let s:rails_helper_methods = "" + return "" \."atom_feed auto_discovery_link_tag auto_link " - \."benchmark button_to button_to_function " - \."cache capture cdata_section check_box check_box_tag collection_select concat content_for content_tag content_tag_for country_options_for_select country_select cycle " + \."benchmark button_to button_to_function button_to_remote " + \."cache capture cdata_section check_box check_box_tag collection_select concat content_for content_tag content_tag_for current_cycle cycle " \."date_select datetime_select debug define_javascript_functions distance_of_time_in_words distance_of_time_in_words_to_now div_for dom_class dom_id draggable_element draggable_element_js drop_receiving_element drop_receiving_element_js " \."error_message_on error_messages_for escape_javascript escape_once evaluate_remote_response excerpt " \."field_set_tag fields_for file_field file_field_tag form form_for form_remote_for form_remote_tag form_tag " \."hidden_field hidden_field_tag highlight " \."image_path image_submit_tag image_tag input " \."javascript_cdata_section javascript_include_tag javascript_path javascript_tag " - \."label label_tag link_to link_to_function link_to_if link_to_remote link_to_unless link_to_unless_current " + \."l label label_tag link_to link_to_function link_to_if link_to_remote link_to_unless link_to_unless_current localize " \."mail_to markdown " \."number_to_currency number_to_human_size number_to_percentage number_to_phone number_with_delimiter number_with_precision " \."observe_field observe_form option_groups_from_collection_for_select options_for_select options_from_collection_for_select " \."partial_path password_field password_field_tag path_to_image path_to_javascript path_to_stylesheet periodically_call_remote pluralize " \."radio_button radio_button_tag remote_form_for remote_function reset_cycle " \."sanitize sanitize_css select select_date select_datetime select_day select_hour select_minute select_month select_second select_tag select_time select_year simple_format sortable_element sortable_element_js strip_links strip_tags stylesheet_link_tag stylesheet_path submit_tag submit_to_remote " - \."tag text_area text_area_tag text_field text_field_tag textilize textilize_without_paragraph time_ago_in_words time_select time_zone_options_for_select time_zone_select truncate " + \."t tag text_area text_area_tag text_field text_field_tag textilize textilize_without_paragraph time_ago_in_words time_select time_zone_options_for_select time_zone_select translate truncate " \."update_page update_page_tag url_for " \."visual_effect " \."word_wrap" +endfunction - " The list of helper methods used to be derived automatically. Let's keep - " this code around in case it's needed again. - if !exists("s:rails_helper_methods") - if g:rails_expensive - let s:rails_helper_methods = "" - if has("ruby") - " && (has("win32") || has("win32unix")) - ruby begin; require 'rubygems'; rescue LoadError; end - if exists("g:rubycomplete_rails") && g:rubycomplete_rails - ruby begin; require VIM::evaluate('RailsRoot()')+'/config/environment'; rescue Exception; end - else - ruby begin; require 'active_support'; require 'action_controller'; require 'action_view'; rescue LoadError; end - end - ruby begin; h = ActionView::Helpers.constants.grep(/Helper$/).collect {|c|ActionView::Helpers.const_get c}.collect {|c| c.public_instance_methods(false)}.collect {|es| es.reject {|e| e =~ /_with(out)?_deprecation$/ || es.include?("#{e}_without_deprecation")}}.flatten.sort.uniq.reject {|m| m =~ /[=?!]$/}; VIM::command('let s:rails_helper_methods = "%s"' % h.join(" ")); rescue Exception; end - endif - if s:rails_helper_methods == "" - let s:rails_helper_methods = s:rubyeval('require %{action_controller}; require %{action_view}; h = ActionView::Helpers.constants.grep(/Helper$/).collect {|c|ActionView::Helpers.const_get c}.collect {|c| c.public_instance_methods(false)}.collect {|es| es.reject {|e| e =~ /_with(out)?_deprecation$/ || es.include?(%{#{e}_without_deprecation})}}.flatten.sort.uniq.reject {|m| m =~ /[=?!]$/}; puts h.join(%{ })',"link_to") - endif +function! s:app_user_classes() dict + if self.cache.needs("user_classes") + let controllers = self.relglob("app/controllers/","**/*",".rb") + call map(controllers,'v:val == "application" ? v:val."_controller" : v:val') + let classes = + \ self.relglob("app/models/","**/*",".rb") + + \ controllers + + \ self.relglob("app/helpers/","**/*",".rb") + + \ self.relglob("lib/","**/*",".rb") + call map(classes,'rails#camelize(v:val)') + call self.cache.set("user_classes",classes) + endif + return self.cache.get('user_classes') +endfunction + +function! s:app_user_assertions() dict + if self.cache.needs("user_assertions") + if self.has_file("test/test_helper.rb") + let assertions = map(filter(s:readfile(self.path("test/test_helper.rb")),'v:val =~ "^ def assert_"'),'matchstr(v:val,"^ def \\zsassert_\\w\\+")') else - let s:rails_helper_methods = "link_to" + let assertions = [] endif + call self.cache.set("user_assertions",assertions) endif - "let g:rails_helper_methods = s:rails_helper_methods - return s:rails_helper_methods + return self.cache.get('user_assertions') endfunction +call s:add_methods('app', ['user_classes','user_assertions']) + function! s:BufSyntax() if (!exists("g:rails_syntax") || g:rails_syntax) let t = RailsFileType() @@ -3088,7 +3190,7 @@ function! s:BufSyntax() let s:prototype_classes = "Prototype Class Abstract Try PeriodicalExecuter Enumerable Hash ObjectRange Element Ajax Responders Base Request Updater PeriodicalUpdater Toggle Insertion Before Top Bottom After ClassNames Form Serializers TimedObserver Observer EventObserver Event Position Effect Effect2 Transitions ScopedQueue Queues DefaultOptions Parallel Opacity Move MoveBy Scale Highlight ScrollTo Fade Appear Puff BlindUp BlindDown SwitchOff DropOut Shake SlideDown SlideUp Squish Grow Shrink Pulsate Fold" let rails_helper_methods = '+\.\@<!\<$'.s:gsub(s:helpermethods(),'\s+','\\|').'$\>+' - let classes = s:gsub(RailsUserClasses(),'::',' ') + let classes = s:gsub(join(rails#app().user_classes(),' '),'::',' ') if &syntax == 'ruby' if classes != '' exe "syn keyword rubyRailsUserClass ".classes." containedin=rubyClassDeclaration,rubyModuleDeclaration,rubyClass,rubyModule" @@ -3100,13 +3202,11 @@ function! s:BufSyntax() syn keyword rubyRailsAPIMethod api_method inflect_names endif if t =~ '^model$' || t =~ '^model-arb\>' - syn keyword rubyRailsARMethod acts_as_list acts_as_nested_set acts_as_tree composed_of serialize - syn keyword rubyRailsARAssociationMethod belongs_to has_one has_many has_and_belongs_to_many - "syn match rubyRailsARCallbackMethod '\<$before\|after$_$create\|destroy\|save\|update\|validation\|validation_on_create\|validation_on_update$\>' + syn keyword rubyRailsARMethod default_scope named_scope serialize + syn keyword rubyRailsARAssociationMethod belongs_to has_one has_many has_and_belongs_to_many composed_of syn keyword rubyRailsARCallbackMethod before_create before_destroy before_save before_update before_validation before_validation_on_create before_validation_on_update syn keyword rubyRailsARCallbackMethod after_create after_destroy after_save after_update after_validation after_validation_on_create after_validation_on_update syn keyword rubyRailsARClassMethod attr_accessible attr_protected establish_connection set_inheritance_column set_locking_column set_primary_key set_sequence_name set_table_name - "syn keyword rubyRailsARCallbackMethod after_find after_initialize syn keyword rubyRailsARValidationMethod validate validate_on_create validate_on_update validates_acceptance_of validates_associated validates_confirmation_of validates_each validates_exclusion_of validates_format_of validates_inclusion_of validates_length_of validates_numericality_of validates_presence_of validates_size_of validates_uniqueness_of syn keyword rubyRailsMethod logger endif @@ -3115,7 +3215,6 @@ function! s:BufSyntax() endif if t =~ '^model-mailer\>' syn keyword rubyRailsMethod logger - " Misnomer but who cares syn keyword rubyRailsControllerMethod helper helper_attr helper_method endif if t =~ '^controller\>' || t =~ '^view\>' || t=~ '^helper\>' @@ -3126,16 +3225,14 @@ function! s:BufSyntax() syn keyword rubyRailsMethod logger endif if t =~ '^helper\>' || t=~ '^view\>' - "exe "syn match rubyRailsHelperMethod ".rails_helper_methods exe "syn keyword rubyRailsHelperMethod ".s:sub(s:helpermethods(),'<select\s+','') syn match rubyRailsHelperMethod '\<select\>\%(\s*{\|\s*do\>\|\s*(\=\s*&\)\@!' syn match rubyRailsViewMethod '\.\@<!\<$h\|html_escape\|u\|url_encode\|controller$\>' if t =~ '\<partial\>' syn keyword rubyRailsMethod local_assigns endif - "syn keyword rubyRailsDeprecatedMethod start_form_tag end_form_tag link_to_image human_size update_element_function elseif t =~ '^controller\>' - syn keyword rubyRailsControllerMethod helper helper_attr helper_method filter layout url_for serialize exempt_from_layout filter_parameter_logging hide_action cache_sweeper + syn keyword rubyRailsControllerMethod helper helper_attr helper_method filter layout url_for serialize exempt_from_layout filter_parameter_logging hide_action cache_sweeper protect_from_forgery syn match rubyRailsDeprecatedMethod '\<render_\%(action\|text\|file\|template\|nothing\|without_layout\)\>' syn keyword rubyRailsRenderMethod render_to_string redirect_to head syn match rubyRailsRenderMethod '\<respond_to\>?\@!' @@ -3143,16 +3240,14 @@ function! s:BufSyntax() syn keyword rubyRailsFilterMethod verify endif if t =~ '^\%(db-\)\=\%(migration\|schema\)\>' - syn keyword rubyRailsMigrationMethod create_table drop_table rename_table add_column rename_column change_column change_column_default remove_column add_index remove_index + syn keyword rubyRailsMigrationMethod create_table change_table drop_table rename_table add_column rename_column change_column change_column_default remove_column add_index remove_index endif if t =~ '^test\>' - if s:cacheneeds("user_asserts") && filereadable(RailsRoot()."/test/test_helper.rb") - call s:cacheset("user_asserts",map(filter(readfile(RailsRoot()."/test/test_helper.rb"),'v:val =~ "^ def assert_"'),'matchstr(v:val,"^ def \\zsassert_\\w\\+")')) - endif - if s:cachehas("user_asserts") && !empty(s:cache("user_asserts")) - exe "syn keyword rubyRailsUserMethod ".join(s:cache("user_asserts")) + if !empty(rails#app().user_assertions()) + exe "syn keyword rubyRailsUserMethod ".join(rails#app().user_assertions()) endif syn keyword rubyRailsTestMethod add_assertion assert assert_block assert_equal assert_in_delta assert_instance_of assert_kind_of assert_match assert_nil assert_no_match assert_not_equal assert_not_nil assert_not_same assert_nothing_raised assert_nothing_thrown assert_operator assert_raise assert_respond_to assert_same assert_send assert_throws assert_recognizes assert_generates assert_routing flunk fixtures fixture_path use_transactional_fixtures use_instantiated_fixtures assert_difference assert_no_difference assert_valid + syn keyword rubyRailsTestMethod test setup teardown if t !~ '^test-unit\>' syn match rubyRailsTestControllerMethod '\.\@<!\<\%(get\|post\|put\|delete\|head\|process\|assigns\)\>' syn keyword rubyRailsTestControllerMethod assert_response assert_redirected_to assert_template assert_recognizes assert_generates assert_routing assert_dom_equal assert_dom_not_equal assert_select assert_select_rjs assert_select_encoded assert_select_email assert_tag assert_no_tag @@ -3162,6 +3257,7 @@ function! s:BufSyntax() syn keyword rubyRailsTestMethod violated pending if t !~ '^spec-model\>' syn match rubyRailsTestControllerMethod '\.\@<!\<\%(get\|post\|put\|delete\|head\|process\|assigns\)\>' + syn keyword rubyRailsTestControllerMethod integrate_views syn keyword rubyRailsMethod params request response session flash endif endif @@ -3175,7 +3271,7 @@ function! s:BufSyntax() syn match rubyRailsMethod '\.\zs\%(connect\|resources\=\|root\|named_route\|namespace\)\>' endif syn keyword rubyRailsMethod debugger - syn keyword rubyRailsMethod alias_attribute alias_method_chain attr_accessor_with_default attr_internal attr_internal_accessor attr_internal_reader attr_internal_writer delegate mattr_accessor mattr_reader mattr_writer + syn keyword rubyRailsMethod alias_attribute alias_method_chain attr_accessor_with_default attr_internal attr_internal_accessor attr_internal_reader attr_internal_writer delegate mattr_accessor mattr_reader mattr_writer superclass_delegating_accessor superclass_delegating_reader superclass_delegating_writer syn keyword rubyRailsMethod cattr_accessor cattr_reader cattr_writer class_inheritable_accessor class_inheritable_array class_inheritable_array_writer class_inheritable_hash class_inheritable_hash_writer class_inheritable_option class_inheritable_reader class_inheritable_writer inheritable_attributes read_inheritable_attribute reset_inheritable_attributes write_inheritable_array write_inheritable_attribute write_inheritable_hash syn keyword rubyRailsInclude require_dependency gem @@ -3204,7 +3300,6 @@ function! s:BufSyntax() exe "syn sync minlines=" . g:ruby_minlines syn case match syn region rubyString matchgroup=rubyStringDelimiter start=+%Q\=<+ end=+>+ contains=@htmlTop,@rubyStringSpecial - "syn region rubyString matchgroup=rubyStringDelimiter start=+%q<+ end=+>+ contains=@htmlTop syn cluster htmlArgCluster add=@rubyStringSpecial syn cluster htmlPreProc add=@rubyStringSpecial @@ -3314,7 +3409,7 @@ function! s:HiDefaults() hi def link railsStringSpecial Identifier endfunction -function! RailslogSyntax() +function! rails#log_syntax() syn match railslogRender '^\s*\<\%(Processing\|Rendering\|Rendered\|Redirected\|Completed\)\>' syn match railslogComment '^\s*# .*' syn match railslogModel '^\s*\u\%(\w\|:\)* \%(Load\%( Including Associations\| IDs For Limited Eager Loading\)\=\|Columns\|Count\|Update\|Destroy\|Delete all\)\>' skipwhite nextgroup=railslogModelNum @@ -3354,9 +3449,6 @@ endfunction " }}}1 " Statusline {{{1 -" Depends: nothing! -" Provides: s:BufInitStatusline - function! s:addtostatus(letter,status) let status = a:status if status !~ 'Rails' && g:rails_statusline @@ -3376,7 +3468,7 @@ function! s:BufInitStatusline() if &l:statusline == '' let &l:statusline='%<%f %h%m%r%=' if &ruler - let &l:statusline = &l:statusline . '%-16( %l,%c-%v %)%P' + let &l:statusline .= '%-16( %l,%c-%v %)%P' endif endif let &l:statusline = s:InjectIntoStatusline(&l:statusline) @@ -3388,7 +3480,7 @@ function! s:InitStatusline() if &g:statusline == '' let &g:statusline='%<%f %h%m%r%=' if &ruler - let &g:statusline = &g:statusline . '%-16( %l,%c-%v %)%P' + let &g:statusline .= '%-16( %l,%c-%v %)%P' endif endif let &g:statusline = s:InjectIntoStatusline(&g:statusline) @@ -3407,7 +3499,7 @@ function! s:InjectIntoStatusline(status) let status=substitute(status,'%=','%{RailsStatusline()}%=','') endif if status !~ 'Rails' && status != '' - let status=status.'%{RailsStatusline()}' + let status .= '%{RailsStatusline()}' endif endif return status @@ -3442,16 +3534,13 @@ endfunction " }}}1 " Mappings {{{1 -" Depends: nothing! -" Exports: s:BufMappings - function! s:BufMappings() - map <buffer> <silent> <Plug>RailsAlternate :A<CR> - map <buffer> <silent> <Plug>RailsRelated :R<CR> - map <buffer> <silent> <Plug>RailsFind :REfind<CR> - map <buffer> <silent> <Plug>RailsSplitFind :RSfind<CR> - map <buffer> <silent> <Plug>RailsVSplitFind :RVfind<CR> - map <buffer> <silent> <Plug>RailsTabFind :RTfind<CR> + nnoremap <buffer> <silent> <Plug>RailsAlternate :<C-U>A<CR> + nnoremap <buffer> <silent> <Plug>RailsRelated :<C-U>R<CR> + nnoremap <buffer> <silent> <Plug>RailsFind :<C-U>REfind<CR> + nnoremap <buffer> <silent> <Plug>RailsSplitFind :<C-U>RSfind<CR> + nnoremap <buffer> <silent> <Plug>RailsVSplitFind :<C-U>RVfind<CR> + nnoremap <buffer> <silent> <Plug>RailsTabFind :<C-U>RTfind<CR> if g:rails_mappings if !hasmapto("<Plug>RailsFind") nmap <buffer> gf <Plug>RailsFind @@ -3470,7 +3559,6 @@ function! s:BufMappings() endif if exists("$CREAM") imap <buffer> <C-CR> <C-O><Plug>RailsFind - " Are these a good idea? imap <buffer> <M-[> <C-O><Plug>RailsAlternate imap <buffer> <M-]> <C-O><Plug>RailsRelated endif @@ -3482,10 +3570,8 @@ endfunction " }}}1 " Project {{{ -" Depends: s:gsub, s:escarg, s:warn, s:sub, s:relglob - function! s:Project(bang,arg) - let rr = RailsRoot() + let rr = rails#app().path() exe "Project ".a:arg let line = search('^[^ =]*="'.s:gsub(rr,'[\/]','[\\/]').'"') let projname = s:gsub(fnamemodify(rr,':t'),'\=','-') " .'_on_rails' @@ -3511,7 +3597,7 @@ function! s:Project(bang,arg) . endif let line = line('.')+1 - call s:NewProject(projname,rr,a:bang) + call s:NewProject(projname,rr) endif normal! zMzo if search("^ app=app {","W",line+10) @@ -3521,9 +3607,9 @@ function! s:Project(bang,arg) normal! 0zt endfunction -function! s:NewProject(proj,rr,fancy) +function! s:NewProject(proj,rr) let line = line('.')+1 - let template = s:NewProjectTemplate(a:proj,a:rr,a:fancy) + let template = s:NewProjectTemplate(a:proj,a:rr) silent put =template exe line " Ugh. how else can I force detecting folds? @@ -3547,164 +3633,130 @@ function! s:NewProject(proj,rr,fancy) endif endfunction -function! s:NewProjectTemplate(proj,rr,fancy) +function! s:NewProjectTemplate(proj,rr) let str = a:proj.'="'.a:rr."\" CD=. filter=\"*\" {\n" - let str = str." app=app {\n" - if isdirectory(a:rr.'/app/apis') - let str = str." apis=apis {\n }\n" - endif - let str = str." controllers=controllers filter=\"**\" {\n }\n" - let str = str." helpers=helpers filter=\"**\" {\n }\n" - let str = str." models=models filter=\"**\" {\n }\n" - if a:fancy - let str = str." views=views {\n" - let views = s:relglob(a:rr.'/app/views/','*')."\n" - while views != '' - let dir = matchstr(views,'^.\{-\}\ze\n') - let views = s:sub(views,'^.{-}\n','') - let str = str." ".dir."=".dir.' filter="**" {'."\n }\n" - endwhile - let str = str." }\n" - else - let str = str." views=views filter=\"**\" {\n }\n" - endif - let str = str . " }\n" - let str = str . " config=config {\n environments=environments {\n }\n }\n" - let str = str . " db=db {\n" - if isdirectory(a:rr.'/db/migrate') - let str = str . " migrate=migrate {\n }\n" - endif - let str = str . " }\n" - let str = str . " lib=lib filter=\"* */**/*.rb \" {\n tasks=tasks filter=\"**/*.rake\" {\n }\n }\n" - let str = str . " public=public {\n images=images {\n }\n javascripts=javascripts {\n }\n stylesheets=stylesheets {\n }\n }\n" + let str .= " app=app {\n" + for dir in ['apis','controllers','helpers','models','views'] + let str .= s:addprojectdir(a:rr,'app',dir) + endfor + let str .= " }\n" + let str .= " config=config {\n environments=environments {\n }\n }\n" + let str .= " db=db {\n" + let str .= s:addprojectdir(a:rr,'db','migrate') + let str .= " }\n" + let str .= " lib=lib filter=\"* */**/*.rb \" {\n tasks=tasks filter=\"**/*.rake\" {\n }\n }\n" + let str .= " public=public {\n images=images {\n }\n javascripts=javascripts {\n }\n stylesheets=stylesheets {\n }\n }\n" if isdirectory(a:rr.'/spec') - let str = str . " spec=spec {\n" - let str = str . " controllers=controllers filter=\"**\" {\n }\n" - let str = str . " fixtures=fixtures filter=\"**\" {\n }\n" - let str = str . " helpers=helpers filter=\"**\" {\n }\n" - let str = str . " models=models filter=\"**\" {\n }\n" - let str = str . " views=views filter=\"**\" {\n }\n }\n" - endif - let str = str . " test=test {\n" - if isdirectory(a:rr.'/test/fixtures') - let str = str . " fixtures=fixtures filter=\"**\" {\n }\n" - endif - if isdirectory(a:rr.'/test/functional') - let str = str . " functional=functional filter=\"**\" {\n }\n" - endif - if isdirectory(a:rr.'/test/integration') - let str = str . " integration=integration filter=\"**\" {\n }\n" - endif - if isdirectory(a:rr.'/test/mocks') - let str = str . " mocks=mocks filter=\"**\" {\n }\n" - endif - if isdirectory(a:rr.'/test/unit') - let str = str . " unit=unit filter=\"**\" {\n }\n" - endif - let str = str . " }\n}\n" + let str .= " spec=spec {\n" + for dir in ['controllers','fixtures','helpers','models','views'] + let str .= s:addprojectdir(a:rr,'spec',dir) + endfor + let str .= " }\n" + endif + if isdirectory(a:rr.'/test') + let str .= " test=test {\n" + for dir in ['fixtures','functional','integration','mocks','unit'] + let str .= s:addprojectdir(a:rr,'test',dir) + endfor + let str .= " }\n" + end + let str .= "}\n" return str endfunction +function! s:addprojectdir(rr,parentdir,dir) + if isdirectory(a:rr.'/'.a:parentdir.'/'.a:dir) + return ' '.a:dir.'='.a:dir." filter=\"**\" {\n }\n" + else + return '' + endif +endfunction + " }}}1 " Database {{{1 -" Depends: s:environment, s:rubyeval, s:rv, reloadability - function! s:extractdbvar(str,arg) return matchstr("\n".a:str."\n",'\n'.a:arg.'=\zs.\{-\}\ze\n') endfunction -function! s:BufDatabase(...) - if exists("s:lock_database") - return +function! s:app_dbext_settings(environment) dict + if self.cache.needs('dbext_settings') + call self.cache.set('dbext_settings',{}) endif - let s:lock_database = 1 - let rv = s:rv() - if (a:0 && a:1 > 1) - unlet! s:dbext_type_{rv} - endif - if (a:0 > 1 && a:2 != '') - let env = a:2 - else - let env = s:environment() - endif - " Crude caching mechanism - if !exists("s:dbext_type_".rv) - if exists("g:loaded_dbext") && (g:rails_dbext + (a:0 ? a:1 : 0)) > 0 && filereadable(RailsRoot()."/config/database.yml") - " Ideally we would filter this through ERB but that could be insecure. - " It might be possible to make use of taint checking. + let cache = self.cache.get('dbext_settings') + if !has_key(cache,a:environment) + let dict = {} + if self.has_file("config/database.yml") let out = "" if has("ruby") - ruby require 'yaml'; VIM::command('let out = %s' % File.open(VIM::evaluate("RailsRoot()")+"/config/database.yml") {|f| y = YAML::load(f); e = y[VIM::evaluate("env")]; i=0; e=y[e] while e.respond_to?(:to_str) && (i+=1)<16; e.map {|k,v| "#{k}=#{v}\n" if v}.compact.join }.inspect) rescue nil + ruby require 'yaml'; VIM::command('let out = %s' % File.open(VIM::evaluate("self.path()")+"/config/database.yml") {|f| y = YAML::load(f); e = y[VIM::evaluate("a:environment")]; i=0; e=y[e] while e.respond_to?(:to_str) && (i+=1)<16; e.map {|k,v| "#{k}=#{v}\n" if v}.compact.join }.inspect) rescue nil endif if out == "" - let cmdb = 'require %{yaml}; File.open(%q{'.RailsRoot().'/config/database.yml}) {|f| y = YAML::load(f); e = y[%{' + let cmdb = 'require %{yaml}; File.open(%q{'.self.path().'/config/database.yml}) {|f| y = YAML::load(f); e = y[%{' let cmde = '}]; i=0; e=y[e] while e.respond_to?(:to_str) && (i+=1)<16; e.each{|k,v|puts k.to_s+%{=}+v.to_s}}' - if a:0 ? a:1 : g:rails_expensive - let out = s:rubyeval(cmdb.env.cmde,'') - else - unlet! s:lock_database - return - endif + let out = self.lightweight_ruby_eval(cmdb.a:environment.cmde) endif let adapter = s:extractdbvar(out,'adapter') - let s:dbext_bin_{rv} = '' - let s:dbext_integratedlogin_{rv} = '' - if adapter == 'postgresql' - let adapter = 'pgsql' - elseif adapter == 'sqlite3' - let adapter = 'sqlite' - " Does not appear to work - let s:dbext_bin = 'sqlite3' - elseif adapter == 'sqlserver' - let adapter = 'sqlsrv' - elseif adapter == 'sybase' - let adapter = 'asa' - elseif adapter == 'oci' - let adapter = 'ora' - endif - let s:dbext_type_{rv} = toupper(adapter) - let s:dbext_user_{rv} = s:extractdbvar(out,'username') - let s:dbext_passwd_{rv} = s:extractdbvar(out,'password') - if s:dbext_passwd_{rv} == '' && adapter == 'mysql' + let adapter = get({'postgresql': 'pgsql', 'sqlite3': 'sqlite', 'sqlserver': 'sqlsrv', 'sybase': 'asa', 'oci': 'ora'},adapter,adapter) + let dict['type'] = toupper(adapter) + let dict['user'] = s:extractdbvar(out,'username') + let dict['passwd'] = s:extractdbvar(out,'password') + if dict['passwd'] == '' && adapter == 'mysql' " Hack to override password from .my.cnf - let s:dbext_extra_{rv} = ' --password=' + let dict['extra'] = ' --password=' else - let s:dbext_extra_{rv} = '' + let dict['extra'] = '' + endif + let dict['dbname'] = s:extractdbvar(out,'database') + if dict['dbname'] == '' + let dict['dbname'] = s:extractdbvar(out,'dbfile') endif - let s:dbext_dbname_{rv} = s:extractdbvar(out,'database') - if s:dbext_dbname_{rv} != '' && s:dbext_dbname_{rv} !~ '^:' && adapter =~? '^sqlite' - let s:dbext_dbname_{rv} = RailsRoot().'/'.s:dbext_dbname_{rv} + if dict['dbname'] != '' && dict['dbname'] !~ '^:' && adapter =~? '^sqlite' + let dict['dbname'] = self.path(dict['dbname']) endif - let s:dbext_profile_{rv} = '' - let s:dbext_host_{rv} = s:extractdbvar(out,'host') - let s:dbext_port_{rv} = s:extractdbvar(out,'port') - let s:dbext_dsnname_{rv} = s:extractdbvar(out,'dsn') - if s:dbext_host_{rv} =~? '^\cDBI:' - if s:dbext_host_{rv} =~? '\c\<Trusted[_ ]Connection\s*=\s*yes\>' - let s:dbext_integratedlogin_{rv} = 1 + let dict['profile'] = '' + let dict['host'] = s:extractdbvar(out,'host') + let dict['port'] = s:extractdbvar(out,'port') + let dict['dsnname'] = s:extractdbvar(out,'dsn') + if dict['host'] =~? '^\cDBI:' + if dict['host'] =~? '\c\<Trusted[_ ]Connection\s*=\s*yes\>' + let dict['integratedlogin'] = 1 endif - let s:dbext_host_{rv} = matchstr(s:dbext_host_{rv},'\c\<\%(Server\|Data Source\)\s*=\s*\zs[^;]*') + let dict['host'] = matchstr(dict['host'],'\c\<\%(Server\|Data Source\)\s*=\s*\zs[^;]*') endif + call filter(dict,'v:val != ""') endif + let cache[a:environment] = dict endif - if exists("s:dbext_type_".rv) - silent! let b:dbext_type = s:dbext_type_{rv} - silent! let b:dbext_profile = s:dbext_profile_{rv} - silent! let b:dbext_bin = s:dbext_bin_{rv} - silent! let b:dbext_user = s:dbext_user_{rv} - silent! let b:dbext_passwd = s:dbext_passwd_{rv} - silent! let b:dbext_dbname = s:dbext_dbname_{rv} - silent! let b:dbext_host = s:dbext_host_{rv} - silent! let b:dbext_port = s:dbext_port_{rv} - silent! let b:dbext_dsnname = s:dbext_dsnname_{rv} - silent! let b:dbext_extra = s:dbext_extra_{rv} - silent! let b:dbext_integratedlogin = s:dbext_integratedlogin_{rv} - if b:dbext_type == 'PGSQL' - let $PGPASSWORD = b:dbext_passwd - elseif exists('$PGPASSWORD') - let $PGPASSWORD = '' - endif + return cache[a:environment] +endfunction + +function! s:BufDatabase(...) + if exists("s:lock_database") || !exists('g:loaded_dbext') || !exists('b:rails_root') + return + endif + let self = rails#app() + let s:lock_database = 1 + if (a:0 && a:1 > 1) + call self.cache.clear('dbext_settings') + endif + if (a:0 > 1 && a:2 != '') + let env = a:2 + else + let env = s:environment() + endif + if (!self.cache.has('dbext_settings') || !has_key(self.cache.get('dbext_settings'),env)) && (g:rails_dbext + (a:0 ? a:1 : 0)) <= 0 + unlet! s:lock_database + return + endif + let dict = self.dbext_settings(env) + for key in ['type', 'profile', 'bin', 'user', 'passwd', 'dbname', 'host', 'port', 'dsnname', 'extra', 'integratedlogin'] + let b:dbext_{key} = get(dict,key,'') + endfor + if b:dbext_type == 'PGSQL' + let $PGPASSWORD = b:dbext_passwd + elseif exists('$PGPASSWORD') + let $PGPASSWORD = '' endif if a:0 >= 3 && a:3 && exists(":Create") if exists("b:dbext_dbname") && exists("b:dbext_type") && b:dbext_type !~? 'sqlite' @@ -3724,11 +3776,11 @@ function! s:BufDatabase(...) unlet! s:lock_database endfunction +call s:add_methods('app', ['dbext_settings']) + " }}}1 " Abbreviations {{{1 -" Depends: s:sub, s:gsub, s:string, s:linepeak, s:error - function! s:selectiveexpand(pat,good,default,...) if a:0 > 0 let nd = a:1 @@ -3748,16 +3800,16 @@ function! s:selectiveexpand(pat,good,default,...) endif endfunction -function! s:TheMagicC() +function! s:TheCWord() let l = s:linepeak() - if l =~ '\<find\s*$(\|:first,\|:all,$' || l =~ '\<paginate\>' + if l =~ '\<\%(find\|first\|last\|all\|paginate\)\>' return s:selectiveexpand('..',':conditions => ',':c') - elseif l =~ '\<render\s*(\=\s*:partial\s\*=>\s*' + elseif l =~ '\<render\s*(\=\s*:partial\s*=>\s*' return s:selectiveexpand('..',':collection => ',':c') - elseif RailsFileType() =~ '^model\>' - return s:selectiveexpand('..',':conditions => ',':c') - else + elseif l =~ '\<\%(url_for\|link_to\|form_tag\)\>' || l =~ ':url\s*=>\s*{\s*' return s:selectiveexpand('..',':controller => ',':c') + else + return s:selectiveexpand('..',':conditions => ',':c') endif endfunction @@ -3765,9 +3817,9 @@ function! s:AddSelectiveExpand(abbr,pat,expn,...) let expn = s:gsub(s:gsub(a:expn ,'[\"|]','\\&'),'\<','\\<Lt>') let expn2 = s:gsub(s:gsub(a:0 ? a:1 : '','[\"|]','\\&'),'\<','\\<Lt>') if a:0 - exe "inoreabbrev <buffer> <silent> ".a:abbr." <C-R>=<SID>selectiveexpand(".s:string(a:pat).",\"".expn."\",".s:string(a:abbr).",\"".expn2."\")<CR>" + exe "inoreabbrev <buffer> <silent> ".a:abbr." <C-R>=<SID>selectiveexpand(".string(a:pat).",\"".expn."\",".string(a:abbr).",\"".expn2."\")<CR>" else - exe "inoreabbrev <buffer> <silent> ".a:abbr." <C-R>=<SID>selectiveexpand(".s:string(a:pat).",\"".expn."\",".s:string(a:abbr).")<CR>" + exe "inoreabbrev <buffer> <silent> ".a:abbr." <C-R>=<SID>selectiveexpand(".string(a:pat).",\"".expn."\",".string(a:abbr).")<CR>" endif endfunction @@ -3780,7 +3832,7 @@ function! s:AddBracketExpand(abbr,expn) endfunction function! s:AddColonExpand(abbr,expn) - call s:AddSelectiveExpand(a:abbr,':',a:expn) + call s:AddSelectiveExpand(a:abbr,'[:.]',a:expn) endfunction function! s:AddParenExpand(abbr,expn,...) @@ -3821,8 +3873,6 @@ function! s:BufAbbreviations() Rabbrev taiw time_ago_in_words endif if t =~ '^controller\>' - "call s:AddSelectiveExpand('rn','[,\r]','render :nothing => true') - "let b:rails_abbreviations = b:rails_abbreviations . "rn\trender :nothing => true\n" Rabbrev re( redirect_to Rabbrev rea( redirect_to :action\ =>\ Rabbrev rec( redirect_to :controller\ =>\ @@ -3849,35 +3899,24 @@ function! s:BufAbbreviations() Rabbrev mac( add_column Rabbrev mrnc( rename_column Rabbrev mrc( remove_column - Rabbrev mct( create_table - "Rabbrev mct create_table\ :\ do\ <Bar>t<Bar><CR>end<Esc>k$6hi + Rabbrev mct( create_table + Rabbrev mcht( change_table Rabbrev mrnt( rename_table Rabbrev mdt( drop_table Rabbrev mcc( t.column endif if t =~ '^test\>' - "Rabbrev ae( assert_equal Rabbrev ase( assert_equal - "Rabbrev ako( assert_kind_of Rabbrev asko( assert_kind_of - "Rabbrev ann( assert_not_nil Rabbrev asnn( assert_not_nil - "Rabbrev ar( assert_raise Rabbrev asr( assert_raise - "Rabbrev are( assert_response Rabbrev asre( assert_response Rabbrev art( assert_redirected_to endif Rabbrev :a :action\ =>\ - inoreabbrev <buffer> <silent> :c <C-R>=<SID>TheMagicC()<CR> - " Lie a little - if t =~ '^view\>' - let b:rails_abbreviations = b:rails_abbreviations . ":c\t:collection => \n" - elseif s:controller() != '' - let b:rails_abbreviations = b:rails_abbreviations . ":c\t:controller => \n" - else - let b:rails_abbreviations = b:rails_abbreviations . ":c\t:conditions => \n" - endif + " hax + Rabbrev :c :co________\ =>\ + inoreabbrev <buffer> <silent> :c <C-R>=<SID>TheCWord()<CR> Rabbrev :i :id\ =>\ Rabbrev :o :object\ =>\ Rabbrev :p :partial\ =>\ @@ -3899,31 +3938,39 @@ endfunction function! s:Abbrev(bang,...) abort if !exists("b:rails_abbreviations") - let b:rails_abbreviations = "\n" + let b:rails_abbreviations = {} endif if a:0 > 3 || (a:bang && (a:0 != 1)) return s:error("Rabbrev: invalid arguments") endif - if a:bang - return s:unabbrev(a:1) - endif if a:0 == 0 - echo s:sub(b:rails_abbreviations,'^\n','') + for key in sort(keys(b:rails_abbreviations)) + echo key . join(b:rails_abbreviations[key],"\t") + endfor return endif let lhs = a:1 + let root = s:sub(lhs,'%(::|\(|\[)$','') + if a:bang + if has_key(b:rails_abbreviations,root) + call remove(b:rails_abbreviations,root) + endif + exe "iunabbrev <buffer> ".root + return + endif if a:0 > 3 || a:0 < 2 return s:error("Rabbrev: invalid arguments") endif let rhs = a:2 - call s:unabbrev(lhs,1) + if has_key(b:rails_abbreviations,root) + call remove(b:rails_abbreviations,root) + endif if lhs =~ '($' - let b:rails_abbreviations = b:rails_abbreviations . lhs . "\t" . rhs . "" . (a:0 > 2 ? "\t".a:3 : ""). "\n" - let llhs = s:sub(lhs,'\($','') + let b:rails_abbreviations[root] = ["(", rhs . (a:0 > 2 ? "\t".a:3 : "")] if a:0 > 2 - call s:AddParenExpand(llhs,rhs,a:3) + call s:AddParenExpand(root,rhs,a:3) else - call s:AddParenExpand(llhs,rhs) + call s:AddParenExpand(root,rhs) endif return endif @@ -3931,42 +3978,24 @@ function! s:Abbrev(bang,...) abort return s:error("Rabbrev: invalid arguments") endif if lhs =~ ':$' - let llhs = s:sub(lhs,':=:$','') - call s:AddColonExpand(llhs,rhs) + call s:AddColonExpand(root,rhs) elseif lhs =~ '\[$' - let llhs = s:sub(lhs,'\[$','') - call s:AddBracketExpand(llhs,rhs) + call s:AddBracketExpand(root,rhs) elseif lhs =~ '\w$' call s:AddTabExpand(lhs,rhs) else return s:error("Rabbrev: unimplemented") endif - let b:rails_abbreviations = b:rails_abbreviations . lhs . "\t" . rhs . "\n" -endfunction - -function! s:unabbrev(abbr,...) - let abbr = s:sub(a:abbr,'%(::|$|\[)$','') - let pat = s:sub(abbr,'\\','\\\\') - if !exists("b:rails_abbreviations") - let b:rails_abbreviations = "\n" - endif - let b:rails_abbreviations = substitute(b:rails_abbreviations,'\V\C\n'.pat.'\(\t\|::\t\|(\t\|[\t$\.\{-\}\n','\n','') - if a:0 == 0 || a:1 == 0 - exe "iunabbrev <buffer> ".abbr - endif + let b:rails_abbreviations[root] = [matchstr(lhs,'\W*$'),rhs] endfunction " }}}1 " Settings {{{1 -" Depends: s:error, s:sub, s:sname, s:escvar, s:lastmethod, s:environment, s:gsub, s:lastmethodlib, s:gsub - function! s:Set(bang,...) let c = 1 let defscope = '' - while c <= a:0 - let arg = a:{c} - let c = c + 1 + for arg in a:000 if arg =~? '^<[abgl]\=>$' let defscope = (matchstr(arg,'<\zs.*\ze>')) elseif arg !~ '=' @@ -3974,7 +4003,7 @@ function! s:Set(bang,...) let arg = defscope.':'.opt endif let val = s:getopt(arg) - if val == '' && s:opts() !~ '\<'.arg.'\n' + if val == '' && !has_key(s:opts(),arg) call s:error("No such rails.vim option: ".arg) else echo arg."=".val @@ -3987,10 +4016,11 @@ function! s:Set(bang,...) endif call s:setopt(opt,val) endif - endwhile + endfor endfunction function! s:getopt(opt,...) + let app = rails#app() let opt = a:opt if a:0 let scope = a:1 @@ -4000,28 +4030,32 @@ function! s:getopt(opt,...) else let scope = 'abgl' endif + let lnum = a:0 > 1 ? a:2 : line('.') if scope =~ 'l' && &filetype != 'ruby' let scope = s:sub(scope,'l','b') endif if scope =~ 'l' - call s:LocalModelines() + call s:LocalModelines(lnum) endif - let opt = s:sub(opt,'<%(rake|rake_task|rake_target)$','task') + let var = s:sname().'_'.opt + let lastmethod = s:lastmethod(lnum) + if lastmethod == '' | let lastmethod = ' ' | endif " Get buffer option - if scope =~ 'l' && exists("b:_".s:sname()."_".s:escvar(s:lastmethod())."_".opt) - return b:_{s:sname()}_{s:escvar(s:lastmethod())}_{opt} - elseif exists("b:".s:sname()."_".opt) && (scope =~ 'b' || (scope =~ 'l' && s:lastmethod() == '')) - return b:{s:sname()}_{opt} - elseif scope =~ 'a' && exists("s:_".s:rv()."_".s:environment()."_".opt) - return s:_{s:rv()}_{s:environment()}_{opt} + if scope =~ 'l' && exists('b:_'.var) && has_key(b:_{var},lastmethod) + return b:_{var}[lastmethod] + elseif exists('b:'.var) && (scope =~ 'b' || (scope =~ 'l' && lastmethod == ' ')) + return b:{var} + elseif scope =~ 'a' && has_key(app,'options') && has_key(app.options,opt) + return app.options[opt] elseif scope =~ 'g' && exists("g:".s:sname()."_".opt) - return g:{s:sname()}_{opt} + return g:{var} else return "" endif endfunction function! s:setopt(opt,val) + let app = rails#app() if a:opt =~? '[abgl]:' let scope = matchstr(a:opt,'^\w') let opt = s:sub(a:opt,'^\w:','') @@ -4029,48 +4063,48 @@ function! s:setopt(opt,val) let scope = '' let opt = a:opt endif - let opt = s:sub(opt,'<%(rake|rake_task|rake_target)$','task') - let defscope = matchstr(s:opts(),'\n\zs\w\ze:'.opt,'\n') - if defscope == '' - let defscope = 'a' - endif + let defscope = get(s:opts(),opt,'a') if scope == '' let scope = defscope endif - if &filetype == 'ruby' && (scope == 'B' || scope == 'l') + if &filetype != 'ruby' && (scope ==# 'B' || scope ==# 'l') let scope = 'b' endif + let var = s:sname().'_'.opt if opt =~ '\W' return s:error("Invalid option ".a:opt) - elseif scope =~? 'a' - let s:_{s:rv()}_{s:environment()}_{opt} = a:val - elseif scope == 'B' && defscope == 'l' - let b:_{s:sname()}_{s:escvar('')}_{opt} = a:val + elseif scope ==# 'B' && defscope == 'l' + if !exists('b:_'.var) | let b:_{var} = {} | endif + let b:_{var}[' '] = a:val elseif scope =~? 'b' - let b:{s:sname()}_{opt} = a:val + let b:{var} = a:val + elseif scope =~? 'a' + if !has_key(app,'options') | let app.options = {} | endif + let app.options[opt] = a:val elseif scope =~? 'g' - let g:{s:sname()}_{opt} = a:val + let g:{var} = a:val elseif scope =~? 'l' - let b:_{s:sname()}_{s:escvar(s:lastmethod())}_{opt} = a:val + if !exists('b:_'.var) | let b:_{var} = {} | endif + let lastmethod = s:lastmethod(lnum) + let b:_{var}[lastmethod == '' ? ' ' : lastmethod] = a:val else return s:error("Invalid scope for ".a:opt) endif endfunction function! s:opts() - return "\nb:alternate\nb:controller\na:gnu_screen\nb:model\nl:preview\nb:task\nl:related\na:root_url\na:ruby_fork_port\n" + return {'alternate': 'b', 'controller': 'b', 'gnu_screen': 'a', 'model': 'b', 'preview': 'l', 'task': 'b', 'related': 'l', 'root_url': 'a'} endfunction -function! s:SetComplete(A,L,P) +function! s:Complete_set(A,L,P) if a:A =~ '=' let opt = matchstr(a:A,'[^=]*') - return opt."=".s:getopt(opt) + return [opt."=".s:getopt(opt)] else let extra = matchstr(a:A,'^[abgl]:') - let opts = s:gsub(s:sub(s:gsub(s:opts(),'\n\w:','\n'.extra),'^\n',''),'\n','=\n') - return opts + return filter(sort(map(keys(s:opts()),'extra.v:val')),'s:startswith(v:val,a:A)') endif - return "" + return [] endfunction function! s:BufModelines() @@ -4090,15 +4124,15 @@ function! s:BufModelines() endif let mat = matchstr(lines,'\C\<Rset'.pat,matend) let matend = matchend(lines,'\C\<Rset'.pat,matend) - let cnt = cnt + 1 + let cnt += 1 endwhile endfunction -function! s:LocalModelines() +function! s:LocalModelines(lnum) if !g:rails_modelines return endif - let lbeg = s:lastmethodline() + let lbeg = s:lastmethodline(a:lnum) let lend = s:endof(lbeg) if lbeg == 0 || lend == 0 return @@ -4106,8 +4140,8 @@ function! s:LocalModelines() let lines = "\n" let lnum = lbeg while lnum < lend && lnum < lbeg + 5 - let lines = lines . getline(lnum) . "\n" - let lnum = lnum + 1 + let lines .= getline(lnum) . "\n" + let lnum += 1 endwhile let pat = '\s\+\zs.\{-\}\ze\%(\n\|\s\s\|#{\@!\|%>\|-->\|$\)' let cnt = 1 @@ -4121,40 +4155,43 @@ function! s:LocalModelines() endif let mat = matchstr(lines,'\C\<rset'.pat,matend) let matend = matchend(lines,'\C\<rset'.pat,matend) - let cnt = cnt + 1 + let cnt += 1 endwhile endfunction " }}}1 " Detection {{{1 -function! s:callback(file) - if RailsRoot() != "" - let var = "callback_".s:rv()."_".s:escvar(a:file) - if !exists("s:".var) || exists("b:rails_refresh") - let s:{var} = s:hasfile(a:file) - endif - if s:{var} - if exists(":sandbox") - sandbox source `=RailsRoot().'/'.a:file` - elseif g:rails_modelines - source `=RailsRoot().'/'.a:file` - endif - endif +function! s:app_source_callback(file) dict + if self.cache.needs('existence') + call self.cache.set('existence',{}) + endif + let cache = self.cache.get('existence') + if !has_key(cache,a:file) + let cache[a:file] = self.has_file(a:file) + endif + if cache[a:file] + sandbox source `=self.path(a:file)` endif endfunction +call s:add_methods('app',['source_callback']) + function! RailsBufInit(path) let cpo_save = &cpo set cpo&vim let firsttime = !(exists("b:rails_root") && b:rails_root == a:path) let b:rails_root = a:path + if !has_key(s:apps,a:path) + let s:apps[a:path] = deepcopy(s:app_prototype) + let s:apps[a:path].root = a:path + endif + let app = s:apps[a:path] " Apparently RailsFileType() can be slow if the underlying file system is " slow (even though it doesn't really do anything IO related). This caching " is a temporary hack; if it doesn't cause problems it should probably be " refactored. - unlet! b:rails_cached_file_type - let b:rails_cached_file_type = RailsFileType() + let b:rails_cached_file_type = app.calculate_file_type(RailsFilePath()) if g:rails_history_size > 0 if !exists("g:RAILS_HISTORY") let g:RAILS_HISTORY = "" @@ -4172,7 +4209,7 @@ function! RailsBufInit(path) let g:RAILS_HISTORY = path."\n".g:RAILS_HISTORY let g:RAILS_HISTORY = s:sub(g:RAILS_HISTORY,'%(.{-}\n){,'.g:rails_history_size.'}\zs.*','') endif - call s:callback("config/syntax.vim") + call app.source_callback("config/syntax.vim") if &ft == "mason" setlocal filetype=eruby elseif &ft =~ '^\%(conf\|ruby\)\=$' && expand("%:e") =~ '^\%(rjs\|rxml\|builder\|rake\|mab\)$' @@ -4210,7 +4247,9 @@ function! RailsBufInit(path) call s:BufSettings() call s:BufCommands() call s:BufAbbreviations() - call s:BufDatabase() + if exists("g:loaded_dbext") && g:loaded_dbext < 800 + call s:BufDatabase() + endif " snippetsEmu.vim if exists('g:loaded_snippet') silent! runtime! ftplugin/rails_snippets.vim @@ -4231,32 +4270,34 @@ function! RailsBufInit(path) if f != '' exe "silent doautocmd User Rails".f endif - call s:callback("config/rails.vim") + call app.source_callback("config/rails.vim") call s:BufModelines() call s:BufMappings() - "unlet! b:rails_cached_file_type let &cpo = cpo_save return b:rails_root endfunction function! s:SetBasePath() - let rp = s:gsub(RailsRoot(),'[ ,]','\\&') - let t = RailsFileType() - let oldpath = s:sub(&l:path,'^\.,','') - if stridx(oldpath,rp) == 2 - let oldpath = '' + if rails#app().path() =~ '://' + return endif - let &l:path = '.,'.rp.",".rp."/app/controllers,".rp."/app,".rp."/app/models,".rp."/app/helpers,".rp."/config,".rp."/lib,".rp."/vendor,".rp."/vendor/plugins/*/lib,".rp."/test/unit,".rp."/test/functional,".rp."/test/integration,".rp."/app/apis,".rp."/app/services,".rp."/test,"."/vendor/plugins/*/test,".rp."/vendor/rails/*/lib,".rp."/vendor/rails/*/test,".rp."/spec,".rp."/spec/*," + let transformed_path = s:pathsplit(s:pathjoin([rails#app().path()]))[0] + let old_path = s:pathsplit(s:sub(&l:path,'^\.,=','')) + call filter(old_path,'!s:startswith(v:val,transformed_path)') + + let path = ['app', 'app/models', 'app/controllers', 'app/helpers', 'config', 'lib', 'app/views'] if s:controller() != '' - let &l:path = &l:path . rp . '/app/views/' . s:controller() . ',' . rp . '/app/views,' . rp . '/public,' + let path += ['app/views/'.s:controller(), 'public'] endif - if t =~ '^log\>' - let &l:path = &l:path . rp . '/app/views,' + if rails#app().test_suites('test') + let path += ['test', 'test/unit', 'test/functional', 'test/integration'] endif - if &l:path =~ '://' - let &l:path = ".," + if rails#app().test_suites('spec') + let path += ['spec', 'spec/models', 'spec/controllers', 'spec/helpers', 'spec/views', 'spec/lib'] endif - let &l:path = &l:path . oldpath + let path += ['app/*', 'vendor', 'vendor/plugins/*/lib', 'vendor/plugins/*/test', 'vendor/rails/*/lib', 'vendor/rails/*/test'] + call map(path,'rails#app().path(v:val)') + let &l:path = s:pathjoin('.',rails#app().path(),path,old_path) endfunction function! s:BufSettings() @@ -4264,11 +4305,11 @@ function! s:BufSettings() return '' endif call s:SetBasePath() - let rp = s:gsub(RailsRoot(),'[ ,]','\\&') + let rp = s:gsub(rails#app().path(),'[ ,]','\\&') let &l:errorformat = s:efm setlocal makeprg=rake if stridx(&tags,rp) == -1 - let &l:tags = &tags . "," . rp . "/tags," . rp . "/.tags" + let &l:tags = rp . "/tmp/tags," . &tags . "," . rp . "/tags" endif if has("gui_win32") || has("gui_running") let code = '*.rb;*.rake;Rakefile' @@ -4287,7 +4328,6 @@ function! s:BufSettings() let &l:suffixesadd=".rb,.".s:gsub(s:view_types,',',',.').",.css,.js,.yml,.csv,.rake,.sql,.html,.xml" if &ft =~ '^\%(e\=ruby\|[yh]aml\|javascript\|css\|sass\)$' setlocal sw=2 sts=2 et - "set include=\\<\\zsAct\\f*::Base\\ze\\>\\\|^\\s*\$require\\\|load\$\\s\\+['\"]\\zs\\f\\+\\ze if exists('+completefunc') if &completefunc == '' set completefunc=syntaxcomplete#Complete @@ -4354,13 +4394,17 @@ augroup railsPluginAuto autocmd User BufEnterRails call s:RefreshBuffer() autocmd User BufEnterRails call s:resetomnicomplete() autocmd User BufEnterRails call s:BufDatabase(-1) - autocmd BufWritePost */config/database.yml unlet! s:dbext_type_{s:rv()} " Force reload - autocmd BufWritePost */test/test_helper.rb call s:cacheclear("user_asserts") - autocmd BufWritePost */config/routes.rb call s:cacheclear("named_routes") + autocmd User dbextPreConnection call s:BufDatabase(1) + autocmd BufWritePost */config/database.yml call rails#cache_clear("dbext_settings") + autocmd BufWritePost */test/test_helper.rb call rails#cache_clear("user_assertions") + autocmd BufWritePost */config/routes.rb call rails#cache_clear("named_routes") + autocmd BufWritePost */config/environments/*.rb call rails#cache_clear("environments") + autocmd BufWritePost */tasks/**.rake call rails#cache_clear("rake_tasks") + autocmd BufWritePost */generators/** call rails#cache_clear("generators") autocmd FileType * if exists("b:rails_root") | call s:BufSettings() | endif autocmd Syntax ruby,eruby,yaml,haml,javascript,railslog if exists("b:rails_root") | call s:BufSyntax() | endif - silent! autocmd QuickFixCmdPre make* call s:QuickFixCmdPre() - silent! autocmd QuickFixCmdPost make* call s:QuickFixCmdPost() + autocmd QuickFixCmdPre make* call s:push_chdir() + autocmd QuickFixCmdPost make* call s:pop_command() augroup END " }}}1 @@ -4371,6 +4415,10 @@ let s:sid = s:sub(maparg("<SID>xx"),'xx$','') unmap <SID>xx let s:file = expand('<sfile>:p') +if !exists('s:apps') + let s:apps = {} +endif + " }}}1 let &cpo = s:cpo_save autoload/rails.vim @@ -21,22 +21,21 @@ CONTENTS *NERDTree-contents* 1.Intro...................................|NERDTree| 2.Functionality provided..................|NERDTreeFunctionality| - 2.1 Global commands...................|NERDTreeGlobalCommands| - 2.2 Bookmarks.........................|NERDTreeBookmarks| - 2.2.1 The bookmark table..........|NERDTreeBookmarkTable| - 2.2.2 Bookmark commands...........|NERDTreeBookmarkCommands| - 2.2.3 Invalid bookmarks...........|NERDTreeInvalidBookmarks| - 2.3 NERD tree mappings................|NERDTreeMappings| - 2.4 The filesystem menu...............|NERDTreeFilesysMenu| + 2.1.Global commands...................|NERDTreeGlobalCommands| + 2.2.Bookmarks.........................|NERDTreeBookmarks| + 2.2.1.The bookmark table..........|NERDTreeBookmarkTable| + 2.2.2.Bookmark commands...........|NERDTreeBookmarkCommands| + 2.2.3.Invalid bookmarks...........|NERDTreeInvalidBookmarks| + 2.3.NERD tree mappings................|NERDTreeMappings| + 2.4.The filesystem menu...............|NERDTreeFilesysMenu| 3.Options.................................|NERDTreeOptions| - 3.1 Option summary....................|NERDTreeOptionSummary| - 3.2 Option details....................|NERDTreeOptionDetails| - 4.Public functions........................|NERDTreePublicFunctions| - 5.TODO list...............................|NERDTreeTodo| - 6.The Author..............................|NERDTreeAuthor| - 7.Changelog...............................|NERDTreeChangelog| - 8.Credits.................................|NERDTreeCredits| - 9.License.................................|NERDTreeLicense| + 3.1.Option summary....................|NERDTreeOptionSummary| + 3.2.Option details....................|NERDTreeOptionDetails| + 4.Hacking the NERD tree...................|NERDTreeHacking| + 5.About...................................|NERDTreeAbout| + 6.Changelog...............................|NERDTreeChangelog| + 7.Credits.................................|NERDTreeCredits| + 8.License.................................|NERDTreeLicense| ============================================================================== 1. Intro *NERDTree* @@ -65,7 +64,7 @@ The following features and functionality are provided by the NERD tree: * ... * Directories and files can be bookmarked. * Most NERD tree navigation can also be done with the mouse - * Dynamic customisation of tree content + * Filtering of tree content (can be toggled at runtime) * custom file filters to prevent e.g. vim backup files being displayed * optional displaying of hidden files (. files) * files can be "turned off" so that only directories are displayed @@ -81,9 +80,13 @@ The following features and functionality are provided by the NERD tree: session, the directory nodes will be opened/closed as you left them * The script remembers the cursor position and window position in the NERD tree so you can toggle it off (or just close the tree window) and then - reopen it (with NERDTreeToggle) the NERD tree window will appear EXACTLY + reopen it (with NERDTreeToggle) the NERD tree window will appear exactly as you left it - * You can have a separate NERD tree for each tab + * You can have a separate NERD tree for each tab, share trees across tabs, + or a mix of both. + * By default the script overrides the default file browser (netw), so if + you :edit a directory a (slighly modified) NERD tree will appear in the + current window ============================================================================== 2. Functionality provided *NERDTreeFunctionality* @@ -109,7 +112,15 @@ The following features and functionality are provided by the NERD tree: again. If no NERD tree exists for this tab then this command acts the same as the |:NERDTree| command. -:NERDTreeClose +:NERDTreeMirror *:NERDTreeMirror* + Shares an existing NERD tree, from another tab, in the current tab. + Changes made to one tree are reflected in both as they are actually the + same buffer. + + If only one other NERD tree exists, that tree is automatically mirrored. If + more than one exists, the script will ask which tree to mirror. + +:NERDTreeClose *:NERDTreeClose* Close the NERD tree in this tab. ------------------------------------------------------------------------------ @@ -122,7 +133,7 @@ For example, you could use bookmarks to tag all of your project directories. 2.2.1. The Bookmark Table *NERDTreeBookmarkTable* If the bookmark table is active (see |NERDTree-B| and -|NERDTreeShowBookmarks|), it will be rendered above the tree. You can double +|'NERDTreeShowBookmarks'|), it will be rendered above the tree. You can double click bookmarks or use the |NERDTree-o| mapping to activate them. See also, |NERDTree-t| and |NERDTree-T| @@ -160,7 +171,7 @@ Note that the following commands are only available in the NERD tree buffer. Remove all bookmarks. :ReadBookmarks - Re-read the bookmarks in the |NERDTreeBookmarksFile|. + Re-read the bookmarks in the |'NERDTreeBookmarksFile'|. See also |:NERDTree| and |:NERDTreeFromBookmark|. @@ -171,7 +182,7 @@ If invalid bookmarks are detected, the script will issue an error message and the invalid bookmarks will become unavailable for use. These bookmarks will still be stored in the bookmarks file (see -|NERDTreeBookmarksFile|), down the bottom. There will always be a blank line +|'NERDTreeBookmarksFile'|), down the bottom. There will always be a blank line after the valid bookmarks but before the invalid ones. Each line in the bookmarks file represents one bookmark. The proper format is: @@ -190,16 +201,18 @@ o.......Open files, directories and bookmarks....................|NERDTree-o| go......Open selected file, but leave cursor in the NERDTree.....|NERDTree-go| t.......Open selected node/bookmark in a new tab.................|NERDTree-t| T.......Same as 't' but keep the focus on the current tab........|NERDTree-T| -<tab>...Open selected file in a split window.....................|NERDTree-tab| -g<tab>..Same as <tab>, but leave the cursor on the NERDTree......|NERDTree-gtab| +i.......Open selected file in a split window.....................|NERDTree-i| +gi......Same as i, but leave the cursor on the NERDTree..........|NERDTree-gi| +s.......Open selected file in a new vsplit.......................|NERDTree-s| +gs......Same as s, but leave the cursor on the NERDTree..........|NERDTree-gs| !.......Execute the current file.................................|NERDTree-!| O.......Recursively open the selected directory..................|NERDTree-O| x.......Close the current nodes parent...........................|NERDTree-x| X.......Recursively close all children of the current node.......|NERDTree-X| -e.......Open a netrw for the current dir.........................|NERDTree-e| +e.......Edit the current dif.....................................|NERDTree-e| double-click.......same as the |NERDTree-o| map. -middle-click.......same as |NERDTree-tab| for files, same as +middle-click.......same as |NERDTree-i| for files, same as |NERDTree-e| for dirs. D.......Delete the current bookmark .............................|NERDTree-D| @@ -219,7 +232,7 @@ R.......Recursively refresh the current root.....................|NERDTree-R| m.......Display the filesystem menu..............................|NERDTree-m| cd......Change the CWD to the dir of the selected node...........|NERDTree-cd| -H.......Toggle whether hidden files displayed....................|NERDTree-H| +I.......Toggle whether hidden files displayed....................|NERDTree-I| f.......Toggle whether the file filters are used.................|NERDTree-f| F.......Toggle whether files are displayed.......................|NERDTree-F| B.......Toggle whether the bookmark table is displayed...........|NERDTree-B| @@ -278,8 +291,8 @@ Applies to: files and directories. The same as |NERDTree-t| except that the focus is kept in the current tab. ------------------------------------------------------------------------------ - *NERDTree-tab* -Default key: <tab> + *NERDTree-i* +Default key: i Map option: NERDTreeMapOpenSplit Applies to: files. @@ -287,15 +300,35 @@ Opens the selected file in a new split window and puts the cursor in the new window. ------------------------------------------------------------------------------ - *NERDTree-gtab* -Default key: g<tab> + *NERDTree-gi* +Default key: gi Map option: None Applies to: files. -The same as |NERDTree-tab| except that the cursor is not moved. +The same as |NERDTree-i| except that the cursor is not moved. The key combo for this mapping is always "g" + NERDTreeMapOpenSplit (see -|NERDTree-tab|). +|NERDTree-i|). + +------------------------------------------------------------------------------ + *NERDTree-s* +Default key: s +Map option: NERDTreeMapOpenVSplit +Applies to: files. + +Opens the selected file in a new vertically split window and puts the cursor in +the new window. + +------------------------------------------------------------------------------ + *NERDTree-gs* +Default key: gs +Map option: None +Applies to: files. + +The same as |NERDTree-s| except that the cursor is not moved. + +The key combo for this mapping is always "g" + NERDTreeMapOpenVSplit (see +|NERDTree-s|). ------------------------------------------------------------------------------ *NERDTree-!* @@ -314,8 +347,8 @@ Applies to: directories. Recursively opens the selelected directory. All files and directories are cached, but if a directory would not be -displayed due to file filters (see |NERDTreeIgnore| |NERDTree-f|) or the -hidden file filter (see |NERDTreeShowHidden|) then its contents are not +displayed due to file filters (see |'NERDTreeIgnore'| |NERDTree-f|) or the +hidden file filter (see |'NERDTreeShowHidden'|) then its contents are not cached. This is handy, especially if you have .svn directories. ------------------------------------------------------------------------------ @@ -342,7 +375,9 @@ Default key: e Map option: NERDTreeMapOpenExpl Applies to: files and directories. -Opens a netrw on the selected directory, or the selected file's directory. +|:edit|s the selected directory, or the selected file's directory. This could +result in a NERD tree or a netrw being opened, depending on +|'NERDTreeHijackNetrw'|. ------------------------------------------------------------------------------ *NERDTree-D* @@ -463,13 +498,12 @@ Applies to: files and directories. Display the filesystem menu. See |NERDTreeFilesysMenu| for details. ------------------------------------------------------------------------------ - *NERDTree-H* -Default key: H + *NERDTree-I* +Default key: I Map option: NERDTreeMapToggleHidden Applies to: no restrictions. -Toggles whether hidden files are displayed. Hidden files are any -file/directory that starts with a "." +Toggles whether hidden files (i.e. "dot files") are displayed. ------------------------------------------------------------------------------ *NERDTree-f* @@ -477,7 +511,7 @@ Default key: f Map option: NERDTreeMapToggleFilters Applies to: no restrictions. -Toggles whether file filters are used. See |NERDTreeIgnore| for details. +Toggles whether file filters are used. See |'NERDTreeIgnore'| for details. ------------------------------------------------------------------------------ *NERDTree-F* @@ -561,53 +595,58 @@ then id be grateful if you'd email me. The script provides the following options that can customise the behaviour the NERD tree. These options should be set in your vimrc. -|loaded_nerd_tree| Turns off the script. +|'loaded_nerd_tree'| Turns off the script. -|NERDChristmasTree| Tells the NERD tree to make itself colourful +|'NERDChristmasTree'| Tells the NERD tree to make itself colourful and pretty. -|NERDTreeAutoCenter| Controls whether the NERD tree window centers +|'NERDTreeAutoCenter'| Controls whether the NERD tree window centers when the cursor moves within a specified distance to the top/bottom of the window. -|NERDTreeAutoCenterThreshold| Controls the sensitivity of autocentering. +|'NERDTreeAutoCenterThreshold'| Controls the sensitivity of autocentering. -|NERDTreeCaseSensitiveSort| Tells the NERD tree whether to be case +|'NERDTreeCaseSensitiveSort'| Tells the NERD tree whether to be case sensitive or not when sorting nodes. -|NERDTreeChDirMode| Tells the NERD tree if/when it should change +|'NERDTreeChDirMode'| Tells the NERD tree if/when it should change vim's current working directory. -|NERDTreeHighlightCursorline| Tell the NERD tree whether to highlight the +|'NERDTreeHighlightCursorline'| Tell the NERD tree whether to highlight the current cursor line. -|NERDTreeIgnore| Tells the NERD tree which files to ignore. +|'NERDTreeHijackNetrw'| Tell the NERD tree whether to replace the netrw + autocommands for exploring local directories. -|NERDTreeBookmarksFile| Where the bookmarks are stored. +|'NERDTreeIgnore'| Tells the NERD tree which files to ignore. -|NERDTreeMouseMode| Tells the NERD tree how to handle mouse +|'NERDTreeBookmarksFile'| Where the bookmarks are stored. + +|'NERDTreeMouseMode'| Tells the NERD tree how to handle mouse clicks. -|NERDTreeQuitOnOpen| Closes the tree window after opening a file. +|'NERDTreeQuitOnOpen'| Closes the tree window after opening a file. -|NERDTreeShowBookmarks| Tells the NERD tree whether to display the +|'NERDTreeShowBookmarks'| Tells the NERD tree whether to display the bookmarks table on startup. -|NERDTreeShowFiles| Tells the NERD tree whether to display files +|'NERDTreeShowFiles'| Tells the NERD tree whether to display files in the tree on startup. -|NERDTreeShowHidden| Tells the NERD tree whether to display hidden +|'NERDTreeShowHidden'| Tells the NERD tree whether to display hidden files on startup. -|NERDTreeShowLineNumbers| Tells the NERD tree whether to display line +|'NERDTreeShowLineNumbers'| Tells the NERD tree whether to display line numbers in the tree window. -|NERDTreeSortOrder| Tell the NERD tree how to sort the nodes in +|'NERDTreeSortOrder'| Tell the NERD tree how to sort the nodes in the tree. -|NERDTreeWinPos| Tells the script where to put the NERD tree +|'NERDTreeStatusline'| Set a statusline for NERD tree windows. + +|'NERDTreeWinPos'| Tells the script where to put the NERD tree window. -|NERDTreeWinSize| Sets the window size when the NERD tree is +|'NERDTreeWinSize'| Sets the window size when the NERD tree is opened. ------------------------------------------------------------------------------ @@ -616,13 +655,13 @@ NERD tree. These options should be set in your vimrc. To enable any of the below options you should put the given line in your ~/.vimrc - *loaded_nerd_tree* + *'loaded_nerd_tree'* If this plugin is making you feel homicidal, it may be a good idea to turn it off with this line in your vimrc: > let loaded_nerd_tree=1 < ------------------------------------------------------------------------------ - *NERDChristmasTree* + *'NERDChristmasTree'* Values: 0 or 1. Default: 1. @@ -632,12 +671,12 @@ added to the nerd tree to make it more colourful. Set it to 0 for a more vanilla looking tree. ------------------------------------------------------------------------------ - *NERDTreeAutoCenter* + *'NERDTreeAutoCenter'* Values: 0 or 1. Default: 1 If set to 1, the NERD tree window will center around the cursor if it moves to -within |NERDTreeAutoCenterThreshold| lines of the top/bottom of the window. +within |'NERDTreeAutoCenterThreshold'| lines of the top/bottom of the window. This is ONLY done in response to tree navigation mappings, i.e. |NERDTree-J| |NERDTree-K| |NERDTree-C-J| |NERDTree-c-K| |NERDTree-p| @@ -646,15 +685,15 @@ i.e. |NERDTree-J| |NERDTree-K| |NERDTree-C-J| |NERDTree-c-K| |NERDTree-p| The centering is done with a |zz| operation. ------------------------------------------------------------------------------ - *NERDTreeAutoCenterThreshold* + *'NERDTreeAutoCenterThreshold'* Values: Any natural number. Default: 3 This option controls the "sensitivity" of the NERD tree auto centering. See -|NERDTreeAutoCenter| for details. +|'NERDTreeAutoCenter'| for details. ------------------------------------------------------------------------------ - *NERDTreeCaseSensitiveSort* + *'NERDTreeCaseSensitiveSort'* Values: 0 or 1. Default: 0. @@ -675,7 +714,7 @@ account. The above nodes would then be sorted like this: > boner.c < ------------------------------------------------------------------------------ - *NERDTreeChDirMode* + *'NERDTreeChDirMode'* Values: 0, 1 or 2. Default: 0. @@ -698,7 +737,7 @@ is /home/marty/foobar and you make the node for /home/marty/foobar/baz the new root then the CWD will become /home/marty/foobar/baz. ------------------------------------------------------------------------------ - *NERDTreeHighlightCursorline* + *'NERDTreeHighlightCursorline'* Values: 0 or 1. Default: 1. @@ -706,13 +745,30 @@ If set to 1, the current cursor line in the NERD tree buffer will be highlighted. This is done using the |cursorline| option. ------------------------------------------------------------------------------ - *NERDTreeIgnore* + *'NERDTreeHijackNetrw'* +Values: 0 or 1. +Default: 1. + +If set to 1, doing a > + :edit <some directory> +< +will open up a "secondary" NERD tree instead of a netrw in the target window. + +Secondary NERD trees behaves slighly different from a regular trees in the +following respects: + 1. 'o' will open the selected file in the same window as the tree, + replacing it. + 2. you can have as many secondary tree as you want in the same tab. + +------------------------------------------------------------------------------ + *'NERDTreeIgnore'* Values: a list of regular expressions. Default: ['\~$']. This option is used to specify which files the NERD tree should ignore. It must be a list of regular expressions. When the NERD tree is rendered, any -files/dirs that match any of the regex's in NERDTreeIgnore wont be displayed. +files/dirs that match any of the regex's in 'NERDTreeIgnore' wont be +displayed. For example if you put the following line in your vimrc: > let NERDTreeIgnore=['\.vim$', '\~$'] @@ -728,14 +784,14 @@ The file filters can be turned on and off dynamically with the |NERDTree-f| mapping. ------------------------------------------------------------------------------ - *NERDTreeBookmarksFile* + *'NERDTreeBookmarksFile'* Values: a path Default: $HOME/.NERDTreeBookmarks This is where bookmarks are saved. See |NERDTreeBookmarkCommands|. ------------------------------------------------------------------------------ - *NERDTreeMouseMode* + *'NERDTreeMouseMode'* Values: 1, 2 or 3. Default: 1. @@ -753,25 +809,26 @@ then (to single click activate it) you must click somewhere in 'application.rb'. ------------------------------------------------------------------------------ - *NERDTreeQuitOnOpen* + *'NERDTreeQuitOnOpen'* Values: 0 or 1. Default: 0 If set to 1, the NERD tree window will close after opening a file with the -|NERDTree-o| or |NERDTree-tab| mappings. +|NERDTree-o| or |NERDTree-i| mappings. ------------------------------------------------------------------------------ - *NERDTreeShowBookmarks* + *'NERDTreeShowBookmarks'* Values: 0 or 1. Default: 0. If this option is set to 1 then the bookmarks table will be displayed. -This option can be toggled dynamically, per tree, with the |NERDTree-B| mapping. +This option can be toggled dynamically, per tree, with the |NERDTree-B| +mapping. ------------------------------------------------------------------------------ - *NERDTreeShowFiles* + *'NERDTreeShowFiles'* Values: 0 or 1. Default: 1. @@ -783,19 +840,19 @@ mapping and is useful for drastically shrinking the tree when you are navigating to a different part of the tree. ------------------------------------------------------------------------------ - *NERDTreeShowHidden* + *'NERDTreeShowHidden'* Values: 0 or 1. Default: 0. This option tells vim whether to display hidden files by default. This option -can be dynamically toggled, per tree, with the |NERDTree-H| mapping. Use one +can be dynamically toggled, per tree, with the |NERDTree-I| mapping. Use one of the follow lines to set this option: > let NERDTreeShowHidden=0 let NERDTreeShowHidden=1 < ------------------------------------------------------------------------------ - *NERDTreeShowLineNumbers* + *'NERDTreeShowLineNumbers'* Values: 0 or 1. Default: 0. @@ -806,7 +863,7 @@ window. Use one of the follow lines to set this option: > < ------------------------------------------------------------------------------ - *NERDTreeSortOrder* + *'NERDTreeSortOrder'* Values: a list of regular expressions. Default: ['\/$', '*', '\.swp$', '\.bak$', '\~$'] @@ -821,8 +878,8 @@ all .h files. All files containing the string 'foobar' will be placed at the end. The star is a special flag: it tells the script that every node that doesnt match any of the other regexps should be placed here. -If no star is present in NERDTreeSortOrder then one is automatically appended -to the array. +If no star is present in 'NERDTreeSortOrder' then one is automatically +appended to the array. The regex '\/$' should be used to match directory nodes. @@ -839,30 +896,42 @@ Other examples: > backup files will appear last with everything else preceding them. ------------------------------------------------------------------------------ - *NERDTreeWinPos* -Values: "left", "right", "top" or "bottom" + *'NERDTreeStatusline'* +Values: Any valid statusline setting. +Default: %{b:NERDTreeRoot.path.strForOS(0)} + +Tells the script what to use as the |'statusline'| setting for NERD tree +windows. + +Note that the statusline is set using |:let-&| not |:set| so escaping spaces +isn't necessary. + +Setting this option to -1 will will deactivate it so that your global +statusline setting is used instead. + +------------------------------------------------------------------------------ + *'NERDTreeWinPos'* +Values: "left" or "right" Default: "left". This option is used to determine where NERD tree window is placed on the screen. -"top" or "bottom", will cause a horizontal split to be created for the tree, -while "left" and "right" will cause a vertical split. - -This option is makes it possible to use two different explorer type -plugins simultaneously. For example, you could have the taglist plugin on the -left of the window and the NERD tree on the right. +This option makes it possible to use two different explorer plugins +simultaneously. For example, you could have the taglist plugin on the left of +the window and the NERD tree on the right. ------------------------------------------------------------------------------ - *NERDTreeWinSize* + *'NERDTreeWinSize'* Values: a positive integer. Default: 31. This option is used to change the size of the NERD tree when it is loaded. ============================================================================== - *NERDTreePublicFunctions* -5. Public functions ~ +4. Hacking the NERD tree *NERDTreeHacking* + +Public functions ~ The script provides 2 public functions for your hacking pleasure. Their signatures are: > @@ -877,16 +946,29 @@ style OO. To see the functions that each class provides you can read look at the code. Use the node objects to manipulate the structure of the tree. Use the path -objects to access the data the tree represents and to make changes to the -filesystem. +objects to access the files/directories the tree nodes represent. -============================================================================== -5. TODO list *NERDTreeTodo* +The NERD tree filetype ~ -Window manager integration? +NERD tree buffers have a filetype of "nerdtree". You can use this to hack the +NERD tree via autocommands (on |FileType|) or via an ftplugin. + +For example, putting this code in ~/.vim/ftplugin/nerdtree.vim would override +the o mapping, making it open the selected node in a new gvim instance. > + + nnoremap <silent> <buffer> o :call <sid>openInNewVimInstance()<cr> + function! s:openInNewVimInstance() + let p = NERDTreeGetCurrentPath() + if p != {} + silent exec "!gvim " . p.strForOS(1) . "&" + endif + endfunction +< +This way you can add new mappings or :commands or override any existing +mapping. ============================================================================== -6. The Author *NERDTreeAuthor* +5. About *NERDTreeAbout* The author of the NERD tree is a terrible terrible monster called Martyzilla who gobbles up small children with milk and sugar for breakfast. @@ -896,332 +978,100 @@ you, so feel free to send him suggestions and/or comments about this plugin. Don't be shy --- the worst he can do is slaughter you and stuff you in the fridge for later ;) -============================================================================== -7. Changelog *NERDTreeChangelog* +The latest stable versions can be found at + http://www.vim.org/scripts/script.php?script_id=1658 -2.14.0 - - fix a bug where the <c-w>o mapping would cause the tree window to be - incorrectly sized when reopened. - - add keymapping to delete bookmarks from the bookmarks table, see - :help NERDTree-D - - lots of refactoring -2.13.0 - - make NERDTreeChDir option default to 0 (i.e. never change vims current - working dir by default) - - when moving/deleting nodes with the filesystem menu, move/delete any - associated bookmarks - - make the t/T on directory nodes open a fresh NERD tree for the selected - dir in a new tab, rather than a netrw. - - place the cursor at the top of the bookmarks table when opening it with B - - make NERDTreeQuitOnOpen option work with the g<tab> and go mappings, - thanks to Maxim Kim for the bug report - - change how invalid bookmarks are handled. Now they are not deleted. If a - bookmark is malformed (in the bookmarks file) or points to an - invalid/nonexisting location then print an error and place the offending - bookmarks at the bottom of the bookmarks file. See :help - |NERDTreeInvalidBookmarks| for info. Thanks to Zhang Shuhan for the - suggestion and the testing. - - fix a bug with the 'o' mapping that occurred when opening a new buffer - for a file whose name was a substring of an already open file. Thanks to - Charlton Wang for the report. - - stop the script from going into an infinite loop when it tries to cache - a named pipe. Thanks to Charlton Wang for the report. - -2.12.0 - - added a UI for bookmarks. See :help NERDTreeBookmarkTable for details. - Thanks to Zhang Shuhan for testing and bug reports. - - relaxed the restrictions on bookmark names, now the only restriction is - that they cant contain spaces. This allows for e.g. Chinese bookmark - names. Thanks to Zhang Shuhan for the suggestion. - - combined the NERDTreeWinPos and NERDTreeSplitVertical options. See :help - NERDTreeWinPos. - - applied a patch from Matan Nassau to add the NERDTreeQuitOnOpen option - which closes the tree window after opening a file. See :help - NERDTreeQuitOnOpen. - - optimised the nerd tree rendering. Now it takes just over 1/3 of the time - it previously took to render. - - now the tree filter mappings toggle the filters "per tree" rather than - globally. The global filter variables are used to set the initial filter - settings for each new NERD tree. - - fix to window resizing when opening a file when NERD tree is the only - window open - - other fixes - -2.11.0 - - changes to the 'o' mapping when opening files: - - dont clobber "special" windows (eg taglist/quickfix/etc). This should - make the NERD tree play nicer with other explorer plugins. Thanks to - Yuan Jiang for the suggestion. - - if the file is already open in the current tab, just move the cursor - to that window - - highlight executable files, made some slight changes to other - highlighting - - if the user resizes the tree window, keep that new size. Dont reset to - the default during the <tab> mapping, or :NERDTreeToggle command. Only - reset the size if a fresh tree is started with :NERDTree. - - remove the "magic" functionality from the <c-j>/<c-k> mappings (it was - more confusing than helpful) - - other minor fixes - -2.10.0 - - added bookmarks, see :help NERDTreeBookmarkCommands for details. Thanks - to Piotr Czachur for all his testing and suggestions. - - fixed screen jumping bug with when &scrolloff != 0 - - fixed some bugs with copying nodes - - other random fixes - - change license to wtfpl - -2.9.0 - - - path handling improvements, thanks to Zhang Shuhan for heaps of - testing/bug reports - * improved how paths are stored, now the script will no longer get - confused about drives on MF Windows - * made the script way better at handling paths with strange characters - in them (eg '$@; etc) - - applied a patch from Cory Echols - * add the command :NERDTreeClose to close the tree for the current tab - * set the filetype for the NERD tree buffer to "nerdtree" - -2.8.0 - - added an option to enable/disable line numbers in the NERD tree window, - thanks to Olivier Yiptong for the email. - -2.7.1 - - Changed the keys for the filesystem menu to be mnemonic rather than - arbitrary integers - - Documented the copying functionality in the filesystem menu - -2.7.0 - - Bug fix: Now when you have the tree on the right and you open it with - multiple windows stacked, it will take up the full height of the vim - window. - - Now line numbers always turned off in the tree by default - - Implemented copying of nodes (via the filesystem menu) for *nix/macosx - - took the help doc out of the script and repackaged the whole thing as a - zip - -2.6.2 - - Now when you try to open a file node into a window that is modified, the - window is not split if the &hidden option is set. Thanks to Niels Aan - de Brugh for this suggestion. - -2.6.1 - - Fixed a major bug with the <tab> mapping. Thanks to Zhang Weiwu for - emailing me. - -2.6.0 - - Extended the behaviour of <c-j/k>. Now if the cursor is on a file node - and you use <c-j/k> the cursor will jump to its PARENTS next/previous - sibling. Go :help NERDTree-c-j and :help NERDTree-c-k for info. - - Extended the behaviour of the J/K mappings. Now if the cursor is on the - last child of a node and you push J/K it will jump down to the last child - of the next/prev of its parents siblings that is open and has children. - Go :help NERDTree-J and :help NERDTree-K for info. - - The goal of these changes is to make tree navigation faster. - - Reorganised the help page a bit. - - Removed the E mapping. - - bugfixes - -2.5.0 - - Added an option to enforce case sensitivity when sorting tree nodes. - Read :help NERDTreeCaseSensitiveSort for details. (thanks to Michael - Madsen for emailing me about this). Case sensitivity defaults to off. - - Made the script echo a "please wait" style message when opening large - directories. Thanks to AOYAMA Shotaro for this suggestion. - - Added 2 public functions that can be used to retrieve the treenode and - path that the cursor is on. Read :help NERDTreePublicFunctions for - details (thanks again to AOYAMA Shotaro for the idea :). - - added 2 new mappings for file nodes: "g<tab>" and "go". These are the - same as the "<tab>" and "o" maps except that the cursor stays in the - NERDTree. Note: these maps are slaved to the o and <tab> mappings, so if - eg you remap "<tab>" to "i" then the "g<tab>" map will also be changed - to "gi". - - Renamed many of the help tags to be simpler. - - Simplified the ascii "graphics" for the filesystem menu - - Fixed bugs. - - Probably created bugs. - - Refactoring. - -2.4.0 - - Added the P mapping to jump to the tree root. - - Added window centering functionality that can be triggered when doing - using any of the tree nav mappings. Essentially, if the cursor comes - within a certain distance of the top/bottom of the window then a zz is - done in the window. Two related options were added: NERDTreeAutoCenter - to turn this functionality on/off, and NERDTreeAutoCenterThreshold to - control how close the cursor has to be to the window edge to trigger the - centering. - -2.3.0 - - Tree navigation changes: - - Added J and K mappings to jump to last/first child of the current dir. - Options to customise these mappings have also been added. - - Remapped the jump to next/prev sibling commands to be <C-j> and <C-k> by - default. - These changes should hopefully make tree navigation mappings easier to - remember and use as the j and k keys are simply reused 3 times (twice - with modifier keys). - - - Made it so that, when any of the tree filters are toggled, the cursor - stays with the selected node (or goes to its parent/grandparent/... if - that node is no longer visible) - - Fixed an error in the doc for the mouse mode option. - - Made the quickhelp correctly display the current single/double click - mappings for opening nodes as specified by the NERDTreeMouseMode option. - - Fixed a bug where the script was spazzing after prompting you to delete - a modified buffer when using the filesystem menu. - - Refactoring -2.2.3 - - Refactored the :echo output from the script. - - Fixed some minor typos in the doc. - - Made some minor changes to the output of the 'Tree filtering mappings' - part of the quickhelp - -2.2.2 - - More bugfixes... doh. - -2.2.1 - - Bug fix that was causing an exception when closing the nerd tree. Thanks - to Tim carey-smith and Yu Jun for pointing this out. - -2.2.0 - - Now 'cursorline' is set in the NERD tree buffer by default. See :help - NERDTreeHighlightCursorline for how to disable it. - -2.1.2 - - Stopped the script from clobbering the 1,2,3 .. 9 registers. - - Made it "silent!"ly delete buffers when renaming/deleting file nodes. - - Minor correction to the doc - - Fixed a bug when refreshing that was occurring when the node you - refreshed had been deleted externally. - - Fixed a bug that was occurring when you open a file that is already open - and modified. - -2.1.1 - - Added a bit more info about the buffers you are prompted to delete when - renaming/deleting nodes from the filesystem menu that are already loaded - into buffers. - - Refactoring and bugfixes - -2.1.0 - - Finally removed the blank line that always appears at the top of the - NERDTree buffer - - Added NERDTreeMouseMode option. If set to 1, then a double click is - required to activate all nodes, if set to 2 then a single click will - activate directory nodes, if set to 3 then a single click will activate - all nodes. - - Now if you delete a file node and have it open in a buffer you are given - the option to delete that buffer as well. Similarly if you rename a file - you are given the option to delete any buffers containing the old file - (if any exist) - - When you rename or create a node, the cursor is now put on the new node, - this makes it easy immediately edit the new file. - - Fixed a bug with the ! mapping that was occurring on windows with paths - containing spaces. - - Made all the mappings customisable. See |NERD_tree-mappings| for - details. A side effect is that a lot of the "double mappings" have - disappeared. E.g 'o' is now the key that is used to activate a node, - <CR> is no longer mapped to the same. - - Made the script echo warnings in some places rather than standard echos - - Insane amounts of refactoring all over the place. - -2.0.0 - - Added two new NERDChristmasTree decorations. First person to spot them - and email me gets a free copy of the NERDTree. - - Made it so that when you jump around the tree (with the p, s and S - mappings) it is counted as a jump by vim. This means if you, eg, push - 'p' one too many times then you can go `` or ctrl-o. - - Added a new option called NERDTreeSortOrder which takes an array of - regexs and is used to determine the order that the treenodes are listed - in. Go :help NERDTreeSortOrder for details. - - Removed the NERDTreeSortDirs option because it is consumed by - NERDTreeSortOrder - - Added the 'i' mapping which is the same as <tab> but requires less - effort to reach. - - Added the ! mapping which is used to execute file in the tree (after it - prompts you for arguments etc) +The latest dev versions are on github + http://github.com/scrooloose/nerdtree ============================================================================== -8. Credits *NERDTreeCredits* - -Thanks to Tim Carey-Smith for testing/using the NERD tree from the first -pre-beta version, for his many suggestions and for his constant stream of bug -complaints. - -Thanks to Vigil for trying it out before the first release :) and suggesting -that mappings to open files in new tabs should be implemented. - -Thanks to Nick Brettell for testing, fixing my spelling and suggesting i put a - .. (up a directory) -line in the gui. - -Thanks to Thomas Scott Urban - the author of the vtreeexplorer plugin - whose -gui code i borrowed from. - -Thanks to Terrance Cohen for pointing out a bug where the script was changing -vims CWD all over the show. - -Thanks to Yegappan Lakshmanan (author of Taglist and other orgasmically -wonderful plugins) for telling me how to fix a bug that was causing vim to go -into visual mode everytime you double clicked a node :) - -Thanks to Jason Mills for sending me a fix that allows windows paths to use -forward slashes as well as backward. - -Thanks to Michael Geddes (frogonwheels on #vim at freenode) for giving me some -tips about syntax highlighting when i was doing highlighting for the -quickhelp. - -Thanks to Yu Jun for emailing me about a bug that was occurring when closing -the tree. - -Thanks to Michael Madsen for emailing me about making case sensitivity -optional when sorting nodes. - -Thanks to AOYAMA Shotaro for suggesting that i echo a "please wait" message -when opening large directories. - -Thanks to Michael Madsen for requesting the NERDTreeCaseSensitiveSort option. - -Thanks to AOYAMA Shotaro for suggesting that a "please wait" style message be -echoed when opening large directories. Also, thanks for the suggestion of -having public functions in the script to access the internal data :D - -Thanks to Zhang Weiwu for emailing me about a bug with the the <tab> mapping -in 2.6.0 - -Thanks to Niels Aan de Brugh for the suggestion that the script now split the -window if you try to open a file in a window containing a modified buffer when -the &hidden option is set. - -Thanks to Olivier Yiptong for prompting me to make line numbers in the -NERD tree window optional. - -Thanks to Zhang Shuhan for all of his emails and testing to help improve the -NERD tree path handling. Thanks also for suggesting the bookmarks gui, and for -testing and his many suggestions and bugreports about bookmarks. - -Thanks to Cory Echols for sending a patch to add the :NERDTreeClose command and -set the NERD tree buffers filetype to 'nerdtree' - -Thanks to Piotr Czachur for all his suggestions and testing for the bookmarks -feature. - -Thanks to Yuan Jiang for suggesting the "o" mapping shouldnt clobber "special" -windows, like taglist. - -Thanks to Matan Nassau for the patch to add the NERDTreeQuitOnOpen option. - -Thanks to Maxim Kim for reporting a bug with g<tab> and go mappings when -NERDTreeQuitOnOpen was set. +6. Changelog *NERDTreeChangelog* + +3.1.0 + New features: + - add mappings to open files in a vsplit, see :help NERDTree-s and :help + NERDTree-gs + - make the statusline for the nerd tree window default to something + hopefully more useful. See :help 'NERDTreeStatusline' + Bugfixes: + - make the hijack netrw functionality work when vim is started with "vim + <some dir>" (thanks to Alf Mikula for the patch). + - fix a bug where the CWD wasnt being changed for some operations even when + NERDTreeChDirMode==2 (thanks to Lucas S. Buchala) + - add -bar to all the nerd tree :commands so they can chain with other + :commands (thanks to tpope) + - fix bugs when ignorecase was set (thanks to nach) + - fix a bug with the relative path code (thanks to nach) + - fix a bug where doing a :cd would cause :NERDTreeToggle to fail (thanks nach) + + +3.0.1 + Bugfixes: + - fix bugs with :NERDTreeToggle and :NERDTreeMirror when 'hidden + was not set + - fix a bug where :NERDTree <path> would fail if <path> was relative and + didnt start with a ./ or ../ Thanks to James Kanze. + - make the q mapping work with secondary (:e <dir> style) trees, + thanks to jamessan + - fix a bunch of small bugs with secondary trees + + More insane refactoring. + +3.0.0 + - hijack netrw so that doing an :edit <directory> will put a NERD tree in + the window rather than a netrw browser. See :help 'NERDTreeHijackNetrw' + - allow sharing of trees across tabs, see :help :NERDTreeMirror + - remove "top" and "bottom" as valid settings for NERDTreeWinPos + - change the '<tab>' mapping to 'i' + - change the 'H' mapping to 'I' + - lots of refactoring -Thanks to Charlton Wang for reporting bugs with the 'o' mapping and with -handling named pipes. +============================================================================== +7. Credits *NERDTreeCredits* + +Thanks to the following people for testing, bug reports, ideas etc. Without +you I probably would have got bored of the hacking the NERD tree and +just downloaded pr0n instead. + + Tim Carey-Smith (halorgium) + Vigil + Nick Brettell + Thomas Scott Urban + Terrance Cohen + Yegappan Lakshmanan + Jason Mills + Michael Geddes (frogonwheels) + Yu Jun + Michael Madsen + AOYAMA Shotaro + Zhang Weiwu + Niels Aan de Brugh + Olivier Yiptong + Zhang Shuhan + Cory Echols + Piotr Czachur + Yuan Jiang + Matan Nassau + Maxim Kim + Charlton Wang + Matt Wozniski (godlygeek) + knekk + Sean Chou + Ryan Penn + Simon Peter Nicholls + Michael Foobar + Tomasz Chomiuk + Denis Pokataev + Tim Pope (tpope) + James Kanze + James Vega (jamessan) + Frederic Chanal (nach) + Alf Mikula + Lucas S. Buchala ============================================================================== -9. License *NERDTreeLicense* +8. License *NERDTreeLicense* The NERD tree is released under the wtfpl. See http://sam.zoy.org/wtfpl/COPYING. doc/NERD_tree.txt @@ -63,9 +63,9 @@ Rails application development. and several other commands are provided. |rails-navigation| 5. Enhanced syntax highlighting. From has_and_belongs_to_many to - distance_of_time_in_words, it's here. For Vim 7 users, 'completefunc' is - set to enable syntax based completion on |i_CTRL-X_CTRL-U|, making it easy - to complete such long method names. |rails-syntax| + distance_of_time_in_words, it's here. For easy completion of these long + method names, 'completefunc' is set to enable syntax based completion on + |i_CTRL-X_CTRL-U|. |rails-syntax| 6. Interface to script/*. Generally, use ":Rscript about" to call "script/about". Most commands have wrappers with additional features: @@ -92,21 +92,17 @@ directly to |rails-install-plugin| below. Installing and Configuring Vim ~ *rails-install-vim* -Because it is common for users to utilize an older version of Vim that came -installed on a system, rails.vim has a design goal of remaining compatible -with versions of Vim 6.2 and newer. However, if you have a choice in the -matter, you are strongly encouraged to install the latest version available. -Older versions of Vim should work, but increasingly, new plugin features will -require Vim 7 or newer. If possible, install a version of Vim with the |Ruby| -interface compiled in, as a few features will make use of it when available. +Vim 7 or newer is required. If possible, install a version of Vim with the +|Ruby| interface compiled in, as a few features will make use of it when +available. If you are new to Vim, you need to create a vimrc. For Windows, this file goes in ~\_vimrc (try :e ~\_vimrc if you don't know where this is). On other platforms, use ~/.vimrc. A very minimal example file is shown below. > - set nocompatible - syntax on - filetype plugin indent on + set nocompatible + syntax on + filetype plugin indent on > Installing and Using the Plugin ~ *rails-install-plugin* @@ -139,13 +135,19 @@ actually edit a file from a Rails application. application in {directory}, and loads the README. *rails-:Rake* -:Rake {targets} Like calling |:make| {targets} (with 'makeprg' being +:[range]Rake {targets} Like calling |:make| {targets} (with 'makeprg' being rake). However, in some contexts, if {targets} are omitted, :Rake defaults to something sensible (like db:migrate in a migration, or your current test). + In tests (and specs), giving a line argument runs only + the test method (or example) at that line. Use :.Rake + to run the test method at the cursor position. Use + :.Rake inside a self.up or self.down method in a + migration to run the db:migrate:up or db:migrate:down + task for that particular migration. *rails-:Rake!* -:Rake! {targets} Called with a bang, :Rake will use an alternate +:[range]Rake! {targets} Called with a bang, :Rake will use an alternate 'errorformat' which attempts to parse the full stack backtrace. @@ -166,7 +168,10 @@ actually edit a file from a Rails application. |:help| rails. *rails-:Redit* -:Redit {file} Edit {file}, relative to the application root. +:Redit {file} Edit {file}, relative to the application root. Append + :line or #method to jump within the file, as in + :Redit app/controllers/users_controller.rb:12 or + :Redit app/models/user.rb#activate . *rails-:Rlog* :Rlog [{logfile}] Split window and open {logfile} ($RAILS_ENV or @@ -195,8 +200,9 @@ actually edit a file from a Rails application. :Rpreview! [{path}] As with :Rpreview, except :OpenURL is never used. *rails-:Rtags* -:Rtags Calls ctags -R on the current application root. - Exuberant ctags must be installed. +:Rtags Calls ctags -R on the current application root and + writes the result to tmp/tags. Exuberant ctags must + be installed. *rails-:Rrefresh* :Rrefresh Refreshes certain cached settings. Most noticeably, @@ -237,8 +243,7 @@ The 'path' has been modified to include all the best places to be. < *rails-:Rfind* :Rfind [{file}] Find {file}. Very similar to :find, but things like - BlogController are properly handled, and if - genutils.vim is installed (1.x not 2.x), tab complete + BlogController are properly handled, and tab complete works. The default filename is taken from under the cursor in a manner quite similar to gf, described below. @@ -262,7 +267,7 @@ Example uses of |gf|, and where they might lead. < app/controllers/blog_controller.rb ~ > <%= render :partial => 'sh*ared/sidebar' %> -< app/views/shared/_sidebar.rhtml ~ +< app/views/shared/_sidebar.html.erb ~ > <%= stylesheet_link_tag :scaf*fold %> < public/stylesheets/scaffold.css ~ @@ -277,7 +282,7 @@ Example uses of |gf|, and where they might lead. < test/fixtures/posts.yml ~ > layout :pri*nt -< app/views/layouts/print.rhtml ~ +< app/views/layouts/print.html.erb ~ > <%= link_to "New", new_comme*nt_path %> < app/controllers/comments_controller.rb (jumps to def new) ~ @@ -309,8 +314,8 @@ Two commands, :A and :R, are used quickly jump to an "alternate" and a *rails-alternate* *rails-related* The alternate file is most frequently the test file, though there are exceptions. The related file varies, and is sometimes dependent on current -current location in the file. For example, when editing a controller, the -related file is template for the method currently being edited. +location in the file. For example, when editing a controller, the related +file is template for the method currently being edited. The easiest way to learn these commands is to experiment. A few examples of alternate and related files follow: @@ -330,15 +335,17 @@ For the less common cases, a more deliberate set of commands are provided. Each of the following takes an optional argument (with tab completion) but defaults to a reasonable guess that follows Rails conventions. For example, when editing app/models/employee.rb, :Rcontroller will default to -app/controllers/employees_controller.rb. The controller and model options, -ideally set from |rails-modelines|, can override the mapping from model -related files to controller related files (Rset controller=hiring) and vice -versa (Rset model=employee). See |rails-:Rset|. +app/controllers/employees_controller.rb. The controller and model options +can override the mapping from model related files to controller related files +(Rset controller=hiring) and vice versa (Rset model=employee). See +|rails-:Rset|. Each of the following commands has variants for splitting, vertical splitting and opening in a new tab. For :Rmodel, those variants would be :RSmodel, :RVmodel, and :RTmodel. There is also :REmodel which is a synonym for :Rmodel -(future versions might allow customization of the behavior of :Rmodel). +(future versions might allow customization of the behavior of :Rmodel). They +also allow for jumping to methods or line numbers using the same syntax as +|:Redit|. Model Navigation Commands ~ @@ -346,8 +353,7 @@ Model Navigation Commands ~ The default for model navigation commands is the current model, if it can be determined. For example, test/unit/post_test.rb would have a current model of post. Otherwise, if a controller name can be determined, said controller -name will be singularized and used. To override this, use a command or -modeline like: > +name will be singularized and used. To override this, use a command like: > Rset model=comment :Rmodel |rails-:Rmodel| @@ -363,10 +369,9 @@ modeline like: > :Rmigration [{pattern}] If {pattern} is a number, find the migration for that particular set of digits, zero-padding if necessary. Otherwise, find the newest migration containing the - given pattern. The pattern defaults to the current - model name, pluralized. So when editing the Post - model, :Rmigration with no arguments might find - create_posts.rb, or add_date_to_posts.rb. + given pattern. Omitting the pattern selects the + latest migration. Give a numeric argument of 0 to edit + db/schema.rb. *rails-:Robserver* :Robserver [{name}] Find the observer with a name like @@ -386,7 +391,8 @@ modeline like: > between YAML and CSV fixtures. *rails-:Runittest* -:Runittest [{name}] Edit the unit test for the specified model. +:Runittest [{name}] Edit the unit test or model spec for the specified + model. Controller Navigation Commands ~ *rails-controller-navigation* @@ -394,7 +400,7 @@ The default for controller navigation commands is the current controller, if it can be determined. For example, test/functional/blog_test.rb would have a current controller of blog. Otherwise, if a model name can be determined, said model name will be pluralized and used. To override this, use a command -or modeline like: > +like: > Rset controller=blog :Rcontroller |rails-:Rcontroller| @@ -426,11 +432,12 @@ or modeline like: > *rails-:Rapi* :Rapi [{name}] Edit the API for the specified controller. This command is deprecated; add it yourself with - |:Rcommand| if you still desire it. + |:Rnavcommand| if you still desire it. *rails-:Rfunctionaltest* :Rfunctionaltest [{name}] - Edit the functional test for the specified controller. + Edit the functional test or controller spec for the + specified controller. Miscellaneous Navigation Commands ~ *rails-misc-navigation* @@ -442,7 +449,10 @@ The following commands are not clearly associated with models or controllers. :Rplugin |rails-:Rplugin| :Rlib |rails-:Rlib| :Rtask |rails-:Rtask| +:Renvironment |rails-:Renvironment| +:Rinitializer |rails-:Rinitializer| :Rintegrationtest |rails-:Rintegrationtest| +:Rspec |rails-:Rspec| *rails-:Rstylesheet* :Rstylesheet [{name}] Edit the stylesheet for the specified name, defaulting @@ -458,10 +468,11 @@ The following commands are not clearly associated with models or controllers. is omitted, it defaults to init.rb. *rails-:Rlib* -:Rlib {name} Edit the library from the lib directory for the +:Rlib [{name}] Edit the library from the lib directory for the specified name. If the current file is part of a plugin, the libraries from that plugin can be - specified as well. + specified as well. With no argument, defaults to + editing config/routes.rb. *rails-:Rtask* :Rtask [{name}] Edit the .rake file from lib/tasks for the specified @@ -470,11 +481,25 @@ The following commands are not clearly associated with models or controllers. argument is given, either the current plugin's Rakefile or the application Rakefile will be edited. + *rails-:Renvironment* +:Renvironment [{name}] Edit the config/environments file specified. With no + argument, defaults to editing config/environment.rb. + + *rails-:Rinitializer* +:Rinitializer [{name}] Edit the config/initializers file specified. With no + argument, defaults to editing config/routes.rb. + *rails-:Rintegrationtest* :Rintegrationtest [{name}] - Edit the integration test specified. The default - is based on the current controller or model, with no - singularization or pluralization done. + Edit the integration test specified. With no + argument, defaults to editing test/test_helper.rb. + + *rails-:Rspec* +:Rspec [{name}] Edit the given spec. With no argument, defaults to + editing spec/spec_helper.rb (If you want to jump to + the spec for the given file, use |:A| instead). This + command is only defined if there is a spec folder in + the root of the application. Custom Navigation Commands ~ *rails-custom-navigation* @@ -483,8 +508,8 @@ It is also possible to create custom navigation commands. This is best done in an initialization routine of some sort (e.g., an autocommand); see |rails-configuration| for details. - *rails-:Rcommand* -:Rcommand [options] {name} [{path} ...] + *rails-:Rnavcommand* +:Rnavcommand [options] {name} [{path} ...] Create a navigation command with the supplied name, looking in the supplied paths, using the supplied options. The -suffix option specifies what @@ -498,13 +523,15 @@ in an initialization routine of some sort (e.g., an autocommand); see model, controller, or both (as with :Rintegrationtest) is used as a default. -:Rcommand is still under development and far from fully documented, but the -following examples should illustrate the basics: -> - Rcommand api app/apis -glob=**/* -suffix=_api.rb - Rcommand config config -glob=*.* -suffix= -default=routes.rb - Rcommand environment config/environments -default=../environment - Rcommand concern app/concerns -glob=**/* + *rails-:Rcommand* +:Rcommand Deprecated alias for |:Rnavcommand| + +Examples: > + Rnavcommand api app/apis -glob=**/* -suffix=_api.rb + Rnavcommand config config -glob=*.* -suffix= -default=routes.rb + Rnavcommand concern app/concerns -glob=**/* + Rnavcommand exemplar test/exemplars spec/exemplars -glob=**/* + \ -default=model() -suffix=_exemplar.rb Finally, one Vim feature that proves helpful in conjunction with all of the above is |CTRL-^|. This keystroke edits the previous file, and is helpful to @@ -519,13 +546,18 @@ A limited amount of completion with <Tab> is supported. *rails-:Rscript* :Rscript {script} {options} - Call ruby script/{script} {options}. + Call ruby script/{script} {options}. Defaults to + calling script/console. *rails-:Rconsole* -:Rconsole {options} Start script/console. On Windows it will be launched - in the background with |!start|. In the terminal - version GNU Screen is used if it is running and - |g:rails_gnu_screen| is set. +:Rconsole {options} Start script/console. This command has been + deprecated for the pragmatic reason of making + |:Rcontroller| easier to tab complete. To compensate + for the eventual disappearance of this command, + |:Rscript| now defaults to calling script/console if + no other arguments are given. (If in spite of this + you still feel you would miss this command, speak up + now!) *rails-:Rrunner* :[range]Rrunner {code} Executes {code} with script/runner. Differs from @@ -546,11 +578,10 @@ A limited amount of completion with <Tab> is supported. *rails-:Rgenerate* :Rgenerate {options} Calls script/generate {options}, and then edits the - first file generated. Respects |g:rails_subversion|. + first file generated. *rails-:Rdestroy* -:Rdestroy {options} Calls script/destroy {options}. Respects - |g:rails_subversion|. +:Rdestroy {options} Calls script/destroy {options}. *rails-:Rserver* :Rserver {options} Launches script/server {options} in the background. @@ -581,7 +612,7 @@ The :Rextract command can be used to extract a partial to a new file. :[range]Rpartial [{controller}/]{name} Deprecated alias for :Rextract. -If this is your file, in app/views/blog/show.rhtml: > +If this is your file, in app/views/blog/show.html.erb: > 1 <div> 2 <h2><%= @post.title %></h2> @@ -598,7 +629,7 @@ Your file will change to this: > 2 <%= render :partial => 'post' %> 3 </div> -And app/views/blog/_post.rhtml will now contain: > +And app/views/blog/_post.html.erb will now contain: > 1 <h2><%= post.title %></h2> 2 <p><%= post.body %></p> @@ -648,34 +679,24 @@ place) are also covered in this section. a new project, with appropriate directories (app, etc., but not vendor). - *rails-:Rproject!* -:Rproject! [{file}] Same as :Rproject, only delete existing project if it - exists and recreate it. The logic to delete the old - project is convoluted and possibly erroneous; report - any problems to the |rails-plugin-author|. A handy - mapping might look something like: > - autocmd User Rails map <buffer> <F6> :Rproject!|silent w<CR> -< As a bonus, this command organizes views into separate - directories for easier navigation. The downside of - this is that you will have to regenerate your project - each time you add another view directory (which is why - this command recreates your project each time!). - *rails-:Rdbext* *rails-dbext* :Rdbext [{environment}] This command is only provided when the |dbext| plugin is installed. Loads the {environment} configuration (defaults to $RAILS_ENV or development) from config/database.yml and uses it to configure dbext. - The configuration is cached until a different Rails - application is edited. This command is called for you - automatically when |g:rails_dbext| is set (default on - non-Windows systems). + The configuration is cached on a per application + basis. With dbext versions 8.00 and newer, this + command is called automatically when needed. For + older versions, it is called automatically when + rails.vim loads if |g:rails_dbext| is set (which it is + by default). *rails-:Rdbext!* :Rdbext! [{environment}] Load the database configuration as above, and then attempt a CREATE DATABASE for it. This is primarily - useful for demonstrations. + useful for demonstrations, and has been largely + superseded by |:Rake| db:create. *rails-surround* The |surround| plugin available from vim.org enables adding and removing @@ -722,36 +743,38 @@ core. Supporting plugins and other add-ons to Rails has the potential to rapidly get out of hand. However, a few pragmatic exceptions have been made. *rails-template-types* -Commands like :Rview use a hardwired list of extensions (rhtml, rjs, etc.) +Commands like :Rview use a hardwired list of extensions (erb, rjs, etc.) when searching for files. In order to facilitate working with non-standard template types, several popular extensions are featured in this list, including haml, liquid, and mab (markaby). These extensions will disappear once a related configuration option is added to rails.vim. *rails-rspec* -Support for RSpec is currently experimental and incomplete, with only a -handful of features being implemented. :A knows about specs and will jump to -them, but only if no test file is found. The associated controller or model -of a spec is detected, so all navigation commands should work as expected -inside a spec file. :Rfixtures will find spec fixtures, but the extension is -mandatory and tab completion will not work. :Rake will run the currently -edited spec. - -While there are currently no built-in dedicated RSpec navigation commands, you -can approximate your own with |:Rcommand|. +The presence of a spec directory causes several additional behaviors to +activate. :A knows about specs and will jump to them (but Test::Unit files +still get priority). The associated controller or model of a spec is +detected, so all navigation commands should work as expected inside a spec +file. :Rake in a spec runs just that spec, and in a model, controller, or +helper, runs the associated spec. + +|:Runittest| and |:Rfunctionaltest| lead double lives, handling model and +controller specs respectively. For helper and view specs, you can use +|:Rspec| or define your own navigation commands: > - Rcommand specmodel spec/models -glob=**/* - \ -suffix=_spec.rb -default=model() - Rcommand spechelper spec/helpers -glob=**/* + Rnavcommand spechelper spec/helpers -glob=**/* \ -suffix=_helper_spec.rb -default=controller() - Rcommand speccontroller spec/controllers -glob=**/* - \ -suffix=_controller_spec.rb -default=controller() - Rcommand specview spec/views -glob=**/* -suffix=_view_spec.rb + Rnavcommand specview spec/views -glob=**/* -suffix=_spec.rb < + *rails-merb* +Merb support is a long term possibility. For now, if you touch +config/environment.rb in your Merb application, rails.vim will activate. +Send feedback on what's missing to the |rails-plugin-author| and perhaps one +day Merb can be officially supported. + ============================================================================== ABBREVIATIONS *rails-abbreviations* *rails-snippets* -Abbreviations are still experimental. They may later be extracted into a +Abbreviations are "snippets lite". They may later be extracted into a separate plugin, or removed entirely. *rails-:Rabbrev* @@ -781,7 +804,7 @@ Rabbrev pa[ params pa.inspect params.inspect Rabbrev AR:: ActionRecord AR::Base ActiveRecord::Base Rabbrev :a :action\ =>\ render :a<Tab> render :action => -In short, :: expands on :, ( expands on (, and [ expands on both . and [. +In short, ( expands on (, :: expands on . and :, and [ expands on . and [. These trailing punctuation marks are NOT part of the final abbreviation, and you cannot have two mappings that differ only by punctuation. @@ -790,11 +813,11 @@ an abbreviation ending with "(", you may define where to insert the parenthesis by splitting the expansion into two parts (divided by an unescaped space). -Many abbreviations abbreviations are provided by default: use :Rabbrev to list -them. They vary depending on the type of file (models have different -abbreviations than controllers). There is one "smart" abbreviation, :c, which -expands to ":controller => ", ":collection => ", or ":conditions => " -depending on context. +Many abbreviations are provided by default: use :Rabbrev to list them. They +vary depending on the type of file (models have different abbreviations than +controllers). There is one "smart" abbreviation, :c, which expands to +":controller => ", ":collection => ", or ":conditions => " depending on +context. ============================================================================== SYNTAX HIGHLIGHTING *rails-syntax* @@ -815,7 +838,7 @@ they all link by default to railsMethod. If you feel a method has been wrongfully omitted, submit it to the |rails-plugin-author|. - *rails-@params* *rails-syntax-deprecated* + *rails-@params* *rails-syntax-deprecated* Certain deprecated syntax (like @params and render_text) is highlighted as an error. If you trigger this highlighting, generally it means you need to update your code. @@ -843,11 +866,11 @@ syntax group is used. The list of assertions can be refreshed with *rails-syntax-strings* In the following line of code, the "?" in the conditions clause and the "ASC" in the order clause will be highlighted: > - Post.find(:all, :conditions => ["body like ?","%e%"] :order => "title ASC") + Post.find(:all, :conditions => ["body like ?","%e%"], :order => "title ASC") < -A string literal using %Q<> delimiters will have its contents highlighted as -HTML. This is sometimes useful when writing helpers. > - link = %Q<<a href="http://www.vim.org">Vim</a>> +A string literal using %Q<> or %<> delimiters will have its contents +highlighted as HTML. This is sometimes useful when writing helpers. > + link = %<<a href="http://www.vim.org">Vim</a>> < *rails-syntax-yaml* YAML syntax highlighting has been extended to highlight eRuby, which can be @@ -871,7 +894,7 @@ This makes it easy to access a buried file: > :find blog_controller.rb < *rails-'suffixesadd'* *rails-'sua'* -This is filetype dependent, but typically includes .rb, .rhtml, and several +This is filetype dependent, but typically includes .rb, .rake, and several others. This allows shortening the above example: > :find blog_controller < @@ -913,7 +936,7 @@ These are based off the information shown in the 'statusline' (see |rails-'statusline'|), with hyphens changed to periods. A few examples: > autocmd User Rails.controller* iabbr <buffer> wsn wsdl_service_name autocmd User Rails.model.arb* iabbr <buffer> vfo validates_format_of - autocmd User Rails.view.rhtml* imap <buffer> <C-Z> <%= %><C-O>3h + autocmd User Rails.view.erb* imap <buffer> <C-Z> <%= %><C-O>3h End all such Rails autocommands with asterisks, even if you have an exact specification. There is also a filename matching syntax: > autocmd User Rails/db/schema.rb Rset task=db:schema:dump @@ -930,8 +953,7 @@ Rails file is loaded. *config/rails.vim* If you have settings particular to a specific project, they can be put in a config/rails.vim file in the root directory of the application. The file is -sourced in the |sandbox| for security reasons. This only works in Vim 7 or -newer. +sourced in the |sandbox| for security reasons. *rails-:Rset* :Rset {option}[={value}] @@ -939,9 +961,9 @@ newer. called directly, from an autocommand, or from config/rails.vim. -Options may be set set in one of four scopes, which my be indicated by an +Options may be set in one of four scopes, which may be indicated by an optional prefix. These scopes determine how broadly an option will apply. -Generally, the default scope is sufficient +Generally, the default scope is sufficient. Scope Description ~ a: All files in one Rails application @@ -962,11 +984,10 @@ l:preview URL stub for :Rpreview (e.g., blog/show/1) b:task Default task used with :Rake l:related Custom related file for :R, relative to the Rails root a:root_url Root URL for commands like :Rpreview -a:ruby_fork_port Experimental: use ruby_fork on given port to speed things up Examples: > :Rset root_url=http://localhost:12345 - :Rset related=app/views/blog/edit.rhtml preview=blog/edit/1 + :Rset related=app/views/blog/edit.html.erb preview=blog/edit/1 :Rset alternate=app/models/ :Rset l:task=preview " Special pseudo-task for :Rake @@ -977,12 +998,14 @@ If |g:rails_modelines| is enabled, these options can also be set from modelines near the beginning or end of the file. These modelines will always set buffer-local options; scope should never be specified. Examples: > # Rset task=db:schema:load - <%# Rset alternate=app/views/layouts/application.rhtml %> + <%# Rset alternate=app/views/layouts/application.html.erb %> Modelines can also be local to a method. Example: > def test_comment # rset alternate=app/models/comment.rb These two forms differ only in case. +Modelines are deprecated. + ============================================================================== GLOBAL SETTINGS *rails-global-settings* @@ -991,8 +1014,9 @@ can be enabled by setting them to 1 in your vimrc, and disabled by setting them to 0. > let g:rails_some_option=1 let g:rails_some_option=0 -Most of these should never need to be used. The few that might be interesting -are |g:rails_expensive|, |g:rails_subversion|, and |g:rails_default_database|. +Most of these seldom need to be used. So seldom, in fact, that you should +notify the |rails-plugin-author| if you find any of them useful, as nearly all +are being considered for removal. *g:loaded_rails* > let g:loaded_rails=1 @@ -1010,8 +1034,7 @@ like table name completion and commands like > :Create database brablog_development :Select * from posts where title like '%Denmark%' Note that dbext is a complicated plugin, and may require additional -configuration. See |dbext| (if installed) and |sql-completion-dynamic| (in -Vim 7). +configuration. See |dbext| (if installed) and |sql-completion-dynamic|. *g:rails_default_file* > let g:rails_default_file='config/database.yml' @@ -1054,8 +1077,7 @@ Modelines set buffer-local options using the :Rset command. Also enables method specific modelines (note the case difference): > def show # rset preview=blog/show/1 -Modelines are extremely useful but may cause security concerns when editing -projects from an untrusted source. Enabled by default. +Modelines are deprecated and disabled by default. *g:rails_menu* > let g:rails_menu=1 @@ -1070,14 +1092,8 @@ b:rails_url. *g:rails_statusline* > let g:rails_statusline=1 Give a clue in the statusline when this plugin is enabled. Enabled by -default. - - *g:rails_subversion* > - let g:rails_subversion=1 -Automatically add/remove files to the subversion repository for commands like -|:Rgenerate| and |:Rdestroy| (but not |:Rscript|). Ignored when the -application is not part of a subversion repository. Deprecated and disabled -by default. +default. (Does anybody care about this? Years after writing it the author is +beginning to think it is mostly a waste of space.) *g:rails_syntax* > let g:rails_syntax=1 @@ -1105,11 +1121,11 @@ The official homepage is http://rails.vim.tpope.net The latest stable version can be found at http://www.vim.org/scripts/script.php?script_id=1567 -In Vim 7, you can keep up to date with |GetLatestVimScripts|. +You can keep up to date with |GetLatestVimScripts|. The very latest development versions can be retrieved from Git: - http://git.tpope.net/?p=vim-rails.git - git clone git://git.tpope.net/git/vim-rails.git + http://github.com/tpope/vim-rails + git clone git://github.com/tpope/vim-rails.git Feedback is highly desired on this plugin. Please send all comments, complaints, and compliments to the author. No bug is too small to report. doc/rails.txt @@ -23,8 +23,10 @@ 'Tlist_Use_SingleClick' taglist.txt /*'Tlist_Use_SingleClick'* 'Tlist_WinHeight' taglist.txt /*'Tlist_WinHeight'* 'Tlist_WinWidth' taglist.txt /*'Tlist_WinWidth'* -:MatchDebug matchit.txt /*:MatchDebug* :MkVimball pi_vimball.txt /*:MkVimball* +:NERDTree NERD_tree.txt /*:NERDTree* +:NERDTreeFromBookmark NERD_tree.txt /*:NERDTreeFromBookmark* +:NERDTreeToggle NERD_tree.txt /*:NERDTreeToggle* :RmVimball pi_vimball.txt /*:RmVimball* :Snippet snippets_emu.txt /*:Snippet* :TlistAddFiles taglist.txt /*:TlistAddFiles* @@ -47,33 +49,93 @@ :VimballList pi_vimball.txt /*:VimballList* CreateBundleSnippet snippets_emu.txt /*CreateBundleSnippet* CreateSnippet snippets_emu.txt /*CreateSnippet* -MatchError matchit.txt /*MatchError* +EnhComm-Bugs EnhancedCommentify.txt /*EnhComm-Bugs* +EnhComm-Credits EnhancedCommentify.txt /*EnhComm-Credits* +EnhComm-EnhCommentify EnhancedCommentify.txt /*EnhComm-EnhCommentify* +EnhComm-Fallbacks EnhancedCommentify.txt /*EnhComm-Fallbacks* +EnhComm-Keybindings EnhancedCommentify.txt /*EnhComm-Keybindings* +EnhComm-NewLanguages EnhancedCommentify.txt /*EnhComm-NewLanguages* +EnhComm-Options EnhancedCommentify.txt /*EnhComm-Options* +EnhComm-Support EnhancedCommentify.txt /*EnhComm-Support* +EnhancedCommentify EnhancedCommentify.txt /*EnhancedCommentify* +EnhancedCommentify() EnhancedCommentify.txt /*EnhancedCommentify()* +NERDChristmasTree NERD_tree.txt /*NERDChristmasTree* +NERDTree NERD_tree.txt /*NERDTree* +NERDTree-! NERD_tree.txt /*NERDTree-!* +NERDTree-? NERD_tree.txt /*NERDTree-?* +NERDTree-B NERD_tree.txt /*NERDTree-B* +NERDTree-C NERD_tree.txt /*NERDTree-C* +NERDTree-D NERD_tree.txt /*NERDTree-D* +NERDTree-F NERD_tree.txt /*NERDTree-F* +NERDTree-H NERD_tree.txt /*NERDTree-H* +NERDTree-J NERD_tree.txt /*NERDTree-J* +NERDTree-K NERD_tree.txt /*NERDTree-K* +NERDTree-O NERD_tree.txt /*NERDTree-O* +NERDTree-P NERD_tree.txt /*NERDTree-P* +NERDTree-R NERD_tree.txt /*NERDTree-R* +NERDTree-T NERD_tree.txt /*NERDTree-T* +NERDTree-U NERD_tree.txt /*NERDTree-U* +NERDTree-X NERD_tree.txt /*NERDTree-X* +NERDTree-c-j NERD_tree.txt /*NERDTree-c-j* +NERDTree-c-k NERD_tree.txt /*NERDTree-c-k* +NERDTree-contents NERD_tree.txt /*NERDTree-contents* +NERDTree-e NERD_tree.txt /*NERDTree-e* +NERDTree-f NERD_tree.txt /*NERDTree-f* +NERDTree-go NERD_tree.txt /*NERDTree-go* +NERDTree-gtab NERD_tree.txt /*NERDTree-gtab* +NERDTree-m NERD_tree.txt /*NERDTree-m* +NERDTree-o NERD_tree.txt /*NERDTree-o* +NERDTree-p NERD_tree.txt /*NERDTree-p* +NERDTree-q NERD_tree.txt /*NERDTree-q* +NERDTree-r NERD_tree.txt /*NERDTree-r* +NERDTree-t NERD_tree.txt /*NERDTree-t* +NERDTree-tab NERD_tree.txt /*NERDTree-tab* +NERDTree-u NERD_tree.txt /*NERDTree-u* +NERDTree-x NERD_tree.txt /*NERDTree-x* +NERDTreeAuthor NERD_tree.txt /*NERDTreeAuthor* +NERDTreeAutoCenter NERD_tree.txt /*NERDTreeAutoCenter* +NERDTreeAutoCenterThreshold NERD_tree.txt /*NERDTreeAutoCenterThreshold* +NERDTreeBookmarkCommands NERD_tree.txt /*NERDTreeBookmarkCommands* +NERDTreeBookmarkTable NERD_tree.txt /*NERDTreeBookmarkTable* +NERDTreeBookmarks NERD_tree.txt /*NERDTreeBookmarks* +NERDTreeBookmarksFile NERD_tree.txt /*NERDTreeBookmarksFile* +NERDTreeCaseSensitiveSort NERD_tree.txt /*NERDTreeCaseSensitiveSort* +NERDTreeChDirMode NERD_tree.txt /*NERDTreeChDirMode* +NERDTreeChangelog NERD_tree.txt /*NERDTreeChangelog* +NERDTreeCredits NERD_tree.txt /*NERDTreeCredits* +NERDTreeFilesysMenu NERD_tree.txt /*NERDTreeFilesysMenu* +NERDTreeFunctionality NERD_tree.txt /*NERDTreeFunctionality* +NERDTreeGlobalCommands NERD_tree.txt /*NERDTreeGlobalCommands* +NERDTreeHighlightCursorline NERD_tree.txt /*NERDTreeHighlightCursorline* +NERDTreeIgnore NERD_tree.txt /*NERDTreeIgnore* +NERDTreeInvalidBookmarks NERD_tree.txt /*NERDTreeInvalidBookmarks* +NERDTreeLicense NERD_tree.txt /*NERDTreeLicense* +NERDTreeMappings NERD_tree.txt /*NERDTreeMappings* +NERDTreeMouseMode NERD_tree.txt /*NERDTreeMouseMode* +NERDTreeOptionDetails NERD_tree.txt /*NERDTreeOptionDetails* +NERDTreeOptionSummary NERD_tree.txt /*NERDTreeOptionSummary* +NERDTreeOptions NERD_tree.txt /*NERDTreeOptions* +NERDTreePublicFunctions NERD_tree.txt /*NERDTreePublicFunctions* +NERDTreeQuitOnOpen NERD_tree.txt /*NERDTreeQuitOnOpen* +NERDTreeShowBookmarks NERD_tree.txt /*NERDTreeShowBookmarks* +NERDTreeShowFiles NERD_tree.txt /*NERDTreeShowFiles* +NERDTreeShowHidden NERD_tree.txt /*NERDTreeShowHidden* +NERDTreeShowLineNumbers NERD_tree.txt /*NERDTreeShowLineNumbers* +NERDTreeSortOrder NERD_tree.txt /*NERDTreeSortOrder* +NERDTreeTodo NERD_tree.txt /*NERDTreeTodo* +NERDTreeWinPos NERD_tree.txt /*NERDTreeWinPos* +NERDTreeWinSize NERD_tree.txt /*NERDTreeWinSize* +NERD_tree.txt NERD_tree.txt /*NERD_tree.txt* Tlist_Get_Tag_Prototype_By_Line() taglist.txt /*Tlist_Get_Tag_Prototype_By_Line()* Tlist_Get_Tagname_By_Line() taglist.txt /*Tlist_Get_Tagname_By_Line()* Tlist_Set_App() taglist.txt /*Tlist_Set_App()* Tlist_Update_File_Tags() taglist.txt /*Tlist_Update_File_Tags()* Vimball-copyright pi_vimball.txt /*Vimball-copyright* -[% matchit.txt /*[%* -]% matchit.txt /*]%* -b:match_col matchit.txt /*b:match_col* -b:match_debug matchit.txt /*b:match_debug* -b:match_ignorecase matchit.txt /*b:match_ignorecase* -b:match_ini matchit.txt /*b:match_ini* -b:match_iniBR matchit.txt /*b:match_iniBR* -b:match_match matchit.txt /*b:match_match* -b:match_pat matchit.txt /*b:match_pat* -b:match_skip matchit.txt /*b:match_skip* -b:match_table matchit.txt /*b:match_table* -b:match_tail matchit.txt /*b:match_tail* -b:match_wholeBR matchit.txt /*b:match_wholeBR* -b:match_word matchit.txt /*b:match_word* -b:match_words matchit.txt /*b:match_words* basic-snippet snippets_emu.txt /*basic-snippet* config/rails.vim rails.txt /*config\/rails.vim* creating-snippets snippets_emu.txt /*creating-snippets* cs surround.txt /*cs* ds surround.txt /*ds* -g% matchit.txt /*g%* g:loaded_rails rails.txt /*g:loaded_rails* g:rails_abbreviations rails.txt /*g:rails_abbreviations* g:rails_dbext rails.txt /*g:rails_dbext* @@ -86,7 +148,6 @@ g:rails_mappings rails.txt /*g:rails_mappings* g:rails_menu rails.txt /*g:rails_menu* g:rails_modelines rails.txt /*g:rails_modelines* g:rails_statusline rails.txt /*g:rails_statusline* -g:rails_subversion rails.txt /*g:rails_subversion* g:rails_syntax rails.txt /*g:rails_syntax* g:rails_tabstop rails.txt /*g:rails_tabstop* g:rails_url rails.txt /*g:rails_url* @@ -95,36 +156,9 @@ g:vimball_mkdir pi_vimball.txt /*g:vimball_mkdir* g:vimball_path_escape pi_vimball.txt /*g:vimball_path_escape* i_CTRL-G_S surround.txt /*i_CTRL-G_S* i_CTRL-G_s surround.txt /*i_CTRL-G_s* +loaded_nerd_tree NERD_tree.txt /*loaded_nerd_tree* macros/rails.vim rails.txt /*macros\/rails.vim* -matchit matchit.txt /*matchit* -matchit-% matchit.txt /*matchit-%* -matchit-\1 matchit.txt /*matchit-\\1* -matchit-activate matchit.txt /*matchit-activate* -matchit-backref matchit.txt /*matchit-backref* -matchit-bugs matchit.txt /*matchit-bugs* -matchit-choose matchit.txt /*matchit-choose* -matchit-configure matchit.txt /*matchit-configure* -matchit-debug matchit.txt /*matchit-debug* -matchit-details matchit.txt /*matchit-details* -matchit-highlight matchit.txt /*matchit-highlight* -matchit-hl matchit.txt /*matchit-hl* -matchit-intro matchit.txt /*matchit-intro* -matchit-languages matchit.txt /*matchit-languages* -matchit-modes matchit.txt /*matchit-modes* -matchit-newlang matchit.txt /*matchit-newlang* -matchit-o_% matchit.txt /*matchit-o_%* -matchit-parse matchit.txt /*matchit-parse* -matchit-s:notend matchit.txt /*matchit-s:notend* -matchit-s:sol matchit.txt /*matchit-s:sol* -matchit-spaces matchit.txt /*matchit-spaces* -matchit-troubleshoot matchit.txt /*matchit-troubleshoot* -matchit-v_% matchit.txt /*matchit-v_%* -matchit.txt matchit.txt /*matchit.txt* -matchit.vim matchit.txt /*matchit.vim* named-tags snippets_emu.txt /*named-tags* -o_[% matchit.txt /*o_[%* -o_]% matchit.txt /*o_]%* -o_g% matchit.txt /*o_g%* pi_vimball.txt pi_vimball.txt /*pi_vimball.txt* project project.txt /*project* project-adding-mappings project.txt /*project-adding-mappings* @@ -188,12 +222,14 @@ rails-:Rdestroy rails.txt /*rails-:Rdestroy* rails-:Rdoc rails.txt /*rails-:Rdoc* rails-:Rdoc! rails.txt /*rails-:Rdoc!* rails-:Redit rails.txt /*rails-:Redit* +rails-:Renvironment rails.txt /*rails-:Renvironment* rails-:Rextract rails.txt /*rails-:Rextract* rails-:Rfind rails.txt /*rails-:Rfind* rails-:Rfixtures rails.txt /*rails-:Rfixtures* rails-:Rfunctionaltest rails.txt /*rails-:Rfunctionaltest* rails-:Rgenerate rails.txt /*rails-:Rgenerate* rails-:Rhelper rails.txt /*rails-:Rhelper* +rails-:Rinitializer rails.txt /*rails-:Rinitializer* rails-:Rintegrationtest rails.txt /*rails-:Rintegrationtest* rails-:Rinvert rails.txt /*rails-:Rinvert* rails-:Rjavascript rails.txt /*rails-:Rjavascript* @@ -203,6 +239,7 @@ rails-:Rlib rails.txt /*rails-:Rlib* rails-:Rlog rails.txt /*rails-:Rlog* rails-:Rmigration rails.txt /*rails-:Rmigration* rails-:Rmodel rails.txt /*rails-:Rmodel* +rails-:Rnavcommand rails.txt /*rails-:Rnavcommand* rails-:Robserver rails.txt /*rails-:Robserver* rails-:Rp rails.txt /*rails-:Rp* rails-:Rpartial rails.txt /*rails-:Rpartial* @@ -211,7 +248,6 @@ rails-:Rpp rails.txt /*rails-:Rpp* rails-:Rpreview rails.txt /*rails-:Rpreview* rails-:Rpreview! rails.txt /*rails-:Rpreview!* rails-:Rproject rails.txt /*rails-:Rproject* -rails-:Rproject! rails.txt /*rails-:Rproject!* rails-:Rrefresh rails.txt /*rails-:Rrefresh* rails-:Rrefresh! rails.txt /*rails-:Rrefresh!* rails-:Rrunner rails.txt /*rails-:Rrunner* @@ -219,6 +255,7 @@ rails-:Rscript rails.txt /*rails-:Rscript* rails-:Rserver rails.txt /*rails-:Rserver* rails-:Rserver! rails.txt /*rails-:Rserver!* rails-:Rset rails.txt /*rails-:Rset* +rails-:Rspec rails.txt /*rails-:Rspec* rails-:Rstylesheet rails.txt /*rails-:Rstylesheet* rails-:Rtags rails.txt /*rails-:Rtags* rails-:Rtask rails.txt /*rails-:Rtask* @@ -247,6 +284,7 @@ rails-integration rails.txt /*rails-integration* rails-introduction rails.txt /*rails-introduction* rails-license rails.txt /*rails-license* rails-menu rails.txt /*rails-menu* +rails-merb rails.txt /*rails-merb* rails-migrations rails.txt /*rails-migrations* rails-misc-navigation rails.txt /*rails-misc-navigation* rails-model-navigation rails.txt /*rails-model-navigation* @@ -322,10 +360,7 @@ taglist-session taglist.txt /*taglist-session* taglist-todo taglist.txt /*taglist-todo* taglist-using taglist.txt /*taglist-using* taglist.txt taglist.txt /*taglist.txt* -v_[% matchit.txt /*v_[%* -v_]% matchit.txt /*v_]%* -v_a% matchit.txt /*v_a%* -v_g% matchit.txt /*v_g%* +taskpaper taskpaper.txt /*taskpaper* vba pi_vimball.txt /*vba* vimball pi_vimball.txt /*vimball* vimball-contents pi_vimball.txt /*vimball-contents* doc/tags @@ -17,8 +17,8 @@ syntax on filetype indent on -set shiftwidth=4 expandtab smarttab incsearch +set shiftwidth=2 expandtab smarttab incsearch augroup railstoolkit autocmd! - autocmd FileType ruby,yaml,haml,sass set autoindent shiftwidth=2 softtabstop=2 expandtab number smarttab incsearch + autocmd FileType txt,html,ruby,yaml,haml,sass set autoindent shiftwidth=2 softtabstop=2 expandtab number smarttab incsearch augroup END macros/rails-toolkit.vim @@ -2,7 +2,7 @@ " File: NERD_tree.vim " Description: vim global plugin that provides a nice tree explorer " Maintainer: Martin Grenfell <martin_grenfell at msn dot com> -" Last Change: 20 July, 2008 +" Last Change: 27 Jan, 2009 " License: This program is free software. It comes without any warranty, " to the extent permitted by applicable law. You can redistribute " it and/or modify it under the terms of the Do What The Fuck You @@ -10,7 +10,7 @@ " See http://sam.zoy.org/wtfpl/COPYING for more details. " " ============================================================================ -let s:NERD_tree_version = '2.14.0' +let s:NERD_tree_version = '3.1.0' " SECTION: Script init stuff {{{1 "============================================================ @@ -22,6 +22,11 @@ if v:version < 700 finish endif let loaded_nerd_tree = 1 + +"for line continuation - i.e dont want C in &cpo +let s:old_cpo = &cpo +set cpo&vim + "Function: s:initVariable() function {{{2 "This function is used to initialise a given variable to a given value. The "variable is only initialised if it does not exist prior @@ -49,8 +54,9 @@ call s:initVariable("g:NERDTreeChDirMode", 0) if !exists("g:NERDTreeIgnore") let g:NERDTreeIgnore = ['\~$'] endif -call s:initVariable("g:NERDTreeHighlightCursorline", 1) call s:initVariable("g:NERDTreeBookmarksFile", expand('$HOME') . '/.NERDTreeBookmarks') +call s:initVariable("g:NERDTreeHighlightCursorline", 1) +call s:initVariable("g:NERDTreeHijackNetrw", 1) call s:initVariable("g:NERDTreeMouseMode", 1) call s:initVariable("g:NERDTreeNotificationThreshold", 100) call s:initVariable("g:NERDTreeQuitOnOpen", 0) @@ -73,6 +79,7 @@ endif "once here let s:NERDTreeSortStarIndex = index(g:NERDTreeSortOrder, '*') +call s:initVariable("g:NERDTreeStatusline", "%{b:NERDTreeRoot.path.strForOS(0)}") call s:initVariable("g:NERDTreeWinPos", "left") call s:initVariable("g:NERDTreeWinSize", 31) @@ -109,26 +116,27 @@ call s:initVariable("g:NERDTreeMapOpenExpl", "e") call s:initVariable("g:NERDTreeMapOpenInTab", "t") call s:initVariable("g:NERDTreeMapOpenInTabSilent", "T") call s:initVariable("g:NERDTreeMapOpenRecursively", "O") -call s:initVariable("g:NERDTreeMapOpenSplit", "<tab>") +call s:initVariable("g:NERDTreeMapOpenSplit", "i") +call s:initVariable("g:NERDTreeMapOpenVSplit", "s") call s:initVariable("g:NERDTreeMapPreview", "g" . NERDTreeMapActivateNode) call s:initVariable("g:NERDTreeMapPreviewSplit", "g" . NERDTreeMapOpenSplit) +call s:initVariable("g:NERDTreeMapPreviewVSplit", "g" . NERDTreeMapOpenVSplit) call s:initVariable("g:NERDTreeMapQuit", "q") call s:initVariable("g:NERDTreeMapRefresh", "r") call s:initVariable("g:NERDTreeMapRefreshRoot", "R") call s:initVariable("g:NERDTreeMapToggleBookmarks", "B") call s:initVariable("g:NERDTreeMapToggleFiles", "F") call s:initVariable("g:NERDTreeMapToggleFilters", "f") -call s:initVariable("g:NERDTreeMapToggleHidden", "H") +call s:initVariable("g:NERDTreeMapToggleHidden", "I") call s:initVariable("g:NERDTreeMapUpdir", "u") call s:initVariable("g:NERDTreeMapUpdirKeepOpen", "U") "SECTION: Script level variable declaration{{{2 let s:escape_chars = " \\`\|\"#%&,?()\*^<>" -let s:NERDTreeWinName = '_NERD_tree_' +let s:NERDTreeBufName = 'NERD_tree_' let s:tree_wid = 2 -let s:tree_markup_reg = '[ \-+~`|]' -let s:tree_markup_reg_neg = '[^ \-+~`|]' +let s:tree_markup_reg = '^[ `|]*[\-+~]' let s:tree_up_dir_line = '.. (up a dir)' let s:os_slash = '/' @@ -136,20 +144,32 @@ if s:running_windows let s:os_slash = '\' endif +"the number to add to the nerd tree buffer name to make the buf name unique +let s:next_buffer_number = 1 " SECTION: Commands {{{1 "============================================================ "init the command that users start the nerd tree with -command! -n=? -complete=dir NERDTree :call s:initNerdTree('<args>') -command! -n=? -complete=dir NERDTreeToggle :call s:toggle('<args>') -command! -n=0 NERDTreeClose :call s:closeTreeIfOpen() -command! -n=1 -complete=customlist,s:completeBookmarks NERDTreeFromBookmark call s:initNerdTree('<args>') +command! -n=? -complete=dir -bar NERDTree :call s:initNerdTree('<args>') +command! -n=? -complete=dir -bar NERDTreeToggle :call s:toggle('<args>') +command! -n=0 -bar NERDTreeClose :call s:closeTreeIfOpen() +command! -n=1 -complete=customlist,s:completeBookmarks -bar NERDTreeFromBookmark call s:initNerdTree('<args>') +command! -n=0 -complete=customlist,s:completeNERDTreeMirrors -bar NERDTreeMirror call s:initNerdTreeMirror() " SECTION: Auto commands {{{1 "============================================================ -"Save the cursor position whenever we close the nerd tree -exec "autocmd BufWinLeave *". s:NERDTreeWinName ." call <SID>saveScreenState()" -"cache bookmarks when vim loads -autocmd VimEnter * call s:Bookmark.CacheBookmarks(0) +augroup NERDTree + "Save the cursor position whenever we close the nerd tree + exec "autocmd BufWinLeave *". s:NERDTreeBufName ." call <SID>saveScreenState()" + "cache bookmarks when vim loads + autocmd VimEnter * call s:Bookmark.CacheBookmarks(0) +augroup END + +if g:NERDTreeHijackNetrw + augroup NERDTreeHijackNetrw + autocmd VimEnter * silent! autocmd! FileExplorer + au BufEnter,VimEnter * call s:checkForBrowse(expand("<amatch>")) + augroup END +endif "SECTION: Classes {{{1 "============================================================ @@ -161,7 +181,7 @@ let s:Bookmark = {} " with the same name, just update the path for that bookmark function! s:Bookmark.AddBookmark(name, path) for i in s:Bookmark.Bookmarks() - if i.name == a:name + if i.name ==# a:name let i.path = a:path return endif @@ -185,7 +205,7 @@ function! s:Bookmark.BookmarkExistsFor(name) try call s:Bookmark.BookmarkFor(a:name) return 1 - catch /NERDTree.BookmarkNotFound/ + catch /^NERDTree.BookmarkNotFoundError/ return 0 endtry endfunction @@ -194,11 +214,11 @@ endfunction " bookmark is found function! s:Bookmark.BookmarkFor(name) for i in s:Bookmark.Bookmarks() - if i.name == a:name + if i.name ==# a:name return i endif endfor - throw "NERDTree.BookmarkNotFound exception: no bookmark found for name: \"". a:name .'"' + throw "NERDTree.BookmarkNotFoundError: no bookmark found for name: \"". a:name .'"' endfunction " Function: Bookmark.BookmarkNames() {{{3 " Class method to return an array of all bookmark names @@ -232,7 +252,7 @@ function! s:Bookmark.CacheBookmarks(silent) try let bookmark = s:Bookmark.New(name, s:Path.New(path)) call add(g:NERDTreeBookmarks, bookmark) - catch /NERDTree.Path.InvalidArguments/ + catch /^NERDTree.InvalidArgumentsError/ call add(g:NERDTreeInvalidBookmarks, i) let invalidBookmarksFound += 1 endtry @@ -267,7 +287,7 @@ function! s:Bookmark.delete() let node = {} try let node = self.getNode(1) - catch /NERDTree.BookmarkedNodeNotFound/ + catch /^NERDTree.BookmarkedNodeNotFoundError/ endtry call remove(s:Bookmark.Bookmarks(), index(s:Bookmark.Bookmarks(), self)) if !empty(node) @@ -282,10 +302,10 @@ endfunction " searchFromAbsoluteRoot: specifies whether we should search from the current " tree root, or the highest cached node function! s:Bookmark.getNode(searchFromAbsoluteRoot) - let searchRoot = a:searchFromAbsoluteRoot ? s:TreeDirNode.AbsoluteTreeRoot() : t:NERDTreeRoot + let searchRoot = a:searchFromAbsoluteRoot ? s:TreeDirNode.AbsoluteTreeRoot() : b:NERDTreeRoot let targetNode = searchRoot.findNode(self.path) if empty(targetNode) - throw "NERDTree.BookmarkedNodeNotFound no node was found for bookmark: " . self.name + throw "NERDTree.BookmarkedNodeNotFoundError: no node was found for bookmark: " . self.name endif return targetNode endfunction @@ -309,7 +329,7 @@ endfunction function! s:Bookmark.mustExist() if !self.path.exists() call s:Bookmark.CacheBookmarks(1) - throw "NERDTree.BookmarkPointsToInvalidLocation exception: the bookmark \"". + throw "NERDTree.BookmarkPointsToInvalidLocationError: the bookmark \"". \ self.name ."\" points to a non existing location: \"". self.path.strForOS(0) endif endfunction @@ -317,7 +337,7 @@ endfunction " Create a new bookmark object with the given name and path object function! s:Bookmark.New(name, path) if a:name =~ ' ' - throw "NERDTree.IllegalBookmarkName illegal name:" . a:name + throw "NERDTree.IllegalBookmarkNameError: illegal name:" . a:name endif let newBookmark = copy(self) @@ -355,13 +375,13 @@ endfunction function! s:Bookmark.toRoot() if self.validate() try - let targetNode = s:Bookmark.GetNodeForName(self.name, 1) - catch /NERDTree.BookmarkedNodeNotFound/ + let targetNode = self.getNode(1) + catch /^NERDTree.BookmarkedNodeNotFoundError/ let targetNode = s:TreeFileNode.New(s:Bookmark.BookmarkFor(self.name).path) endtry call targetNode.makeRoot() call s:renderView() - call s:putCursorOnNode(targetNode, 0, 0) + call targetNode.putCursorHere(0, 0) endif endfunction " FUNCTION: Bookmark.ToRoot(name) {{{3 @@ -412,7 +432,7 @@ function! s:TreeFileNode.bookmark(name) try let oldMarkedNode = s:Bookmark.GetNodeForName(a:name, 1) call oldMarkedNode.path.cacheDisplayString() - catch /NERDTree.Bookmark$DoesntExist\|NotFound$/ + catch /^NERDTree.BookmarkNotFoundError/ endtry call s:Bookmark.AddBookmark(a:name, self.path) @@ -425,7 +445,7 @@ function! s:TreeFileNode.cacheParent() if empty(self.parent) let parentPath = self.path.getParent() if parentPath.equals(self.path) - throw "NERDTree.CannotCacheParent exception: already at root" + throw "NERDTree.CannotCacheParentError: already at root" endif let self.parent = s:TreeFileNode.New(parentPath) endif @@ -455,7 +475,7 @@ endfunction function! s:TreeFileNode.copy(dest) call self.path.copy(a:dest) let newPath = s:Path.New(a:dest) - let parent = t:NERDTreeRoot.findNode(newPath.getParent()) + let parent = b:NERDTreeRoot.findNode(newPath.getParent()) if !empty(parent) call parent.refresh() endif @@ -469,6 +489,83 @@ function! s:TreeFileNode.delete() call self.parent.removeChild(self) endfunction +"FUNCTION: TreeFileNode.renderToString {{{3 +"returns a string representation for this tree to be rendered in the view +function! s:TreeFileNode.renderToString() + return self._renderToString(0, 0, [], self.getChildCount() ==# 1) +endfunction + + +"Args: +"depth: the current depth in the tree for this call +"drawText: 1 if we should actually draw the line for this node (if 0 then the +"child nodes are rendered only) +"vertMap: a binary array that indicates whether a vertical bar should be draw +"for each depth in the tree +"isLastChild:true if this curNode is the last child of its parent +function! s:TreeFileNode._renderToString(depth, drawText, vertMap, isLastChild) + let output = "" + if a:drawText ==# 1 + + let treeParts = '' + + "get all the leading spaces and vertical tree parts for this line + if a:depth > 1 + for j in a:vertMap[0:-2] + if j ==# 1 + let treeParts = treeParts . '| ' + else + let treeParts = treeParts . ' ' + endif + endfor + endif + + "get the last vertical tree part for this line which will be different + "if this node is the last child of its parent + if a:isLastChild + let treeParts = treeParts . '`' + else + let treeParts = treeParts . '|' + endif + + + "smack the appropriate dir/file symbol on the line before the file/dir + "name itself + if self.path.isDirectory + if self.isOpen + let treeParts = treeParts . '~' + else + let treeParts = treeParts . '+' + endif + else + let treeParts = treeParts . '-' + endif + let line = treeParts . self.strDisplay() + + let output = output . line . "\n" + endif + + "if the node is an open dir, draw its children + if self.path.isDirectory ==# 1 && self.isOpen ==# 1 + + let childNodesToDraw = self.getVisibleChildren() + if len(childNodesToDraw) > 0 + + "draw all the nodes children except the last + let lastIndx = len(childNodesToDraw)-1 + if lastIndx > 0 + for i in childNodesToDraw[0:lastIndx-1] + let output = output . i._renderToString(a:depth + 1, 1, add(copy(a:vertMap), 1), 0) + endfor + endif + + "draw the last child, indicating that it IS the last + let output = output . childNodesToDraw[lastIndx]._renderToString(a:depth + 1, 1, add(copy(a:vertMap), 0), 1) + endif + endif + + return output +endfunction "FUNCTION: TreeFileNode.equals(treenode) {{{3 " "Compares this treenode to the input treenode and returns 1 if they are the @@ -480,7 +577,7 @@ endfunction "Args: "treenode: the other treenode to compare to function! s:TreeFileNode.equals(treenode) - return self.path.str(1) == a:treenode.path.str(1) + return self.path.str(1) ==# a:treenode.path.str(1) endfunction "FUNCTION: TreeFileNode.findNode(path) {{{3 @@ -495,7 +592,7 @@ function! s:TreeFileNode.findNode(path) endif return {} endfunction -"FUNCTION: TreeFileNode.findOpenDirSiblingWithChildren(direction) {{{3 +"FUNCTION: TreeFileNode.findOpenDirSiblingWithVisibleChildren(direction) {{{3 " "Finds the next sibling for this node in the indicated direction. This sibling "must be a directory and may/may not have children as specified. @@ -505,7 +602,7 @@ endfunction " "Return: "a treenode object or {} if no appropriate sibling could be found -function! s:TreeFileNode.findOpenDirSiblingWithChildren(direction) +function! s:TreeFileNode.findOpenDirSiblingWithVisibleChildren(direction) "if we have no parent then we can have no siblings if self.parent != {} let nextSibling = self.findSibling(a:direction) @@ -538,7 +635,7 @@ function! s:TreeFileNode.findSibling(direction) if siblingIndx != -1 "move a long to the next potential sibling node - let siblingIndx = a:direction == 1 ? siblingIndx+1 : siblingIndx-1 + let siblingIndx = a:direction ==# 1 ? siblingIndx+1 : siblingIndx-1 "keep moving along to the next sibling till we find one that is valid let numSiblings = self.parent.getChildCount() @@ -546,12 +643,12 @@ function! s:TreeFileNode.findSibling(direction) "if the next node is not an ignored node (i.e. wont show up in the "view) then return it - if self.parent.children[siblingIndx].path.ignore() == 0 + if self.parent.children[siblingIndx].path.ignore() ==# 0 return self.parent.children[siblingIndx] endif "go to next node - let siblingIndx = a:direction == 1 ? siblingIndx+1 : siblingIndx-1 + let siblingIndx = a:direction ==# 1 ? siblingIndx+1 : siblingIndx-1 endwhile endif endif @@ -559,38 +656,109 @@ function! s:TreeFileNode.findSibling(direction) return {} endfunction +"FUNCTION: TreeFileNode.getLineNum(){{{3 +"returns the line number this node is rendered on, or -1 if it isnt rendered +function! s:TreeFileNode.getLineNum() + "if the node is the root then return the root line no. + if self.isRoot() + return s:TreeFileNode.GetRootLineNum() + endif + + let totalLines = line("$") + + "the path components we have matched so far + let pathcomponents = [substitute(b:NERDTreeRoot.path.str(0), '/ *$', '', '')] + "the index of the component we are searching for + let curPathComponent = 1 + + let fullpath = self.path.str(0) + + + let lnum = s:TreeFileNode.GetRootLineNum() + while lnum > 0 + let lnum = lnum + 1 + "have we reached the bottom of the tree? + if lnum ==# totalLines+1 + return -1 + endif + + let curLine = getline(lnum) + + let indent = s:indentLevelFor(curLine) + if indent ==# curPathComponent + let curLine = s:stripMarkupFromLine(curLine, 1) + + let curPath = join(pathcomponents, '/') . '/' . curLine + if stridx(fullpath, curPath, 0) ==# 0 + if fullpath ==# curPath || strpart(fullpath, len(curPath)-1,1) ==# '/' + let curLine = substitute(curLine, '/ *$', '', '') + call add(pathcomponents, curLine) + let curPathComponent = curPathComponent + 1 + + if fullpath ==# curPath + return lnum + endif + endif + endif + endif + endwhile + return -1 +endfunction + +"FUNCTION: TreeFileNode.GetRootLineNum(){{{3 +"gets the line number of the root node +function! s:TreeFileNode.GetRootLineNum() + let rootLine = 1 + while getline(rootLine) !~ '^/' + let rootLine = rootLine + 1 + endwhile + return rootLine +endfunction + +"FUNCTION: TreeFileNode.GetSelected() {{{3 +"gets the treenode that the cursor is currently over +function! s:TreeFileNode.GetSelected() + try + let path = s:getPath(line(".")) + if path ==# {} + return {} + endif + return b:NERDTreeRoot.findNode(path) + catch /NERDTree/ + return {} + endtry +endfunction "FUNCTION: TreeFileNode.isVisible() {{{3 "returns 1 if this node should be visible according to the tree filters and "hidden file filters (and their on/off status) function! s:TreeFileNode.isVisible() return !self.path.ignore() endfunction - - "FUNCTION: TreeFileNode.isRoot() {{{3 -"returns 1 if this node is t:NERDTreeRoot +"returns 1 if this node is b:NERDTreeRoot function! s:TreeFileNode.isRoot() - if !s:treeExistsForTab() - throw "NERDTree.TreeFileNode.IsRoot exception: No tree exists for the current tab" + if !s:treeExistsForBuf() + throw "NERDTree.NoTreeError: No tree exists for the current buffer" endif - return self.equals(t:NERDTreeRoot) + + return self.equals(b:NERDTreeRoot) endfunction "FUNCTION: TreeFileNode.makeRoot() {{{3 "Make this node the root of the tree function! s:TreeFileNode.makeRoot() if self.path.isDirectory - let t:NERDTreeRoot = self + let b:NERDTreeRoot = self else call self.cacheParent() - let t:NERDTreeRoot = self.parent + let b:NERDTreeRoot = self.parent endif - call t:NERDTreeRoot.open() + call b:NERDTreeRoot.open() "change dir to the dir of the new root if instructed to - if g:NERDTreeChDirMode == 2 - exec "cd " . t:NERDTreeRoot.path.strForEditCmd() + if g:NERDTreeChDirMode ==# 2 + exec "cd " . b:NERDTreeRoot.path.strForEditCmd() endif endfunction "FUNCTION: TreeFileNode.New(path) {{{3 @@ -610,6 +778,157 @@ function! s:TreeFileNode.New(path) endif endfunction +"FUNCTION: TreeFileNode.open() {{{3 +"Open the file represented by the given node in the current window, splitting +"the window if needed +" +"ARGS: +"treenode: file node to open +function! s:TreeFileNode.open() + if b:NERDTreeType ==# "secondary" + exec 'edit ' . self.path.strForEditCmd() + return + endif + + "if the file is already open in this tab then just stick the cursor in it + let winnr = bufwinnr('^' . self.path.strForOS(0) . '$') + if winnr != -1 + call s:exec(winnr . "wincmd w") + + else + if !s:isWindowUsable(winnr("#")) && s:firstNormalWindow() ==# -1 + call self.openSplit() + else + try + if !s:isWindowUsable(winnr("#")) + call s:exec(s:firstNormalWindow() . "wincmd w") + else + call s:exec('wincmd p') + endif + exec ("edit " . self.path.strForEditCmd()) + catch /^Vim\%((\a\+)\)\=:E37/ + call s:putCursorInTreeWin() + throw "NERDTree.FileAlreadyOpenAndModifiedError: ". self.path.str(0) ." is already open and modified." + catch /^Vim\%((\a\+)\)\=:/ + echo v:exception + endtry + endif + endif +endfunction +"FUNCTION: TreeFileNode.openSplit() {{{3 +"Open this node in a new window +function! s:TreeFileNode.openSplit() + + if b:NERDTreeType ==# "secondary" + exec "split " . self.path.strForEditCmd() + return + endif + + " Save the user's settings for splitbelow and splitright + let savesplitbelow=&splitbelow + let savesplitright=&splitright + + " 'there' will be set to a command to move from the split window + " back to the explorer window + " + " 'back' will be set to a command to move from the explorer window + " back to the newly split window + " + " 'right' and 'below' will be set to the settings needed for + " splitbelow and splitright IF the explorer is the only window. + " + let there= g:NERDTreeWinPos ==# "left" ? "wincmd h" : "wincmd l" + let back = g:NERDTreeWinPos ==# "left" ? "wincmd l" : "wincmd h" + let right= g:NERDTreeWinPos ==# "left" + let below=0 + + " Attempt to go to adjacent window + call s:exec(back) + + let onlyOneWin = (winnr("$") ==# 1) + + " If no adjacent window, set splitright and splitbelow appropriately + if onlyOneWin + let &splitright=right + let &splitbelow=below + else + " found adjacent window - invert split direction + let &splitright=!right + let &splitbelow=!below + endif + + let splitMode = onlyOneWin ? "vertical" : "" + + " Open the new window + try + exec(splitMode." sp " . self.path.strForEditCmd()) + catch /^Vim\%((\a\+)\)\=:E37/ + call s:putCursorInTreeWin() + throw "NERDTree.FileAlreadyOpenAndModifiedError: ". self.path.str(0) ." is already open and modified." + catch /^Vim\%((\a\+)\)\=:/ + "do nothing + endtry + + "resize the tree window if no other window was open before + if onlyOneWin + let size = exists("b:NERDTreeOldWindowSize") ? b:NERDTreeOldWindowSize : g:NERDTreeWinSize + call s:exec(there) + exec("silent ". splitMode ." resize ". size) + call s:exec('wincmd p') + endif + + " Restore splitmode settings + let &splitbelow=savesplitbelow + let &splitright=savesplitright +endfunction +"FUNCTION: TreeFileNode.openVSplit() {{{3 +"Open this node in a new vertical window +function! s:TreeFileNode.openVSplit() + if b:NERDTreeType ==# "secondary" + exec "vnew " . self.path.strForEditCmd() + return + endif + + let winwidth = winwidth(".") + if winnr("$")==#1 + let winwidth = g:NERDTreeWinSize + endif + + call s:exec("wincmd p") + exec "vnew " . self.path.strForEditCmd() + + "resize the nerd tree back to the original size + call s:putCursorInTreeWin() + exec("silent vertical resize ". winwidth) + call s:exec('wincmd p') +endfunction +"FUNCTION: TreeFileNode.putCursorHere(isJump, recurseUpward){{{3 +"Places the cursor on the line number this node is rendered on +" +"Args: +"isJump: 1 if this cursor movement should be counted as a jump by vim +"recurseUpward: try to put the cursor on the parent if the this node isnt +"visible +function! s:TreeFileNode.putCursorHere(isJump, recurseUpward) + let ln = self.getLineNum() + if ln != -1 + if a:isJump + mark ' + endif + call cursor(ln, col(".")) + else + if a:recurseUpward + let node = self + while node != {} && node.getLineNum() ==# -1 + let node = node.parent + call node.open() + endwhile + call s:renderView() + call node.putCursorHere(a:isJump, 0) + endif + endif +endfunction + "FUNCTION: TreeFileNode.refresh() {{{3 function! s:TreeFileNode.refresh() call self.path.refresh() @@ -622,7 +941,7 @@ function! s:TreeFileNode.rename(newName) call self.parent.removeChild(self) let parentPath = self.path.getPathTrunk() - let newParent = t:NERDTreeRoot.findNode(parentPath) + let newParent = b:NERDTreeRoot.findNode(parentPath) if newParent != {} call newParent.createChild(self.path, 1) @@ -649,7 +968,7 @@ let s:TreeDirNode = copy(s:TreeFileNode) "FUNCTION: TreeDirNode.AbsoluteTreeRoot(){{{3 "class method that returns the highest cached ancestor of the current root function! s:TreeDirNode.AbsoluteTreeRoot() - let currentNode = t:NERDTreeRoot + let currentNode = b:NERDTreeRoot while currentNode.parent != {} let currentNode = currentNode.parent endwhile @@ -708,11 +1027,12 @@ endfunction " "Args: "path: a path object +unlet s:TreeDirNode.findNode function! s:TreeDirNode.findNode(path) if a:path.equals(self.path) return self endif - if stridx(a:path.str(1), self.path.str(1), 0) == -1 + if stridx(a:path.str(1), self.path.str(1), 0) ==# -1 return {} endif @@ -726,7 +1046,6 @@ function! s:TreeDirNode.findNode(path) endif return {} endfunction - "FUNCTION: TreeDirNode.getChildCount() {{{3 "Returns the number of children this node has function! s:TreeDirNode.getChildCount() @@ -742,12 +1061,12 @@ endfunction "Args: "path: a path object function! s:TreeDirNode.getChild(path) - if stridx(a:path.str(1), self.path.str(1), 0) == -1 + if stridx(a:path.str(1), self.path.str(1), 0) ==# -1 return {} endif let index = self.getChildIndex(a:path) - if index == -1 + if index ==# -1 return {} else return self.children[index] @@ -764,7 +1083,7 @@ endfunction function! s:TreeDirNode.getChildByIndex(indx, visible) let array_to_search = a:visible? self.getVisibleChildren() : self.children if a:indx > len(array_to_search) - throw "NERDTree.TreeDirNode.InvalidArguments exception. Index is out of bounds." + throw "NERDTree.InvalidArgumentsError: Index is out of bounds." endif return array_to_search[a:indx] endfunction @@ -778,7 +1097,7 @@ endfunction "Args: "path: a path object function! s:TreeDirNode.getChildIndex(path) - if stridx(a:path.str(1), self.path.str(1), 0) == -1 + if stridx(a:path.str(1), self.path.str(1), 0) ==# -1 return -1 endif @@ -789,9 +1108,9 @@ function! s:TreeDirNode.getChildIndex(path) let mid = (a+z)/2 let diff = a:path.compareTo(self.children[mid].path) - if diff == -1 + if diff ==# -1 let z = mid - elseif diff == 1 + elseif diff ==# 1 let a = mid+1 else return mid @@ -800,6 +1119,19 @@ function! s:TreeDirNode.getChildIndex(path) return -1 endfunction +"FUNCTION: TreeDirNode.GetSelected() {{{3 +"Returns the current node if it is a dir node, or else returns the current +"nodes parent +unlet s:TreeDirNode.GetSelected +function! s:TreeDirNode.GetSelected() + let currentDir = s:TreeFileNode.GetSelected() + if currentDir != {} && !currentDir.isRoot() + if currentDir.path.isDirectory ==# 0 + let currentDir = currentDir.parent + endif + endif + return currentDir +endfunction "FUNCTION: TreeDirNode.getVisibleChildCount() {{{3 "Returns the number of visible children this node has function! s:TreeDirNode.getVisibleChildCount() @@ -814,7 +1146,7 @@ endfunction function! s:TreeDirNode.getVisibleChildren() let toReturn = [] for i in self.children - if i.path.ignore() == 0 + if i.path.ignore() ==# 0 call add(toReturn, i) endif endfor @@ -824,7 +1156,7 @@ endfunction "FUNCTION: TreeDirNode.hasVisibleChildren() {{{3 "returns 1 if this node has any childre, 0 otherwise.. function! s:TreeDirNode.hasVisibleChildren() - return self.getChildCount() != 0 + return self.getVisibleChildCount() != 0 endfunction "FUNCTION: TreeDirNode._initChildren() {{{3 @@ -860,7 +1192,7 @@ function! s:TreeDirNode._initChildren(silent) try let path = s:Path.New(i) call self.createChild(path, 0) - catch /^NERDTree.Path.$InvalidArguments\|InvalidFiletype$/ + catch /^NERDTree.$InvalidArguments\|InvalidFiletype$Error/ let invalidFilesFound += 1 endtry endif @@ -882,9 +1214,10 @@ endfunction " "Args: "path: a path object representing the full filesystem path to the file/dir that the node represents +unlet s:TreeDirNode.New function! s:TreeDirNode.New(path) if a:path.isDirectory != 1 - throw "NERDTree.TreeDirNode.InvalidArguments exception. A TreeDirNode object must be instantiated with a directory Path object." + throw "NERDTree.InvalidArgumentsError: A TreeDirNode object must be instantiated with a directory Path object." endif let newTreeNode = copy(self) @@ -901,15 +1234,29 @@ endfunction "Reads in all this nodes children " "Return: the number of child nodes read +unlet s:TreeDirNode.open function! s:TreeDirNode.open() let self.isOpen = 1 - if self.children == [] + if self.children ==# [] return self._initChildren(0) else return 0 endif endfunction +" FUNCTION: TreeDirNode.openExplorer() {{{3 +" opens an explorer window for this node in the previous window (could be a +" nerd tree or a netrw) +function! s:TreeDirNode.openExplorer() + let oldwin = winnr() + call s:exec('wincmd p') + if oldwin ==# winnr() || (&modified && s:bufInWindows(winbufnr(winnr())) < 2) + call s:exec('wincmd p') + call self.openSplit() + else + exec ("silent edit " . self.path.strForEditCmd()) + endif +endfunction "FUNCTION: TreeDirNode.openRecursively() {{{3 "Opens this treenode and all of its children whose paths arent 'ignored' "because of the file filters. @@ -928,14 +1275,14 @@ endfunction "Args: "forceOpen: 1 if this node should be opened regardless of file filters function! s:TreeDirNode._openRecursively2(forceOpen) - if self.path.ignore() == 0 || a:forceOpen + if self.path.ignore() ==# 0 || a:forceOpen let self.isOpen = 1 - if self.children == [] + if self.children ==# [] call self._initChildren(1) endif for i in self.children - if i.path.isDirectory == 1 + if i.path.isDirectory ==# 1 call i._openRecursively2(0) endif endfor @@ -943,6 +1290,7 @@ function! s:TreeDirNode._openRecursively2(forceOpen) endfunction "FUNCTION: TreeDirNode.refresh() {{{3 +unlet s:TreeDirNode.refresh function! s:TreeDirNode.refresh() call self.path.refresh() @@ -973,7 +1321,7 @@ function! s:TreeDirNode.refresh() endif - catch /^NERDTree.InvalidArguments/ + catch /^NERDTree.InvalidArgumentsError/ let invalidFilesFound = 1 endtry endif @@ -996,7 +1344,7 @@ endfunction "Args: "treenode: the node to remove " -"Throws a NERDTree.TreeDirNode exception if the given treenode is not found +"Throws a NERDTree.ChildNotFoundError if the given treenode is not found function! s:TreeDirNode.removeChild(treenode) for i in range(0, self.getChildCount()-1) if self.children[i].equals(a:treenode) @@ -1005,7 +1353,7 @@ function! s:TreeDirNode.removeChild(treenode) endif endfor - throw "NERDTree.TreeDirNode exception: child node was not found" + throw "NERDTree.ChildNotFoundError: child node was not found" endfunction "FUNCTION: TreeDirNode.sortChildren() {{{3 @@ -1021,7 +1369,7 @@ endfunction "FUNCTION: TreeDirNode.toggleOpen() {{{3 "Opens this directory if it is closed and vice versa function! s:TreeDirNode.toggleOpen() - if self.isOpen == 1 + if self.isOpen ==# 1 call self.close() else call self.open() @@ -1048,12 +1396,28 @@ endfunction "CLASS: Path {{{2 "============================================================ let s:Path = {} +"FUNCTION: Path.AbsolutePathFor(str) {{{3 +function! s:Path.AbsolutePathFor(str) + let prependCWD = 0 + if s:running_windows + let prependCWD = a:str !~ '^.:$\\\|\/$' + else + let prependCWD = a:str !~ '^/' + endif + + let toReturn = a:str + if prependCWD + let toReturn = getcwd() . s:os_slash . a:str + endif + + return toReturn +endfunction "FUNCTION: Path.bookmarkNames() {{{3 function! s:Path.bookmarkNames() - if !exists("self.bookmarkNames") + if !exists("self._bookmarkNames") call self.cacheDisplayString() endif - return self.bookmarkNames + return self._bookmarkNames endfunction "FUNCTION: Path.cacheDisplayString() {{{3 function! s:Path.cacheDisplayString() @@ -1063,14 +1427,14 @@ function! s:Path.cacheDisplayString() let self.cachedDisplayString = self.cachedDisplayString . '*' endif - let self.bookmarkNames = [] + let self._bookmarkNames = [] for i in s:Bookmark.Bookmarks() if i.path.equals(self) - call add(self.bookmarkNames, i.name) + call add(self._bookmarkNames, i.name) endif endfor - if !empty(self.bookmarkNames) - let self.cachedDisplayString .= ' {' . join(self.bookmarkNames) . '}' + if !empty(self._bookmarkNames) + let self.cachedDisplayString .= ' {' . join(self._bookmarkNames) . '}' endif if self.isSymLink @@ -1084,7 +1448,7 @@ endfunction "FUNCTION: Path.changeToDir() {{{3 function! s:Path.changeToDir() let dir = self.strForCd() - if self.isDirectory == 0 + if self.isDirectory ==# 0 let dir = self.getPathTrunk().strForCd() endif @@ -1092,7 +1456,7 @@ function! s:Path.changeToDir() execute "cd " . dir call s:echo("CWD is now: " . getcwd()) catch - throw "NERDTree.Path.Change exception: cannot change to " . dir + throw "NERDTree.PathChangeError: cannot change CWD to " . dir endtry endfunction @@ -1111,7 +1475,7 @@ function! s:Path.compareTo(path) let thatPath = a:path.getLastPathComponent(1) "if the paths are the same then clearly we return 0 - if thisPath == thatPath + if thisPath ==# thatPath return 0 endif @@ -1149,7 +1513,7 @@ endfunction function! s:Path.Create(fullpath) "bail if the a:fullpath already exists if isdirectory(a:fullpath) || filereadable(a:fullpath) - throw "NERDTree.Path.Exists Exception: Directory Exists: '" . a:fullpath . "'" + throw "NERDTree.CreatePathError: Directory Exists: '" . a:fullpath . "'" endif try @@ -1165,8 +1529,8 @@ function! s:Path.Create(fullpath) else call writefile([], a:fullpath) endif - catch /.*/ - throw "NERDTree.Path Exception: Could not create path: '" . a:fullpath . "'" + catch + throw "NERDTree.CreatePathError: Could not create path: '" . a:fullpath . "'" endtry return s:Path.New(a:fullpath) @@ -1180,7 +1544,7 @@ endfunction "dest: the location to copy this dir/file to function! s:Path.copy(dest) if !s:Path.CopyingSupported() - throw "NERDTree.Path.CopyingNotSupported Exception: Copying is not supported on this OS" + throw "NERDTree.CopyingNotSupportedError: Copying is not supported on this OS" endif let dest = s:Path.WinToUnixPath(a:dest) @@ -1188,7 +1552,7 @@ function! s:Path.copy(dest) let cmd = g:NERDTreeCopyCmd . " " . self.strForOS(0) . " " . dest let success = system(cmd) if success != 0 - throw "NERDTree.Path Exception: Could not copy ''". self.strForOS(0) ."'' to: '" . a:dest . "'" + throw "NERDTree.CopyError: Could not copy ''". self.strForOS(0) ."'' to: '" . a:dest . "'" endif endfunction @@ -1239,12 +1603,12 @@ function! s:Path.delete() let success = system(cmd) if v:shell_error != 0 - throw "NERDTree.Path.Deletion Exception: Could not delete directory: '" . self.strForOS(0) . "'" + throw "NERDTree.PathDeletionError: Could not delete directory: '" . self.strForOS(0) . "'" endif else let success = delete(self.strForOS(0)) if success != 0 - throw "NERDTree.Path.Deletion Exception: Could not delete file: '" . self.str(0) . "'" + throw "NERDTree.PathDeletionError: Could not delete file: '" . self.str(0) . "'" endif endif @@ -1337,7 +1701,7 @@ function! s:Path.ignore() let lastPathComponent = self.getLastPathComponent(0) "filter out the user specified paths to ignore - if t:NERDTreeIgnoreEnabled + if b:NERDTreeIgnoreEnabled for i in g:NERDTreeIgnore if lastPathComponent =~ i return 1 @@ -1346,11 +1710,11 @@ function! s:Path.ignore() endif "dont show hidden files unless instructed to - if t:NERDTreeShowHidden == 0 && lastPathComponent =~ '^\.' + if b:NERDTreeShowHidden ==# 0 && lastPathComponent =~ '^\.' return 1 endif - if t:NERDTreeShowFiles == 0 && self.isDirectory == 0 + if b:NERDTreeShowFiles ==# 0 && self.isDirectory ==# 0 return 1 endif @@ -1374,17 +1738,15 @@ endfunction "Args: "path: the other path obj to compare this with function! s:Path.equals(path) - return self.str(0) == a:path.str(0) + return self.str(0) ==# a:path.str(0) endfunction "FUNCTION: Path.New() {{{3 -" "The Constructor for the Path object -"Throws NERDTree.Path.InvalidArguments exception. -function! s:Path.New(fullpath) +function! s:Path.New(path) let newPath = copy(self) - call newPath.readInfoFromDisk(a:fullpath) + call newPath.readInfoFromDisk(s:Path.AbsolutePathFor(a:path)) let newPath.cachedDisplayString = "" @@ -1400,21 +1762,20 @@ function! s:Path.readInfoFromDisk(fullpath) let fullpath = s:Path.WinToUnixPath(a:fullpath) - if getftype(fullpath) == "fifo" - throw "NERDTree.Path.InvalidFiletype Exception: Cant handle FIFO files: " . a:fullpath + if getftype(fullpath) ==# "fifo" + throw "NERDTree.InvalidFiletypeError: Cant handle FIFO files: " . a:fullpath endif let self.pathSegments = split(fullpath, '/') - let self.isReadOnly = 0 if isdirectory(a:fullpath) let self.isDirectory = 1 elseif filereadable(a:fullpath) let self.isDirectory = 0 - let self.isReadOnly = filewritable(a:fullpath) == 0 + let self.isReadOnly = filewritable(a:fullpath) ==# 0 else - throw "NERDTree.Path.InvalidArguments Exception: Invalid path = " . a:fullpath + throw "NERDTree.InvalidArgumentsError: Invalid path = " . a:fullpath endif let self.isExecutable = 0 @@ -1456,13 +1817,13 @@ endfunction " "Renames this node on the filesystem function! s:Path.rename(newPath) - if a:newPath == '' - throw "NERDTree.Path.InvalidArguments exception. Invalid newPath for renaming = ". a:newPath + if a:newPath ==# '' + throw "NERDTree.InvalidArgumentsError: Invalid newPath for renaming = ". a:newPath endif let success = rename(self.strForOS(0), a:newPath) if success != 0 - throw "NERDTree.Path.Rename Exception: Could not rename: '" . self.strForOS(0) . "'" . 'to:' . a:newPath + throw "NERDTree.PathRenameError: Could not rename: '" . self.strForOS(0) . "'" . 'to:' . a:newPath endif call self.readInfoFromDisk(a:newPath) @@ -1522,7 +1883,7 @@ endfunction "Return: "a string that can be used in the view to represent this path function! s:Path.strDisplay() - if self.cachedDisplayString == "" + if self.cachedDisplayString ==# "" call self.cacheDisplayString() endif @@ -1534,12 +1895,27 @@ endfunction "Return: the string for this path that is suitable to be used with the :edit "command function! s:Path.strForEditCmd() + let p = self.str(1) + let cwd = getcwd() + if s:running_windows - return self.strForOS(0) - else - return self.str(1) + let p = tolower(self.strForOS(0)) + let cwd = tolower(getcwd()) endif + let cwd = cwd . s:os_slash + + "return a relative path if we can + if stridx(p, cwd) ==# 0 + let p = strpart(p, strlen(cwd)) + endif + + if p ==# '' + let p = '.' + endif + + return p + endfunction "FUNCTION: Path.strForGlob() {{{3 function! s:Path.strForGlob() @@ -1632,7 +2008,7 @@ function! s:bufInWindows(bnum) if bufnum < 0 break endif - if bufnum == a:bnum + if bufnum ==# a:bnum let cnt = cnt + 1 endif let winnum = winnum + 1 @@ -1640,7 +2016,13 @@ function! s:bufInWindows(bnum) return cnt endfunction " >>> - +"FUNCTION: s:checkForBrowse(dir) {{{2 +"inits a secondary nerd tree in the current buffer if appropriate +function! s:checkForBrowse(dir) + if a:dir != '' && isdirectory(a:dir) + call s:initNerdTreeInPlace(a:dir) + endif +endfunction "FUNCTION: s:compareBookmarks(first, second) {{{2 "Compares two bookmarks function! s:compareBookmarks(first, second) @@ -1652,6 +2034,14 @@ endfunction function! s:completeBookmarks(A,L,P) return filter(s:Bookmark.BookmarkNames(), 'v:val =~ "^' . a:A . '"') endfunction +" FUNCTION: s:exec(cmd) {{{2 +" same as :exec cmd but eventignore=all is set for the duration +function! s:exec(cmd) + let old_ei = &ei + set ei=all + exec a:cmd + let &ei = old_ei +endfunction "FUNCTION: s:initNerdTree(name) {{{2 "Initialise the nerd tree for this tab. The tree will start in either the "given directory, or the directory associated with the given bookmark @@ -1663,11 +2053,17 @@ function! s:initNerdTree(name) if s:Bookmark.BookmarkExistsFor(a:name) let path = s:Bookmark.BookmarkFor(a:name).path else - let dir = a:name == '' ? expand('%:p:h') : a:name + let dir = a:name ==# '' ? getcwd() : a:name + + "hack to get an absolute path if a relative path is given + if dir =~ '^\.' + let dir = getcwd() . s:os_slash . dir + endif let dir = resolve(dir) + try let path = s:Path.New(dir) - catch /NERDTree.Path.InvalidArguments/ + catch /^NERDTree.InvalidArgumentsError/ call s:echo("No bookmark or directory found for: " . a:name) return endtry @@ -1682,30 +2078,189 @@ function! s:initNerdTree(name) exec 'cd ' . path.strForCd() endif - let t:treeShowHelp = 0 - let t:NERDTreeIgnoreEnabled = 1 - let t:NERDTreeShowFiles = g:NERDTreeShowFiles - let t:NERDTreeShowHidden = g:NERDTreeShowHidden - let t:NERDTreeShowBookmarks = g:NERDTreeShowBookmarks - if s:treeExistsForTab() if s:isTreeOpen() call s:closeTree() endif - unlet t:NERDTreeRoot + unlet t:NERDTreeBufName endif - let t:NERDTreeRoot = s:TreeDirNode.New(path) - call t:NERDTreeRoot.open() + let newRoot = s:TreeDirNode.New(path) + call newRoot.open() call s:createTreeWin() + let b:treeShowHelp = 0 + let b:NERDTreeIgnoreEnabled = 1 + let b:NERDTreeShowFiles = g:NERDTreeShowFiles + let b:NERDTreeShowHidden = g:NERDTreeShowHidden + let b:NERDTreeShowBookmarks = g:NERDTreeShowBookmarks + let b:NERDTreeRoot = newRoot + + let b:NERDTreeType = "primary" + + call s:renderView() + call b:NERDTreeRoot.putCursorHere(0, 0) +endfunction + +"FUNCTION: s:initNerdTreeInPlace(dir) {{{2 +function! s:initNerdTreeInPlace(dir) + try + let path = s:Path.New(a:dir) + catch /^NERDTree.InvalidArgumentsError/ + call s:echo("Invalid directory name:" . a:name) + return + endtry + + "we want the directory buffer to disappear when we do the :edit below + setlocal bufhidden=wipe + + let previousBuf = expand("#") + + "we need a unique name for each secondary tree buffer to ensure they are + "all independent + exec "silent edit " . s:nextBufferName() + + let b:NERDTreePreviousBuf = bufnr(previousBuf) + + let b:NERDTreeRoot = s:TreeDirNode.New(path) + call b:NERDTreeRoot.open() + + "throwaway buffer options + setlocal noswapfile + setlocal buftype=nofile + setlocal bufhidden=hide + setlocal nowrap + setlocal foldcolumn=0 + setlocal nobuflisted + setlocal nospell + if g:NERDTreeShowLineNumbers + setlocal nu + else + setlocal nonu + endif + + iabc <buffer> + + if g:NERDTreeHighlightCursorline + setlocal cursorline + endif + + call s:setupStatusline() + + let b:treeShowHelp = 0 + let b:NERDTreeIgnoreEnabled = 1 + let b:NERDTreeShowFiles = g:NERDTreeShowFiles + let b:NERDTreeShowHidden = g:NERDTreeShowHidden + let b:NERDTreeShowBookmarks = g:NERDTreeShowBookmarks + + let b:NERDTreeType = "secondary" + + call s:bindMappings() + setfiletype nerdtree + " syntax highlighting + if has("syntax") && exists("g:syntax_on") && !has("syntax_items") + call s:setupSyntaxHighlighting() + endif + call s:renderView() - call s:putCursorOnNode(t:NERDTreeRoot, 0, 0) +endfunction +" FUNCTION: s:initNerdTreeMirror() {{{2 +function! s:initNerdTreeMirror() + + "get the names off all the nerd tree buffers + let treeBufNames = [] + for i in range(1, tabpagenr("$")) + let nextName = s:tabpagevar(i, 'NERDTreeBufName') + if nextName != -1 && (!exists("t:NERDTreeBufName") || nextName != t:NERDTreeBufName) + call add(treeBufNames, nextName) + endif + endfor + let treeBufNames = s:unique(treeBufNames) + + "map the option names (that the user will be prompted with) to the nerd + "tree buffer names + let options = {} + let i = 0 + while i < len(treeBufNames) + let bufName = treeBufNames[i] + let treeRoot = getbufvar(bufName, "NERDTreeRoot") + let options[i+1 . '. ' . treeRoot.path.strForOS(0) . ' (buf name: ' . bufName . ')'] = bufName + let i = i + 1 + endwhile + + "work out which tree to mirror, if there is more than 1 then ask the user + let bufferName = '' + if len(keys(options)) > 1 + let choices = ["Choose a tree to mirror"] + let choices = extend(choices, sort(keys(options))) + let choice = inputlist(choices) + if choice < 1 || choice > len(options) || choice ==# '' + return + endif + + let bufferName = options[keys(options)[choice-1]] + elseif len(keys(options)) ==# 1 + let bufferName = values(options)[0] + else + call s:echo("No trees to mirror") + return + endif + + if s:treeExistsForTab() && s:isTreeOpen() + call s:closeTree() + endif + + let t:NERDTreeBufName = bufferName + call s:createTreeWin() + exec 'buffer ' . bufferName + if !&hidden + call s:renderView() + endif +endfunction +" FUNCTION: s:nextBufferName() {{{2 +" returns the buffer name for the next nerd tree +function! s:nextBufferName() + let name = s:NERDTreeBufName . s:next_buffer_number + let s:next_buffer_number += 1 + return name +endfunction +" FUNCTION: s:tabpagevar(tabnr, var) {{{2 +function! s:tabpagevar(tabnr, var) + let currentTab = tabpagenr() + let old_ei = &ei + set ei=all + + exec "tabnext " . a:tabnr + let v = -1 + if exists('t:' . a:var) + exec 'let v = t:' . a:var + endif + exec "tabnext " . currentTab + + let &ei = old_ei + + return v +endfunction +" Function: s:treeExistsForBuffer() {{{2 +" Returns 1 if a nerd tree root exists in the current buffer +function! s:treeExistsForBuf() + return exists("b:NERDTreeRoot") endfunction " Function: s:treeExistsForTab() {{{2 " Returns 1 if a nerd tree root exists in the current tab function! s:treeExistsForTab() - return exists("t:NERDTreeRoot") + return exists("t:NERDTreeBufName") +endfunction +" Function: s:unique(list) {{{2 +" returns a:list without duplicates +function! s:unique(list) + let uniqlist = [] + for elem in a:list + if index(uniqlist, elem) ==# -1 + let uniqlist += [elem] + endif + endfor + return uniqlist endfunction " SECTION: Public Functions {{{1 "============================================================ @@ -1719,7 +2274,7 @@ endfunction "If the cursor is not on a node then an empty dictionary {} is returned. function! NERDTreeGetCurrentNode() if !s:treeExistsForTab() || !s:isTreeOpen() - throw "NERDTree.NoTreeForTab exception: there is no NERD tree open for the current tab" + throw "NERDTree.NoTreeForTabError: there is no NERD tree open for the current tab" endif let winnr = winnr() @@ -1727,10 +2282,10 @@ function! NERDTreeGetCurrentNode() call s:putCursorInTreeWin() endif - let treenode = s:getSelectedNode() + let treenode = s:TreeFileNode.GetSelected() if winnr != winnr() - wincmd w + call s:exec('wincmd w') endif return treenode @@ -1767,13 +2322,13 @@ endfunction "Closes the NERD tree window function! s:closeTree() if !s:isTreeOpen() - throw "NERDTree.view.closeTree exception: no NERDTree is open" + throw "NERDTree.NoTreeFoundError: no NERDTree is open" endif if winnr("$") != 1 - execute s:getTreeWinNum() . " wincmd w" + call s:exec(s:getTreeWinNum() . " wincmd w") close - execute "wincmd p" + call s:exec("wincmd p") else :q endif @@ -1798,19 +2353,22 @@ endfunction "options etc function! s:createTreeWin() "create the nerd tree window - let splitLocation = (g:NERDTreeWinPos == "top" || g:NERDTreeWinPos == "left") ? "topleft " : "botright " - let splitMode = s:shouldSplitVertically() ? "vertical " : "" + let splitLocation = g:NERDTreeWinPos ==# "left" ? "topleft " : "botright " let splitSize = g:NERDTreeWinSize - let t:NERDTreeWinName = localtime() . s:NERDTreeWinName - let cmd = splitLocation . splitMode . splitSize . ' new ' . t:NERDTreeWinName - silent! execute cmd + silent! exec splitLocation . 'vertical ' . splitSize . ' new' + + if !exists('t:NERDTreeBufName') + let t:NERDTreeBufName = s:nextBufferName() + silent! exec "edit " . t:NERDTreeBufName + else + silent! exec "buffer " . t:NERDTreeBufName + endif setlocal winfixwidth "throwaway buffer options setlocal noswapfile setlocal buftype=nofile - setlocal bufhidden=delete setlocal nowrap setlocal foldcolumn=0 setlocal nobuflisted @@ -1827,10 +2385,7 @@ function! s:createTreeWin() setlocal cursorline endif - - " for line continuation - let cpo_save1 = &cpo - set cpo&vim + call s:setupStatusline() call s:bindMappings() setfiletype nerdtree @@ -1840,109 +2395,42 @@ function! s:createTreeWin() endif endfunction -"FUNCTION: s:drawTree {{{2 -"Draws the given node recursively -" -"Args: -"curNode: the node that is being rendered with this call -"depth: the current depth in the tree for this call -"drawText: 1 if we should actually draw the line for this node (if 0 then the -"child nodes are rendered only) -"vertMap: a binary array that indicates whether a vertical bar should be draw -"for each depth in the tree -"isLastChild:true if this curNode is the last child of its parent -function! s:drawTree(curNode, depth, drawText, vertMap, isLastChild) - if a:drawText == 1 - - let treeParts = '' - - "get all the leading spaces and vertical tree parts for this line - if a:depth > 1 - for j in a:vertMap[0:-2] - if j == 1 - let treeParts = treeParts . '| ' - else - let treeParts = treeParts . ' ' - endif - endfor - endif - - "get the last vertical tree part for this line which will be different - "if this node is the last child of its parent - if a:isLastChild - let treeParts = treeParts . '`' - else - let treeParts = treeParts . '|' - endif - - - "smack the appropriate dir/file symbol on the line before the file/dir - "name itself - if a:curNode.path.isDirectory - if a:curNode.isOpen - let treeParts = treeParts . '~' - else - let treeParts = treeParts . '+' - endif - else - let treeParts = treeParts . '-' - endif - let line = treeParts . a:curNode.strDisplay() - - call setline(line(".")+1, line) - call cursor(line(".")+1, col(".")) - endif - - "if the node is an open dir, draw its children - if a:curNode.path.isDirectory == 1 && a:curNode.isOpen == 1 - - let childNodesToDraw = a:curNode.getVisibleChildren() - if len(childNodesToDraw) > 0 - - "draw all the nodes children except the last - let lastIndx = len(childNodesToDraw)-1 - if lastIndx > 0 - for i in childNodesToDraw[0:lastIndx-1] - call s:drawTree(i, a:depth + 1, 1, add(copy(a:vertMap), 1), 0) - endfor - endif - - "draw the last child, indicating that it IS the last - call s:drawTree(childNodesToDraw[lastIndx], a:depth + 1, 1, add(copy(a:vertMap), 0), 1) - endif - endif -endfunction - - "FUNCTION: s:dumpHelp {{{2 "prints out the quick help function! s:dumpHelp() let old_h = @h - if t:treeShowHelp == 1 + if b:treeShowHelp ==# 1 let @h= "\" NERD tree (" . s:NERD_tree_version . ") quickhelp~\n" let @h=@h."\" ============================\n" let @h=@h."\" File node mappings~\n" - let @h=@h."\" ". (g:NERDTreeMouseMode == 3 ? "single" : "double") ."-click,\n" - let @h=@h."\" ". g:NERDTreeMapActivateNode .": open in prev window\n" - let @h=@h."\" ". g:NERDTreeMapPreview .": preview\n" + let @h=@h."\" ". (g:NERDTreeMouseMode ==# 3 ? "single" : "double") ."-click,\n" + if b:NERDTreeType ==# "primary" + let @h=@h."\" ". g:NERDTreeMapActivateNode .": open in prev window\n" + else + let @h=@h."\" ". g:NERDTreeMapActivateNode .": open in current window\n" + endif + if b:NERDTreeType ==# "primary" + let @h=@h."\" ". g:NERDTreeMapPreview .": preview\n" + endif let @h=@h."\" ". g:NERDTreeMapOpenInTab.": open in new tab\n" let @h=@h."\" ". g:NERDTreeMapOpenInTabSilent .": open in new tab silently\n" let @h=@h."\" middle-click,\n" let @h=@h."\" ". g:NERDTreeMapOpenSplit .": open split\n" let @h=@h."\" ". g:NERDTreeMapPreviewSplit .": preview split\n" + let @h=@h."\" ". g:NERDTreeMapOpenVSplit .": open vsplit\n" + let @h=@h."\" ". g:NERDTreeMapPreviewVSplit .": preview vsplit\n" let @h=@h."\" ". g:NERDTreeMapExecute.": Execute file\n" let @h=@h."\"\n\" ----------------------------\n" let @h=@h."\" Directory node mappings~\n" - let @h=@h."\" ". (g:NERDTreeMouseMode == 1 ? "double" : "single") ."-click,\n" + let @h=@h."\" ". (g:NERDTreeMouseMode ==# 1 ? "double" : "single") ."-click,\n" let @h=@h."\" ". g:NERDTreeMapActivateNode .": open & close node\n" let @h=@h."\" ". g:NERDTreeMapOpenRecursively .": recursively open node\n" let @h=@h."\" ". g:NERDTreeMapCloseDir .": close parent of node\n" let @h=@h."\" ". g:NERDTreeMapCloseChildren .": close all child nodes of\n" let @h=@h."\" current node recursively\n" let @h=@h."\" middle-click,\n" - let @h=@h."\" ". g:NERDTreeMapOpenExpl.": Open netrw for selected\n" - let @h=@h."\" node\n" + let @h=@h."\" ". g:NERDTreeMapOpenExpl.": explore selected dir\n" let @h=@h."\"\n\" ----------------------------\n" let @h=@h."\" Bookmark table mappings~\n" @@ -1976,10 +2464,10 @@ function! s:dumpHelp() let @h=@h."\"\n\" ----------------------------\n" let @h=@h."\" Tree filtering mappings~\n" - let @h=@h."\" ". g:NERDTreeMapToggleHidden .": hidden files (" . (t:NERDTreeShowHidden ? "on" : "off") . ")\n" - let @h=@h."\" ". g:NERDTreeMapToggleFilters .": file filters (" . (t:NERDTreeIgnoreEnabled ? "on" : "off") . ")\n" - let @h=@h."\" ". g:NERDTreeMapToggleFiles .": files (" . (t:NERDTreeShowFiles ? "on" : "off") . ")\n" - let @h=@h."\" ". g:NERDTreeMapToggleBookmarks .": bookmarks (" . (t:NERDTreeShowBookmarks ? "on" : "off") . ")\n" + let @h=@h."\" ". g:NERDTreeMapToggleHidden .": hidden files (" . (b:NERDTreeShowHidden ? "on" : "off") . ")\n" + let @h=@h."\" ". g:NERDTreeMapToggleFilters .": file filters (" . (b:NERDTreeIgnoreEnabled ? "on" : "off") . ")\n" + let @h=@h."\" ". g:NERDTreeMapToggleFiles .": files (" . (b:NERDTreeShowFiles ? "on" : "off") . ")\n" + let @h=@h."\" ". g:NERDTreeMapToggleBookmarks .": bookmarks (" . (b:NERDTreeShowBookmarks ? "on" : "off") . ")\n" let @h=@h."\"\n\" ----------------------------\n" let @h=@h."\" Other mappings~\n" @@ -2028,68 +2516,21 @@ function! s:echoError(msg) call s:echo(a:msg) echohl normal endfunction -"FUNCTION: s:findNodeLineNumber(treenode){{{2 -"Finds the line number for the given tree node -" -"Args: -"treenode: the node to find the line no. for -function! s:findNodeLineNumber(treenode) - "if the node is the root then return the root line no. - if a:treenode.isRoot() - return s:findRootNodeLineNumber() - endif - - let totalLines = line("$") - - "the path components we have matched so far - let pathcomponents = [substitute(t:NERDTreeRoot.path.str(0), '/ *$', '', '')] - "the index of the component we are searching for - let curPathComponent = 1 - - let fullpath = a:treenode.path.str(0) - - - let lnum = s:findRootNodeLineNumber() - while lnum > 0 - let lnum = lnum + 1 - "have we reached the bottom of the tree? - if lnum == totalLines+1 - return -1 +"FUNCTION: s:firstNormalWindow(){{{2 +"find the window number of the first normal window +function! s:firstNormalWindow() + let i = 1 + while i <= winnr("$") + let bnum = winbufnr(i) + if bnum != -1 && getbufvar(bnum, '&buftype') ==# '' + \ && !getwinvar(i, '&previewwindow') + return i endif - let curLine = getline(lnum) - - let indent = match(curLine,s:tree_markup_reg_neg) / s:tree_wid - if indent == curPathComponent - let curLine = s:stripMarkupFromLine(curLine, 1) - - let curPath = join(pathcomponents, '/') . '/' . curLine - if stridx(fullpath, curPath, 0) == 0 - if fullpath == curPath || strpart(fullpath, len(curPath)-1,1) == '/' - let curLine = substitute(curLine, '/ *$', '', '') - call add(pathcomponents, curLine) - let curPathComponent = curPathComponent + 1 - - if fullpath == curPath - return lnum - endif - endif - endif - endif + let i += 1 endwhile return -1 endfunction - -"FUNCTION: s:findRootNodeLineNumber(){{{2 -"Finds the line number of the root node -function! s:findRootNodeLineNumber() - let rootLine = 1 - while getline(rootLine) !~ '^/' - let rootLine = rootLine + 1 - endwhile - return rootLine -endfunction - "FUNCTION: s:getPath(ln) {{{2 "Gets the full path to the node that is rendered on the given line number " @@ -2105,7 +2546,7 @@ function! s:getPath(ln) "check to see if we have the root node if line =~ '^\/' - return t:NERDTreeRoot.path + return b:NERDTreeRoot.path endif " in case called from outside the tree @@ -2113,13 +2554,11 @@ function! s:getPath(ln) return {} endif - if line == s:tree_up_dir_line - return t:NERDTreeRoot.path.getParent() + if line ==# s:tree_up_dir_line + return b:NERDTreeRoot.path.getParent() endif - "get the indent level for the file (i.e. how deep in the tree it is) - let indent = match(line, s:tree_markup_reg_neg) / s:tree_wid - + let indent = s:indentLevelFor(line) "remove the tree parts and the leading space let curFile = s:stripMarkupFromLine(line, 0) @@ -2144,7 +2583,7 @@ function! s:getPath(ln) break endif if curLineStripped =~ '/$' - let lpindent = match(curLine,s:tree_markup_reg_neg) / s:tree_wid + let lpindent = s:indentLevelFor(curLine) if lpindent < indent let indent = indent - 1 @@ -2153,7 +2592,7 @@ function! s:getPath(ln) endif endif endwhile - let curFile = t:NERDTreeRoot.path.drive . dir . curFile + let curFile = b:NERDTreeRoot.path.drive . dir . curFile let toReturn = s:Path.New(curFile) return toReturn endfunction @@ -2166,59 +2605,67 @@ function! s:getSelectedBookmark() if name != line try return s:Bookmark.BookmarkFor(name) - catch /NERDTree.BookmarkNotFound/ + catch /^NERDTree.BookmarkNotFoundError/ return {} endtry endif return {} endfunction -"FUNCTION: s:getSelectedDir() {{{2 -"Returns the current node if it is a dir node, or else returns the current -"nodes parent -function! s:getSelectedDir() - let currentDir = s:getSelectedNode() - if currentDir != {} && !currentDir.isRoot() - if currentDir.path.isDirectory == 0 - let currentDir = currentDir.parent - endif - endif - return currentDir -endfunction -"FUNCTION: s:getSelectedNode() {{{2 -"gets the treenode that the cursor is currently over -function! s:getSelectedNode() - try - let path = s:getPath(line(".")) - if path == {} - return {} - endif - return t:NERDTreeRoot.findNode(path) - catch /^NERDTree/ - return {} - endtry -endfunction "FUNCTION: s:getTreeWinNum() {{{2 "gets the nerd tree window number for this tab function! s:getTreeWinNum() - if exists("t:NERDTreeWinName") - return bufwinnr(t:NERDTreeWinName) + if exists("t:NERDTreeBufName") + return bufwinnr(t:NERDTreeBufName) else return -1 endif endfunction - +"FUNCTION: s:indentLevelFor(line) {{{2 +function! s:indentLevelFor(line) + return match(a:line, '[^ \-+~`|]') / s:tree_wid +endfunction "FUNCTION: s:isTreeOpen() {{{2 function! s:isTreeOpen() return s:getTreeWinNum() != -1 endfunction +"FUNCTION: s:isWindowUsable(winnumber) {{{2 +"Returns 1 if opening a file from the tree in the given window requires it to +"be split +" +"Args: +"winnumber: the number of the window in question +function! s:isWindowUsable(winnumber) + "gotta split if theres only one window (i.e. the NERD tree) + if winnr("$") ==# 1 + return 0 + endif + + let oldwinnr = winnr() + call s:exec(a:winnumber . "wincmd p") + let specialWindow = getbufvar("%", '&buftype') != '' || getwinvar('%', '&previewwindow') + let modified = &modified + call s:exec(oldwinnr . "wincmd p") + + "if its a special window e.g. quickfix or another explorer plugin then we + "have to split + if specialWindow + return 0 + endif + + if &hidden + return 1 + endif + + return !modified || s:bufInWindows(winbufnr(a:winnumber)) >= 2 +endfunction " FUNCTION: s:jumpToChild(direction) {{{2 " Args: " direction: 0 if going to first child, 1 if going to last function! s:jumpToChild(direction) - let currentNode = s:getSelectedNode() - if currentNode == {} || currentNode.isRoot() + let currentNode = s:TreeFileNode.GetSelected() + if currentNode ==# {} || currentNode.isRoot() call s:echo("cannot jump to " . (a:direction ? "last" : "first") . " child") return end @@ -2231,172 +2678,19 @@ function! s:jumpToChild(direction) endif if targetNode.equals(currentNode) - let siblingDir = currentNode.parent.findOpenDirSiblingWithChildren(a:direction) + let siblingDir = currentNode.parent.findOpenDirSiblingWithVisibleChildren(a:direction) if siblingDir != {} let indx = a:direction ? siblingDir.getVisibleChildCount()-1 : 0 let targetNode = siblingDir.getChildByIndex(indx, 1) endif endif - call s:putCursorOnNode(targetNode, 1, 0) + call targetNode.putCursorHere(1, 0) call s:centerView() endfunction -"FUNCTION: s:openDirNodeSplit(treenode) {{{2 -"Open the file represented by the given node in a new window. -"No action is taken for file nodes -" -"ARGS: -"treenode: file node to open -function! s:openDirNodeSplit(treenode) - if a:treenode.path.isDirectory == 1 - call s:openNodeSplit(a:treenode) - endif -endfunction - -" FUNCTION: s:openExplorerFor(treenode) {{{2 -" opens a netrw window for the given dir treenode -function! s:openExplorerFor(treenode) - let oldwin = winnr() - wincmd p - if oldwin == winnr() || (&modified && s:bufInWindows(winbufnr(winnr())) < 2) - wincmd p - call s:openDirNodeSplit(a:treenode) - else - exec ("silent edit " . a:treenode.path.strForEditCmd()) - endif -endfunction -"FUNCTION: s:openFileNode(treenode) {{{2 -"Open the file represented by the given node in the current window, splitting -"the window if needed -" -"ARGS: -"treenode: file node to open -function! s:openFileNode(treenode) - call s:putCursorInTreeWin() - - "if the file is already open in this tab then just stick the cursor in it - let winnr = bufwinnr('^' . a:treenode.path.strForOS(0) . '$') - if winnr != -1 - exec winnr . "wincmd w" - - elseif s:shouldSplitToOpen(winnr("#")) - call s:openFileNodeSplit(a:treenode) - else - try - wincmd p - exec ("edit " . a:treenode.path.strForEditCmd()) - catch /^Vim\%((\a\+)\)\=:E37/ - call s:putCursorInTreeWin() - call s:echo("Cannot open file, it is already open and modified") - catch /^Vim\%((\a\+)\)\=:/ - echo v:exception - endtry - endif -endfunction - -"FUNCTION: s:openFileNodeSplit(treenode) {{{2 -"Open the file represented by the given node in a new window. -"No action is taken for dir nodes -" -"ARGS: -"treenode: file node to open -function! s:openFileNodeSplit(treenode) - if a:treenode.path.isDirectory == 0 - try - call s:openNodeSplit(a:treenode) - catch /^NERDTree.view.FileOpen/ - call s:echo("Cannot open file, it is already open and modified" ) - endtry - endif -endfunction - -"FUNCTION: s:openNodeSplit(treenode) {{{2 -"Open the file/dir represented by the given node in a new window -" -"ARGS: -"treenode: file node to open -function! s:openNodeSplit(treenode) - call s:putCursorInTreeWin() - - " Save the user's settings for splitbelow and splitright - let savesplitbelow=&splitbelow - let savesplitright=&splitright - - " Figure out how to do the split based on the user's preferences. - " We want to split to the (left,right,top,bottom) of the explorer - " window, but we want to extract the screen real-estate from the - " window next to the explorer if possible. - " - " 'there' will be set to a command to move from the split window - " back to the explorer window - " - " 'back' will be set to a command to move from the explorer window - " back to the newly split window - " - " 'right' and 'below' will be set to the settings needed for - " splitbelow and splitright IF the explorer is the only window. - " - if s:shouldSplitVertically() - let there= g:NERDTreeWinPos == "left" ? "wincmd h" : "wincmd l" - let back = g:NERDTreeWinPos == "left" ? "wincmd l" : "wincmd h" - let right= g:NERDTreeWinPos == "left" - let below=0 - else - let there= g:NERDTreeWinPos == "top" ? "wincmd k" : "wincmd j" - let back = g:NERDTreeWinPos == "top" ? "wincmd j" : "wincmd k" - let below= g:NERDTreeWinPos == "top" - let right=0 - endif - - " Attempt to go to adjacent window - exec(back) - - let onlyOneWin = (winnr() == s:getTreeWinNum()) - - " If no adjacent window, set splitright and splitbelow appropriately - if onlyOneWin - let &splitright=right - let &splitbelow=below - else - " found adjacent window - invert split direction - let &splitright=!right - let &splitbelow=!below - endif - - " Create a variable to use if splitting vertically - let splitMode = "" - if (onlyOneWin && s:shouldSplitVertically()) || (!onlyOneWin && !s:shouldSplitVertically()) - let splitMode = "vertical" - endif - - echomsg splitMode - - " Open the new window - try - exec(splitMode." sp " . a:treenode.path.strForEditCmd()) - catch /^Vim\%((\a\+)\)\=:E37/ - call s:putCursorInTreeWin() - throw "NERDTree.view.FileOpen exception: ". a:treenode.path.str(0) ." is already open and modified." - catch /^Vim\%((\a\+)\)\=:/ - "do nothing - endtry - - "resize the tree window if no other window was open before - if onlyOneWin - let size = exists("t:NERDTreeOldWindowSize") ? t:NERDTreeOldWindowSize : g:NERDTreeWinSize - exec(there) - exec("silent ". splitMode ." resize ". size) - wincmd p - endif - - " Restore splitmode settings - let &splitbelow=savesplitbelow - let &splitright=savesplitright -endfunction - "FUNCTION: s:promptToDelBuffer(bufnum, msg){{{2 "prints out the given msg and, if the user responds by pushing 'y' then the "buffer with the given bufnum is deleted @@ -2407,7 +2701,7 @@ endfunction " del the buffer function! s:promptToDelBuffer(bufnum, msg) echo a:msg - if nr2char(getchar()) == 'y' + if nr2char(getchar()) ==# 'y' exec "silent bdelete! " . a:bufnum endif endfunction @@ -2415,58 +2709,30 @@ endfunction "FUNCTION: s:putCursorOnBookmarkTable(){{{2 "Places the cursor at the top of the bookmarks table function! s:putCursorOnBookmarkTable() - if !t:NERDTreeShowBookmarks - throw "NERDTree.IllegalOperation exception: cant find bookmark table, bookmarks arent active" + if !b:NERDTreeShowBookmarks + throw "NERDTree.IllegalOperationError: cant find bookmark table, bookmarks arent active" endif - let rootNodeLine = s:findRootNodeLineNumber() + let rootNodeLine = s:TreeFileNode.GetRootLineNum() let line = 1 while getline(line) !~ '^>-\+Bookmarks-\+$' let line = line + 1 if line >= rootNodeLine - throw "NERDTree.BookmarkTableNotFound exception: didnt find the bookmarks table" + throw "NERDTree.BookmarkTableNotFoundError: didnt find the bookmarks table" endif endwhile call cursor(line, 0) endfunction -"FUNCTION: s:putCursorOnNode(treenode, isJump, recurseUpward){{{2 -"Places the cursor on the line number representing the given node -" -"Args: -"treenode: the node to put the cursor on -"isJump: 1 if this cursor movement should be counted as a jump by vim -"recurseUpward: try to put the cursor on the parent if the this node isnt -"visible -function! s:putCursorOnNode(treenode, isJump, recurseUpward) - let ln = s:findNodeLineNumber(a:treenode) - if ln != -1 - if a:isJump - mark ' - endif - call cursor(ln, col(".")) - else - if a:recurseUpward - let node = a:treenode - while s:findNodeLineNumber(node) == -1 && node != {} - let node = node.parent - call node.open() - endwhile - call s:renderView() - call s:putCursorOnNode(a:treenode, a:isJump, 0) - endif - endif -endfunction - "FUNCTION: s:putCursorInTreeWin(){{{2 "Places the cursor in the nerd tree window function! s:putCursorInTreeWin() if !s:isTreeOpen() - throw "NERDTree.view.InvalidOperation Exception: No NERD tree window exists" + throw "NERDTree.InvalidOperationError: cant put cursor in NERD tree window, no window exists" endif - exec s:getTreeWinNum() . "wincmd w" + call s:exec(s:getTreeWinNum() . "wincmd w") endfunction "FUNCTION: s:renderBookmarks {{{2 @@ -2484,13 +2750,8 @@ function! s:renderBookmarks() call cursor(line(".")+1, col(".")) endfunction "FUNCTION: s:renderView {{{2 -"The entry function for rendering the tree. Renders the root then calls -"s:drawTree to draw the children of the root -" -"Args: +"The entry function for rendering the tree function! s:renderView() - execute s:getTreeWinNum() . "wincmd w" - setlocal modifiable "remember the top line of the buffer and the current line so we can @@ -2508,7 +2769,7 @@ function! s:renderView() call setline(line(".")+1, "") call cursor(line(".")+1, col(".")) - if t:NERDTreeShowBookmarks + if b:NERDTreeShowBookmarks call s:renderBookmarks() endif @@ -2517,11 +2778,14 @@ function! s:renderView() call cursor(line(".")+1, col(".")) "draw the header line - call setline(line(".")+1, t:NERDTreeRoot.path.str(0)) + call setline(line(".")+1, b:NERDTreeRoot.path.str(0)) call cursor(line(".")+1, col(".")) "draw the tree - call s:drawTree(t:NERDTreeRoot, 0, 0, [], t:NERDTreeRoot.getChildCount() == 1) + let old_o = @o + let @o = b:NERDTreeRoot.renderToString() + silent put o + let @o = old_o "delete the blank line at the top of the buffer silent 1,1delete _ @@ -2541,7 +2805,7 @@ endfunction "Renders the tree and ensures the cursor stays on the current node or the "current nodes parent if it is no longer available upon re-rendering function! s:renderViewSavingPosition() - let currentNode = s:getSelectedNode() + let currentNode = s:TreeFileNode.GetSelected() "go up the tree till we find a node that will be visible or till we run "out of nodes @@ -2552,7 +2816,7 @@ function! s:renderViewSavingPosition() call s:renderView() if currentNode != {} - call s:putCursorOnNode(currentNode, 0, 0) + call currentNode.putCursorHere(0, 0) endif endfunction "FUNCTION: s:restoreScreenState() {{{2 @@ -2562,16 +2826,16 @@ endfunction " "Assumes the cursor is in the NERDTree window function! s:restoreScreenState() - if !exists("t:NERDTreeOldTopLine") || !exists("t:NERDTreeOldPos") || !exists("t:NERDTreeOldWindowSize") + if !exists("b:NERDTreeOldTopLine") || !exists("b:NERDTreeOldPos") || !exists("b:NERDTreeOldWindowSize") return endif - exec("silent ". (s:shouldSplitVertically() ? "vertical" : "") ." resize ".t:NERDTreeOldWindowSize) + exec("silent vertical resize ".b:NERDTreeOldWindowSize) let old_scrolloff=&scrolloff let &scrolloff=0 - call cursor(t:NERDTreeOldTopLine, 0) + call cursor(b:NERDTreeOldTopLine, 0) normal! zt - call setpos(".", t:NERDTreeOldPos) + call setpos(".", b:NERDTreeOldPos) let &scrolloff=old_scrolloff endfunction @@ -2580,13 +2844,22 @@ endfunction "scroll position function! s:saveScreenState() let win = winnr() - call s:putCursorInTreeWin() - let t:NERDTreeOldPos = getpos(".") - let t:NERDTreeOldTopLine = line("w0") - let t:NERDTreeOldWindowSize = s:shouldSplitVertically() ? winwidth("") : winheight("") - exec win . "wincmd w" + try + call s:putCursorInTreeWin() + let b:NERDTreeOldPos = getpos(".") + let b:NERDTreeOldTopLine = line("w0") + let b:NERDTreeOldWindowSize = winwidth("") + call s:exec(win . "wincmd w") + catch /^NERDTree.InvalidOperationError/ + endtry endfunction +"FUNCTION: s:setupStatusline() {{{2 +function! s:setupStatusline() + if g:NERDTreeStatusline != -1 + let &l:statusline = g:NERDTreeStatusline + endif +endfunction "FUNCTION: s:setupSyntaxHighlighting() {{{2 function! s:setupSyntaxHighlighting() "treeFlags are syntax items that should be invisible, but give clues as to @@ -2618,7 +2891,7 @@ function! s:setupSyntaxHighlighting() syn match treeHelp #^".*# contains=treeHelpKey,treeHelpTitle,treeFlag,treeToggleOff,treeToggleOn,treeHelpCommand "highlighting for readonly files - syn match treeRO #[\/0-9a-zA-Z]\+.*\[RO\]# contains=treeFlag,treeBookmark + syn match treeRO #.*\[RO\]#hs=s+2 contains=treeFlag,treeBookmark,treePart,treePartFile "highlighting for sym links syn match treeLink #[^-| `].* -> # contains=treeBookmark,treeOpenable,treeClosable,treeDirSlash @@ -2678,42 +2951,6 @@ function! s:setupSyntaxHighlighting() hi def link NERDTreeCurrentNode Search endfunction -"FUNCTION: s:shouldSplitToOpen() {{{2 -"Returns 1 if opening a file from the tree in the given window requires it to -"be split -" -"Args: -"winnumber: the number of the window in question -function! s:shouldSplitToOpen(winnumber) - "gotta split if theres only one window (i.e. the NERD tree) - if winnr("$") == 1 - return 1 - endif - - let oldwinnr = winnr() - exec a:winnumber . "wincmd p" - let specialWindow = getbufvar("%", '&buftype') != '' || getwinvar('%', '&previewwindow') - let modified = &modified - exec oldwinnr . "wincmd p" - - "if its a special window e.g. quickfix or another explorer plugin then we - "have to split - if specialWindow - return 1 - endif - - if &hidden - return 0 - endif - - return modified && s:bufInWindows(winbufnr(a:winnumber)) < 2 -endfunction - -" Function: s:shouldSplitVertically() {{{2 -" Returns 1 if g:NERDTreeWinPos is 'left' or 'right' -function! s:shouldSplitVertically() - return g:NERDTreeWinPos == 'left' || g:NERDTreeWinPos == 'right' -endfunction "FUNCTION: s:stripMarkupFromLine(line, removeLeadingSpaces){{{2 "returns the given line with all the tree parts stripped off " @@ -2724,7 +2961,7 @@ endfunction function! s:stripMarkupFromLine(line, removeLeadingSpaces) let line = a:line "remove the tree parts and the leading space - let line = substitute (line,"^" . s:tree_markup_reg . "*","","") + let line = substitute (line, s:tree_markup_reg,"","") "strip off any read only flag let line = substitute (line, ' \[RO\]', "","") @@ -2740,7 +2977,7 @@ function! s:stripMarkupFromLine(line, removeLeadingSpaces) let wasdir = 1 endif let line = substitute (line,' -> .*',"","") " remove link to - if wasdir == 1 + if wasdir ==# 1 let line = substitute (line, '/\?$', '/', "") endif @@ -2762,9 +2999,10 @@ function! s:toggle(dir) if s:treeExistsForTab() if !s:isTreeOpen() call s:createTreeWin() - call s:renderView() - call s:restoreScreenState() + if !&hidden + call s:renderView() + endif else call s:closeTree() endif @@ -2781,18 +3019,18 @@ endfunction "args: "forceKeepWindowOpen - dont close the window even if NERDTreeQuitOnOpen is set function! s:activateNode(forceKeepWindowOpen) - if getline(".") == s:tree_up_dir_line + if getline(".") ==# s:tree_up_dir_line return s:upDir(0) endif - let treenode = s:getSelectedNode() + let treenode = s:TreeFileNode.GetSelected() if treenode != {} if treenode.path.isDirectory call treenode.toggleOpen() call s:renderView() - call s:putCursorOnNode(treenode, 0, 0) + call treenode.putCursorHere(0, 0) else - call s:openFileNode(treenode) + call treenode.open() if !a:forceKeepWindowOpen call s:closeTreeIfQuitOnOpen() end @@ -2804,7 +3042,7 @@ function! s:activateNode(forceKeepWindowOpen) call bookmark.toRoot() else if bookmark.validate() - call s:openFileNode(s:TreeFileNode.New(bookmark.path)) + call (s:TreeFileNode.New(bookmark.path)).open() endif endif endif @@ -2819,11 +3057,13 @@ function! s:bindMappings() nnoremap <silent> <buffer> <2-leftmouse> :call <SID>activateNode(0)<cr> exec "nnoremap <silent> <buffer> ". g:NERDTreeMapActivateNode . " :call <SID>activateNode(0)<cr>" - exec "nnoremap <silent> <buffer> ". g:NERDTreeMapOpenSplit ." :call <SID>openEntrySplit(0)<cr>" + exec "nnoremap <silent> <buffer> ". g:NERDTreeMapOpenSplit ." :call <SID>openEntrySplit(0,0)<cr>" exec "nnoremap <silent> <buffer> ". g:NERDTreeMapPreview ." :call <SID>previewNode(0)<cr>" exec "nnoremap <silent> <buffer> ". g:NERDTreeMapPreviewSplit ." :call <SID>previewNode(1)<cr>" + exec "nnoremap <silent> <buffer> ". g:NERDTreeMapOpenVSplit ." :call <SID>openEntrySplit(1,0)<cr>" + exec "nnoremap <silent> <buffer> ". g:NERDTreeMapPreviewVSplit ." :call <SID>previewNode(2)<cr>" exec "nnoremap <silent> <buffer> ". g:NERDTreeMapExecute ." :call <SID>executeNode()<cr>" @@ -2835,7 +3075,7 @@ function! s:bindMappings() exec "nnoremap <silent> <buffer> ". g:NERDTreeMapChdir ." :call <SID>chCwd()<cr>" - exec "nnoremap <silent> <buffer> ". g:NERDTreeMapQuit ." :NERDTreeToggle<cr>" + exec "nnoremap <silent> <buffer> ". g:NERDTreeMapQuit ." :call <SID>closeTreeWindow()<cr>" exec "nnoremap <silent> <buffer> ". g:NERDTreeMapRefreshRoot ." :call <SID>refreshRoot()<cr>" exec "nnoremap <silent> <buffer> ". g:NERDTreeMapRefresh ." :call <SID>refreshCurrent()<cr>" @@ -2878,12 +3118,12 @@ endfunction " FUNCTION: s:bookmarkNode(name) {{{2 " Associate the current node with the given name function! s:bookmarkNode(name) - let currentNode = s:getSelectedNode() + let currentNode = s:TreeFileNode.GetSelected() if currentNode != {} try call currentNode.bookmark(a:name) call s:renderView() - catch /NERDTree.IllegalBookmarkName/ + catch /^NERDTree.IllegalBookmarkNameError/ call s:echo("bookmark names must not contain spaces") endtry else @@ -2895,7 +3135,7 @@ endfunction "called (directories are automatically opened if the symbol beside them is "clicked) function! s:checkForActivate() - let currentNode = s:getSelectedNode() + let currentNode = s:TreeFileNode.GetSelected() if currentNode != {} let startToCur = strpart(getline(line(".")), 0, col(".")) let char = strpart(startToCur, strlen(startToCur)-1, 1) @@ -2903,14 +3143,13 @@ function! s:checkForActivate() "if they clicked a dir, check if they clicked on the + or ~ sign "beside it if currentNode.path.isDirectory - let reg = '^' . s:tree_markup_reg .'*[~+]$' - if startToCur =~ reg + if startToCur =~ s:tree_markup_reg . '$' && char =~ '[+~]' call s:activateNode(0) return endif endif - if (g:NERDTreeMouseMode == 2 && currentNode.path.isDirectory) || g:NERDTreeMouseMode == 3 + if (g:NERDTreeMouseMode ==# 2 && currentNode.path.isDirectory) || g:NERDTreeMouseMode ==# 3 if char !~ s:tree_markup_reg && startToCur !~ '\/$' call s:activateNode(0) return @@ -2921,15 +3160,15 @@ endfunction " FUNCTION: s:chCwd() {{{2 function! s:chCwd() - let treenode = s:getSelectedNode() - if treenode == {} + let treenode = s:TreeFileNode.GetSelected() + if treenode ==# {} call s:echo("Select a node first") return endif try call treenode.path.changeToDir() - catch /^NERDTree.Path.Change/ + catch /^NERDTree.PathChangeError/ call s:echoWarning("could not change cwd") endtry endfunction @@ -2937,21 +3176,21 @@ endfunction " FUNCTION: s:chRoot() {{{2 " changes the current root to the selected one function! s:chRoot() - let treenode = s:getSelectedNode() - if treenode == {} + let treenode = s:TreeFileNode.GetSelected() + if treenode ==# {} call s:echo("Select a node first") return endif call treenode.makeRoot() call s:renderView() - call s:putCursorOnNode(t:NERDTreeRoot, 0, 0) + call b:NERDTreeRoot.putCursorHere(0, 0) endfunction " FUNCTION: s:clearBookmarks(bookmarks) {{{2 function! s:clearBookmarks(bookmarks) - if a:bookmarks == '' - let currentNode = s:getSelectedNode() + if a:bookmarks ==# '' + let currentNode = s:TreeFileNode.GetSelected() if currentNode != {} call currentNode.clearBoomarks() endif @@ -2966,21 +3205,21 @@ endfunction " FUNCTION: s:closeChildren() {{{2 " closes all childnodes of the current node function! s:closeChildren() - let currentNode = s:getSelectedDir() - if currentNode == {} + let currentNode = s:TreeDirNode.GetSelected() + if currentNode ==# {} call s:echo("Select a node first") return endif call currentNode.closeChildren() call s:renderView() - call s:putCursorOnNode(currentNode, 0, 0) + call currentNode.putCursorHere(0, 0) endfunction " FUNCTION: s:closeCurrentDir() {{{2 " closes the parent dir of the current node function! s:closeCurrentDir() - let treenode = s:getSelectedNode() - if treenode == {} + let treenode = s:TreeFileNode.GetSelected() + if treenode ==# {} call s:echo("Select a node first") return endif @@ -2991,14 +3230,26 @@ function! s:closeCurrentDir() else call treenode.parent.close() call s:renderView() - call s:putCursorOnNode(treenode.parent, 0, 0) + call treenode.parent.putCursorHere(0, 0) + endif +endfunction +" FUNCTION: s:closeTreeWindow() {{{2 +" close the tree window +function! s:closeTreeWindow() + if b:NERDTreeType ==# "secondary" && b:NERDTreePreviousBuf != -1 + exec "buffer " . b:NERDTreePreviousBuf + else + if winnr("$") > 1 + wincmd c + else + call s:echo("Cannot close last window") + endif endif endfunction - " FUNCTION: s:copyNode() {{{2 function! s:copyNode() - let currentNode = s:getSelectedNode() - if currentNode == {} + let currentNode = s:TreeFileNode.GetSelected() + if currentNode ==# {} call s:echo("Put the cursor on a file node first") return endif @@ -3016,14 +3267,14 @@ function! s:copyNode() if currentNode.path.copyingWillOverwrite(newNodePath) call s:echo("\nWarning: copying may overwrite files! Continue? (yN)") let choice = nr2char(getchar()) - let confirmed = choice == 'y' + let confirmed = choice ==# 'y' endif if confirmed try let newNode = currentNode.copy(newNodePath) call s:renderView() - call s:putCursorOnNode(newNode, 0, 0) + call newNode.putCursorHere(0, 0) catch /^NERDTree/ call s:echoWarning("Could not copy node") endtry @@ -3038,14 +3289,14 @@ endfunction " if the cursor is on a bookmark, prompt to delete function! s:deleteBookmark() let bookmark = s:getSelectedBookmark() - if bookmark == {} + if bookmark ==# {} call s:echo("Put the cursor on a bookmark") return endif echo "Are you sure you wish to delete the bookmark:\n\"" . bookmark.name . "\" (yN):" - if nr2char(getchar()) == 'y' + if nr2char(getchar()) ==# 'y' try call bookmark.delete() call s:renderView() @@ -3063,8 +3314,8 @@ endfunction " if the current node is a file, pops up a dialog giving the user the option " to delete it function! s:deleteNode() - let currentNode = s:getSelectedNode() - if currentNode == {} + let currentNode = s:TreeFileNode.GetSelected() + if currentNode ==# {} call s:echo("Put the cursor on a file node first") return endif @@ -3076,14 +3327,14 @@ function! s:deleteNode() \ "==========================================================\n" . \ "STOP! To delete this entire directory, type 'yes'\n" . \ "" . currentNode.path.strForOS(0) . ": ") - let confirmed = choice == 'yes' + let confirmed = choice ==# 'yes' else echo "Delete the current node\n" . \ "==========================================================\n". \ "Are you sure you wish to delete the node:\n" . \ "" . currentNode.path.strForOS(0) . " (yN):" let choice = nr2char(getchar()) - let confirmed = choice == 'y' + let confirmed = choice ==# 'y' endif @@ -3096,7 +3347,7 @@ function! s:deleteNode() "close that buffer let bufnum = bufnr(currentNode.path.str(0)) if buflisted(bufnum) - let prompt = "\nNode deleted.\n\nThe file is open in buffer ". bufnum . (bufwinnr(bufnum) == -1 ? " (hidden)" : "") .". Delete this buffer? (yN)" + let prompt = "\nNode deleted.\n\nThe file is open in buffer ". bufnum . (bufwinnr(bufnum) ==# -1 ? " (hidden)" : "") .". Delete this buffer? (yN)" call s:promptToDelBuffer(bufnum, prompt) endif @@ -3113,15 +3364,15 @@ endfunction " FUNCTION: s:displayHelp() {{{2 " toggles the help display function! s:displayHelp() - let t:treeShowHelp = t:treeShowHelp ? 0 : 1 + let b:treeShowHelp = b:treeShowHelp ? 0 : 1 call s:renderView() call s:centerView() endfunction " FUNCTION: s:executeNode() {{{2 function! s:executeNode() - let treenode = s:getSelectedNode() - if treenode == {} || treenode.path.isDirectory + let treenode = s:TreeFileNode.GetSelected() + if treenode ==# {} || treenode.path.isDirectory call s:echo("Select an executable file node first" ) else echo "NERDTree executor\n" . @@ -3140,8 +3391,8 @@ endfunction " FUNCTION: s:handleMiddleMouse() {{{2 function! s:handleMiddleMouse() - let curNode = s:getSelectedNode() - if curNode == {} + let curNode = s:TreeFileNode.GetSelected() + if curNode ==# {} call s:echo("Put the cursor on a node first" ) return endif @@ -3149,7 +3400,7 @@ function! s:handleMiddleMouse() if curNode.path.isDirectory call s:openExplorer() else - call s:openEntrySplit(0) + call s:openEntrySplit(0,0) endif endfunction @@ -3157,8 +3408,8 @@ endfunction " FUNCTION: s:insertNewNode() {{{2 " Adds a new node to the filesystem and then into the tree function! s:insertNewNode() - let curDirNode = s:getSelectedDir() - if curDirNode == {} + let curDirNode = s:TreeDirNode.GetSelected() + if curDirNode ==# {} call s:echo("Put the cursor on a node first" ) return endif @@ -3168,20 +3419,20 @@ function! s:insertNewNode() \ "Enter the dir/file name to be created. Dirs end with a '/'\n" . \ "", curDirNode.path.strForGlob() . s:os_slash) - if newNodeName == '' + if newNodeName ==# '' call s:echo("Node Creation Aborted.") return endif try let newPath = s:Path.Create(newNodeName) - let parentNode = t:NERDTreeRoot.findNode(newPath.getPathTrunk()) + let parentNode = b:NERDTreeRoot.findNode(newPath.getPathTrunk()) let newTreeNode = s:TreeFileNode.New(newPath) if parentNode.isOpen || !empty(parentNode.children) call parentNode.addChild(newTreeNode, 1) call s:renderView() - call s:putCursorOnNode(newTreeNode, 1, 0) + call newTreeNode.putCursorHere(1, 0) endif catch /^NERDTree/ call s:echoWarning("Node Not Created.") @@ -3203,10 +3454,10 @@ endfunction " FUNCTION: s:jumpToParent() {{{2 " moves the cursor to the parent of the current node function! s:jumpToParent() - let currentNode = s:getSelectedNode() + let currentNode = s:TreeFileNode.GetSelected() if !empty(currentNode) if !empty(currentNode.parent) - call s:putCursorOnNode(currentNode.parent, 1, 0) + call currentNode.parent.putCursorHere(1, 0) call s:centerView() else call s:echo("cannot jump to parent") @@ -3219,7 +3470,7 @@ endfunction " FUNCTION: s:jumpToRoot() {{{2 " moves the cursor to the root node function! s:jumpToRoot() - call s:putCursorOnNode(t:NERDTreeRoot, 1, 0) + call b:NERDTreeRoot.putCursorHere(1, 0) call s:centerView() endfunction @@ -3230,12 +3481,12 @@ endfunction " forward: 1 if the cursor should move to the next sibling, 0 if it should " move back to the previous sibling function! s:jumpToSibling(forward) - let currentNode = s:getSelectedNode() + let currentNode = s:TreeFileNode.GetSelected() if !empty(currentNode) let sibling = currentNode.findSibling(a:forward) if !empty(sibling) - call s:putCursorOnNode(sibling, 1, 0) + call sibling.putCursorHere(1, 0) call s:centerView() endif else @@ -3248,29 +3499,33 @@ endfunction function! s:openBookmark(name) try let targetNode = s:Bookmark.GetNodeForName(a:name, 0) - call s:putCursorOnNode(targetNode, 0, 1) + call targetNode.putCursorHere(0, 1) redraw! - catch /NERDTree.BookmarkedNodeNotFound/ + catch /^NERDTree.BookmarkedNodeNotFoundError/ call s:echo("note - target node is not cached") let bookmark = s:Bookmark.BookmarkFor(a:name) let targetNode = s:TreeFileNode.New(bookmark.path) endtry if targetNode.path.isDirectory - call s:openExplorerFor(targetNode) + call targetNode.openExplorer() else - call s:openFileNode(targetNode) + call targetNode.open() endif endfunction -" FUNCTION: s:openEntrySplit(forceKeepWindowOpen) {{{2 +" FUNCTION: s:openEntrySplit(vertical, forceKeepWindowOpen) {{{2 "Opens the currently selected file from the explorer in a "new window " "args: "forceKeepWindowOpen - dont close the window even if NERDTreeQuitOnOpen is set -function! s:openEntrySplit(forceKeepWindowOpen) - let treenode = s:getSelectedNode() +function! s:openEntrySplit(vertical, forceKeepWindowOpen) + let treenode = s:TreeFileNode.GetSelected() if treenode != {} - call s:openFileNodeSplit(treenode) + if a:vertical + call treenode.openVSplit() + else + call treenode.openSplit() + endif if !a:forceKeepWindowOpen call s:closeTreeIfQuitOnOpen() endif @@ -3281,9 +3536,9 @@ endfunction " FUNCTION: s:openExplorer() {{{2 function! s:openExplorer() - let treenode = s:getSelectedDir() + let treenode = s:TreeDirNode.GetSelected() if treenode != {} - call s:openExplorerFor(treenode) + call treenode.openExplorer() else call s:echo("select a node first") endif @@ -3297,7 +3552,7 @@ endfunction function! s:openInNewTab(stayCurrentTab) let currentTab = tabpagenr() - let treenode = s:getSelectedNode() + let treenode = s:TreeFileNode.GetSelected() if treenode != {} if treenode.path.isDirectory tabnew @@ -3323,8 +3578,8 @@ endfunction " FUNCTION: s:openNodeRecursively() {{{2 function! s:openNodeRecursively() - let treenode = s:getSelectedNode() - if treenode == {} || treenode.path.isDirectory == 0 + let treenode = s:TreeFileNode.GetSelected() + if treenode ==# {} || treenode.path.isDirectory ==# 0 call s:echo("Select a directory node first" ) else call s:echo("Recursively opening node. Please wait...") @@ -3337,13 +3592,17 @@ function! s:openNodeRecursively() endfunction "FUNCTION: s:previewNode() {{{2 +"Args: +" openNewWin: if 0, use the previous window, if 1 open in new split, if 2 +" open in a vsplit function! s:previewNode(openNewWin) - if a:openNewWin - call s:openEntrySplit(1) + let currentBuf = bufnr("") + if a:openNewWin > 0 + call s:openEntrySplit(a:openNewWin ==# 2,1) else call s:activateNode(1) end - call s:putCursorInTreeWin() + call s:exec(bufwinnr(currentBuf) . "wincmd w") endfunction " FUNCTION: s:revealBookmark(name) {{{2 @@ -3351,8 +3610,8 @@ endfunction function! s:revealBookmark(name) try let targetNode = s:Bookmark.GetNodeForName(a:name, 0) - call s:putCursorOnNode(targetNode, 0, 1) - catch /NERDTree.BookmarkDoesntExist/ + call targetNode.putCursorHere(0, 1) + catch /^NERDTree.BookmarkNotFoundError/ call s:echo("Bookmark isnt cached under the current root") endtry endfunction @@ -3361,7 +3620,7 @@ endfunction " will be reloaded. function! s:refreshRoot() call s:echo("Refreshing the root node. This could take a while...") - call t:NERDTreeRoot.refresh() + call b:NERDTreeRoot.refresh() call s:renderView() redraw call s:echo("Refreshing the root node. This could take a while... DONE") @@ -3370,8 +3629,8 @@ endfunction " FUNCTION: s:refreshCurrent() {{{2 " refreshes the root for the current node function! s:refreshCurrent() - let treenode = s:getSelectedDir() - if treenode == {} + let treenode = s:TreeDirNode.GetSelected() + if treenode ==# {} call s:echo("Refresh failed. Select a node first") return endif @@ -3385,8 +3644,8 @@ endfunction " FUNCTION: s:renameCurrent() {{{2 " allows the user to rename the current node function! s:renameCurrent() - let curNode = s:getSelectedNode() - if curNode == {} + let curNode = s:TreeFileNode.GetSelected() + if curNode ==# {} call s:echo("Put the cursor on a node first" ) return endif @@ -3396,7 +3655,7 @@ function! s:renameCurrent() \ "Enter the new path for the node: \n" . \ "", curNode.path.strForOS(0)) - if newNodePath == '' + if newNodePath ==# '' call s:echo("Node Renaming Aborted.") return endif @@ -3410,11 +3669,11 @@ function! s:renameCurrent() "if the node is open in a buffer, ask the user if they want to "close that buffer if bufnum != -1 - let prompt = "\nNode renamed.\n\nThe old file is open in buffer ". bufnum . (bufwinnr(bufnum) == -1 ? " (hidden)" : "") .". Delete this buffer? (yN)" + let prompt = "\nNode renamed.\n\nThe old file is open in buffer ". bufnum . (bufwinnr(bufnum) ==# -1 ? " (hidden)" : "") .". Delete this buffer? (yN)" call s:promptToDelBuffer(bufnum, prompt) endif - call s:putCursorOnNode(curNode, 1, 0) + call curNode.putCursorHere(1, 0) redraw catch /^NERDTree/ @@ -3424,8 +3683,8 @@ endfunction " FUNCTION: s:showFileSystemMenu() {{{2 function! s:showFileSystemMenu() - let curNode = s:getSelectedNode() - if curNode == {} + let curNode = s:TreeFileNode.GetSelected() + if curNode ==# {} call s:echo("Put the cursor on a node first" ) return endif @@ -3461,7 +3720,7 @@ endfunction " FUNCTION: s:toggleIgnoreFilter() {{{2 " toggles the use of the NERDTreeIgnore option function! s:toggleIgnoreFilter() - let t:NERDTreeIgnoreEnabled = !t:NERDTreeIgnoreEnabled + let b:NERDTreeIgnoreEnabled = !b:NERDTreeIgnoreEnabled call s:renderViewSavingPosition() call s:centerView() endfunction @@ -3469,8 +3728,8 @@ endfunction " FUNCTION: s:toggleShowBookmarks() {{{2 " toggles the display of bookmarks function! s:toggleShowBookmarks() - let t:NERDTreeShowBookmarks = !t:NERDTreeShowBookmarks - if t:NERDTreeShowBookmarks + let b:NERDTreeShowBookmarks = !b:NERDTreeShowBookmarks + if b:NERDTreeShowBookmarks call s:renderView() call s:putCursorOnBookmarkTable() else @@ -3481,7 +3740,7 @@ endfunction " FUNCTION: s:toggleShowFiles() {{{2 " toggles the display of hidden files function! s:toggleShowFiles() - let t:NERDTreeShowFiles = !t:NERDTreeShowFiles + let b:NERDTreeShowFiles = !b:NERDTreeShowFiles call s:renderViewSavingPosition() call s:centerView() endfunction @@ -3489,7 +3748,7 @@ endfunction " FUNCTION: s:toggleShowHidden() {{{2 " toggles the display of hidden files function! s:toggleShowHidden() - let t:NERDTreeShowHidden = !t:NERDTreeShowHidden + let b:NERDTreeShowHidden = !b:NERDTreeShowHidden call s:renderViewSavingPosition() call s:centerView() endfunction @@ -3501,30 +3760,37 @@ endfunction "keepState: 1 if the current root should be left open when the tree is "re-rendered function! s:upDir(keepState) - let cwd = t:NERDTreeRoot.path.str(0) - if cwd == "/" || cwd =~ '^[^/]..$' + let cwd = b:NERDTreeRoot.path.str(0) + if cwd ==# "/" || cwd =~ '^[^/]..$' call s:echo("already at top dir") else if !a:keepState - call t:NERDTreeRoot.close() + call b:NERDTreeRoot.close() endif - let oldRoot = t:NERDTreeRoot + let oldRoot = b:NERDTreeRoot - if empty(t:NERDTreeRoot.parent) - let path = t:NERDTreeRoot.path.getPathTrunk() + if empty(b:NERDTreeRoot.parent) + let path = b:NERDTreeRoot.path.getPathTrunk() let newRoot = s:TreeDirNode.New(path) call newRoot.open() - call newRoot.transplantChild(t:NERDTreeRoot) - let t:NERDTreeRoot = newRoot + call newRoot.transplantChild(b:NERDTreeRoot) + let b:NERDTreeRoot = newRoot else - let t:NERDTreeRoot = t:NERDTreeRoot.parent + let b:NERDTreeRoot = b:NERDTreeRoot.parent + endif + if g:NERDTreeChDirMode ==# 2 + exec 'cd ' . b:NERDTreeRoot.path.strForCd() endif call s:renderView() - call s:putCursorOnNode(oldRoot, 0, 0) + call oldRoot.putCursorHere(0, 0) endif endfunction + +"reset &cpo back to users setting +let &cpo = s:old_cpo + " vim: set sw=4 sts=4 et fdm=marker: plugin/NERD_tree.vim @@ -1,10 +1,10 @@ "============================================================================= " fuzzyfinder.vim : Fuzzy/Partial pattern explorer for -" buffer/file/MRU/command/favorite/tag/etc. +" buffer/file/MRU/command/bookmark/tag/etc. "============================================================================= " " Author: Takeshi NISHIDA <ns9tks@DELETE-ME.gmail.com> -" Version: 2.13, for Vim 7.1 +" Version: 2.19, for Vim 7.1 " Licence: MIT Licence " URL: http://www.vim.org/scripts/script.php?script_id=1984 " @@ -39,11 +39,11 @@ " - Buffer mode " - File mode " - Directory mode (yet another :cd command) -" - MRU-file mode (most recently used files) -" - MRU-command mode (most recently used command-lines) -" - Favorite-file mode +" - MRU-File mode (most recently used files) +" - MRU-Command mode (most recently used command-lines) +" - Bookmark mode " - Tag mode (yet another :tag command) -" - Tagged-file mode (files which are included in current tags) +" - Tagged-File mode (files which are included in current tags) " " Fuzzyfinder supports the multibyte. " @@ -56,14 +56,14 @@ " Starting Fuzzyfinder: " You can start Fuzzyfinder by the following commands: " -" :FuzzyFinderBuffer - launchs buffer-mode Fuzzyfinder. -" :FuzzyFinderFile - launchs file-mode Fuzzyfinder. -" :FuzzyFinderDir - launchs directory-mode Fuzzyfinder. -" :FuzzyFinderMruFile - launchs MRU-file-mode Fuzzyfinder. -" :FuzzyFinderMruCmd - launchs MRU-command-mode Fuzzyfinder. -" :FuzzyFinderFavFile - launchs favorite-file-mode Fuzzyfinder. -" :FuzzyFinderTag - launchs tag-mode Fuzzyfinder. -" :FuzzyFinderTaggedFile - launchs tagged-file-mode Fuzzyfinder. +" :FuzzyFinderBuffer - launchs Fuzzyfinder as Buffer mode. +" :FuzzyFinderFile - launchs Fuzzyfinder as File mode. +" :FuzzyFinderDir - launchs Fuzzyfinder as Directory mode. +" :FuzzyFinderMruFile - launchs Fuzzyfinder as MRU-File mode. +" :FuzzyFinderMruCmd - launchs Fuzzyfinder as MRU-Command mode. +" :FuzzyFinderBookmark - launchs Fuzzyfinder as Bookmark mode. +" :FuzzyFinderTag - launchs Fuzzyfinder as Tag mode. +" :FuzzyFinderTaggedFile - launchs Fuzzyfinder as Tagged-File mode. " " It is recommended to map these commands. These commands can take initial " text as a command argument. The text will be entered after Fuzzyfinder @@ -73,30 +73,32 @@ " " " In Fuzzyfinder: -" The entered pattern is converted to the fuzzy pattern and buffers/files -" which match the pattern is shown in a completion menu. +" An entered pattern is converted to a fuzzy pattern and items which match +" the pattern is shown in a completion menu. " -" A completion menu is shown when you type at the end of the line and the -" length of entered pattern is more than setting value. By default, it is -" shown at the beginning. +" A completion menu is shown when you type at an end of a line and the +" length of the entered pattern is more than setting value. By default, it +" is shown at the beginning. " -" If too many items (200, by default) were matched, the completion is -" aborted to reduce nonresponse. +" The number of items shown in the completion menu is limited (50, by +" default) to speed up the response time. " -" If an item were matched with entered pattern exactly, it is shown first. -" The item whose file name has longer prefix matching is placed upper. -" Also, an item which matched more sequentially is placed upper. The item -" whose index were matched with a number suffixed with entered pattern is -" placed lower. the first item in the completion menu will be selected -" automatically. +" Fuzzyfinder sorts completion items with some rules: +" - A perfect matching puts first. +" - A sequential matching puts higher than a fragmentary matching. +" - A backward matching puts higher than a forward matching. +" - A short item is put higher than a long item. +" +" Plus, Fuzzyfinder has a learning system. An item which has been +" completed in the past with a current pattern is placed upper. +" +" The first item in the completion menu will be selected automatically. " " You can open a selected item in various ways: " <CR> - opens in a previous window. " <C-j> - opens in a split window. " <C-k> - opens in a vertical-split window. " <C-]> - opens in a new tab page. -" In MRU-command mode, <CR> executes a selected command and others just -" put it into a command-line. These key mappings are customizable. " " To cancel and return to previous window, leave Insert mode. " @@ -106,12 +108,12 @@ " If you want to temporarily change whether or not to ignore case, use " <C-t>. This key mapping is customizable. " -" To Hide The Completion Temporarily Menu In Fuzzyfinder: +" To Hide The Completion Menu Temporarily In Fuzzyfinder: " You can close it by <C-e> and reopen it by <C-x><C-u>. " " About Highlighting: -" Fuzzyfinder highlights the buffer with "Error" group when the completion -" item was not found or the completion process was aborted. +" Fuzzyfinder highlights the buffer with "Error" group when the number of +" completion items found is 0 or over enumerating_limit. " " About Alternative Approach For Tag Jump: " Following mappings are replacements for :tag and <C-]>: @@ -155,15 +157,24 @@ " "~/project/**/src/*t*x*t*" " ".vim/plugin/*t*x*t*" " -" Adding Favorite Files: -" You can add a favorite file by the following commands: +" About Bookmark Mode: +" You can jump to a line you have added to bookmarks beforehand. +" Fuzzyfinder adjusts a line number for jump. If a line of bookmarked +" position does not match to a pattern when the bookmark was added, +" Fuzzyfinder searches a matching line around bookmarked position. So you +" can jump to a bookmarked line even if the line is out of bookmarked +" position. If you want to jump to bookmarked line number, set +" g:FuzzyFinderOptions.Bookmark.searching_range option to 0. +" +" Adding Bookmark: +" You can add a cursor line to bookmarks by the following commands: " -" :FuzzyFinderAddFavFile {filename} +" :FuzzyFinderAddBookmark " -" If you do not specify the filename, current file name is used. +" Execute that command and you will be prompted to enter a bookmark name. " " About Information File: -" Fuzzyfinder writes information of the MRU, favorite, etc to the file by +" Fuzzyfinder writes information of the MRU, bookmark, etc to the file by " default (~/.vimfuzzyfinder). " :FuzzyFinderEditInfo command is helpful in editing your information @@ -171,8 +182,9 @@ " Write the buffer and the information file will be updated. " " About Cache: -" Once a cache was created, It is not updated automatically to improve -" response by default. To update it, use :FuzzyFinderRemoveCache command. +" Once a cache was created, It is not automatically updated to speed up +" the response time by default. To update it, use :FuzzyFinderRemoveCache +" command. " " About Migemo: " Migemo is a search method for Japanese language. @@ -186,7 +198,7 @@ " "----------------------------------------------------------------------------- " Setting Example: -" let g:FuzzyFinderOptions = { 'Base':{}, 'Buffer':{}, 'File':{}, 'Dir':{}, 'MruFile':{}, 'MruCmd':{}, 'FavFile':{}, 'Tag':{}, 'TaggedFile':{}} +" let g:FuzzyFinderOptions = { 'Base':{}, 'Buffer':{}, 'File':{}, 'Dir':{}, 'MruFile':{}, 'MruCmd':{}, 'Bookmark':{}, 'Tag':{}, 'TaggedFile':{}} " let g:FuzzyFinderOptions.Base.ignore_case = 1 " let g:FuzzyFinderOptions.Base.abbrev_map = { " \ '\C^VR' : [ @@ -204,11 +216,11 @@ " nnoremap <silent> <C-k> :FuzzyFinderMruCmd<CR> " nnoremap <silent> <C-p> :FuzzyFinderDir <C-r>=expand('%:p:~')[:-1-len(expand('%:p:~:t'))]<CR><CR> " nnoremap <silent> <C-f><C-d> :FuzzyFinderDir<CR> -" nnoremap <silent> <C-f><C-f> :FuzzyFinderFavFile<CR> +" nnoremap <silent> <C-b> :FuzzyFinderBookmark<CR> " nnoremap <silent> <C-f><C-t> :FuzzyFinderTag!<CR> " nnoremap <silent> <C-f><C-g> :FuzzyFinderTaggedFile<CR> " noremap <silent> g] :FuzzyFinderTag! <C-r>=expand('<cword>')<CR><CR> -" nnoremap <silent> <C-f>F :FuzzyFinderAddFavFile<CR> +" nnoremap <silent> <C-f>b :FuzzyFinderAddBookmark<CR> " nnoremap <silent> <C-f><C-e> :FuzzyFinderEditInfo<CR> " "----------------------------------------------------------------------------- @@ -222,6 +234,42 @@ " "----------------------------------------------------------------------------- " ChangeLog: +" 2.19: +" - Changed MRU-File mode that always formats completion items to be +" relative to the home directory. +" - Fixed a bug that a file was opened in an unintended window with Tag +" List plugin. Thanks Alexey. +" - Fixed a bug that garbage characters were entered when switched current +" mode. Thanks id:lugecy. +" +" 2.18: +" - Improved rules for the sorting of completion items. +" - Changed not to learn a completion if an entered pattern is empty. +" - Fixed a bug that Buffer mode did not work. Thanks ryo7000. +" +" 2.17: +" - Introduced a learning system for the sorting of completion items. +" - Added g:FuzzyFinderOptions.Base.learning_limit option. +" - Changed the specification of the information file. Please remove your +" information file for Fuzzyfinder. +" +" 2.16: +" - Improved response time by caching in MRU-File mode. +" - Fixed a bug in Bookmark mode that Fuzzyfinder did not jump to the +" Bookmarked line number when Bookmarked pattern was not found. +" +" 2.15: +" - Added Bookmark mode. +" - Removed Favorite-file mode. Use Bookmark mode instead. +" - Fixed not to record a entry of input() in MRU-Command mode. +" +" 2.14: +" - Changed to show buffer status in Buffer mode. +" - Fixed a bug that an error occurs when nonexistent buffer-name was +" entered in Buffer mode. Thanks Maxim Kim. +" - Added 'enumerating_limit' option. Thanks id:secondlife. +" - Removed 'matching_limit' option. Use 'enumerating_limit' instead. +" " 2.13: " - Fixed a bug that a directory disappeared when a file in that directroy " was being opened in File/Mru-File mode. @@ -431,9 +479,7 @@ let loaded_fuzzyfinder = 1 " }}}1 "============================================================================= -" FUNCTION: {{{1 -"----------------------------------------------------------------------------- -" LIST FUNCTIONS: +" FUNCTIONS: LIST ------------------------------------------------------- {{{1 function! s:Unique(in) let sorted = sort(a:in) @@ -494,27 +540,26 @@ function! s:FilterEx(in, expr, limit) endfunction " -function! s:FilterMatching(entries, key, pattern, index, limit) - return s:FilterEx(a:entries, 'v:val[''' . a:key . '''] =~ ' . string(a:pattern) . ' || v:val.index == ' . a:index, a:limit) +function! s:FilterMatching(items, key, pattern, index, limit) + return s:FilterEx(a:items, 'v:val[''' . a:key . '''] =~ ' . string(a:pattern) . ' || v:val.index == ' . a:index, a:limit) endfunction -function! s:ExtendIndexToEach(in, offset) +function! s:MapToSetSerialIndex(in, offset) for i in range(len(a:in)) let a:in[i].index = i + a:offset endfor return a:in endfunction -function! s:UpdateMruList(mrulist, new_item, key, max_item, excluded) +function! s:UpdateMruList(mrulist, new_item, max_item, excluded) let result = copy(a:mrulist) - let result = filter(result,'v:val[a:key] != a:new_item[a:key]') + let result = filter(result,'v:val.word != a:new_item.word') let result = insert(result, a:new_item) - let result = filter(result, 'v:val[a:key] !~ a:excluded') + let result = filter(result, 'v:val.word !~ a:excluded') return result[0 : a:max_item - 1] endfunction -"----------------------------------------------------------------------------- -" STRING FUNCTIONS: +" FUNCTIONS: STRING ----------------------------------------------------- {{{1 " trims a:str and add a:mark if a length of a:str is more than a:len function! s:TrimLast(str, len) @@ -557,55 +602,114 @@ function! s:ExpandTailDotSequenceToParentDir(base) \ '\=repeat(".." . s:PATH_SEPARATOR, len(submatch(2)))', '') endfunction -"----------------------------------------------------------------------------- -" FUNCTIONS FOR COMPLETION ITEM: +function! s:ExistsPrompt(line, prompt) + return strlen(a:line) >= strlen(a:prompt) && a:line[:strlen(a:prompt) -1] ==# a:prompt +endfunction -function! s:FormatCompletionItem(expr, number, abbr, trim_len, time, base_pattern, evals_path_tail) - if a:evals_path_tail - let rate = s:EvaluateMatchingRate(s:SplitPath(matchstr(a:expr, '^.*[^/\\]')).tail, - \ s:SplitPath(a:base_pattern).tail) - else - let rate = s:EvaluateMatchingRate(a:expr, a:base_pattern) - endif - return { - \ 'word' : a:expr, - \ 'abbr' : s:TrimLast((a:number >= 0 ? printf('%2d: ', a:number) : '') . a:abbr, a:trim_len), - \ 'menu' : printf('%s[%s]', (len(a:time) ? a:time . ' ' : ''), s:MakeRateStar(rate, 5)), - \ 'ranks' : [-rate, (a:number >= 0 ? a:number : a:expr)] - \ } +function! s:RemovePrompt(line, prompt) + return a:line[(s:ExistsPrompt(a:line, a:prompt) ? strlen(a:prompt) : 0):] endfunction -function! s:EvaluateMatchingRate(expr, pattern) - if a:expr == a:pattern - return s:MATCHING_RATE_BASE - endif +function! s:RestorePrompt(line, prompt) + let i = 0 + while i < len(a:prompt) && i < len(a:line) && a:prompt[i] ==# a:line[i] + let i += 1 + endwhile + return a:prompt . a:line[i : ] +endfunction + +" FUNCTIONS: COMPLETION ITEM: ------------------------------------------- {{{1 + +" returns [v(1), v(2), ..., v(n) ] , v(i) < v(i+1) , v(1) > v(n)/2 +function! s:MakeAscendingValues(n, total) + let values = range(a:n, a:n * 2 - 1) + let sum = 0 + for val in values + let sum += val + endfor + return map(values, 'v:val * a:total / sum') +endfunction + +" a range of return value is [0, s:MATCHING_RATE_BASE] +function! s:EvaluateMatchingRate(word, base) let rate = 0 - let rate_increment = (s:MATCHING_RATE_BASE * 9) / (len(a:pattern) * 10) " zero divide ok - let matched = 1 - let i_pattern = 0 - for i_expr in range(len(a:expr)) - if a:expr[i_expr] == a:pattern[i_pattern] - let rate += rate_increment + let scores = s:MakeAscendingValues(len(a:word), s:MATCHING_RATE_BASE) + let matched = 0 + let skip_penalty = 1 + let i_base = 0 + for i_word in range(len(a:word)) + if i_base >= len(a:base) + let skip_penalty = skip_penalty * 2 + break + elseif a:word[i_word] == a:base[i_base] + let rate += scores[i_word] let matched = 1 - let i_pattern += 1 - if i_pattern >= len(a:pattern) - break - endif + let i_base += 1 elseif matched - let rate_increment = rate_increment / 2 + let skip_penalty = skip_penalty * 2 let matched = 0 endif endfor - return rate + return rate / skip_penalty endfunction -function! s:MakeRateStar(rate, base) - let len = (a:base * a:rate) / s:MATCHING_RATE_BASE - return repeat('*', len) . repeat('.', a:base - len) +" +function! s:EvaluateLearningRank(word, stats) + for i in range(len(a:stats)) + if a:stats[i].word ==# a:word + return i + endif + endfor + return len(a:stats) endfunction -"----------------------------------------------------------------------------- -" MISC FUNCTIONS: + +" FUNCTIONS: COMMANDLINE ------------------------------------------------ {{{1 + +function! s:EchoWithHl(msg, hl) + execute "echohl " . a:hl + echo a:msg + echohl None +endfunction + +function! s:InputHl(prompt, text, hl) + execute "echohl " . a:hl + let s = input(a:prompt, a:text) + echohl None + return s +endfunction + +" FUNCTIONS: FUZZYFIDNER WINDOW ----------------------------------------- {{{1 + +function! s:HighlightPrompt(prompt, highlight) + syntax clear + execute printf('syntax match %s /^\V%s/', a:highlight, escape(a:prompt, '\')) +endfunction + +function! s:HighlightError() + syntax clear + syntax match Error /^.*$/ +endfunction + +" FUNCTIONS: TAG -------------------------------------------------------- {{{1 + +function! s:GetTagList(tagfile) + let result = map(readfile(a:tagfile), 'matchstr(v:val, ''^[^!\t][^\t]*'')') + return filter(result, 'v:val =~ ''\S''') +endfunction + +function! s:GetTaggedFileList(tagfile) + execute 'cd ' . fnamemodify(a:tagfile, ':h') + let result = map(readfile(a:tagfile), 'fnamemodify(matchstr(v:val, ''^[^!\t][^\t]*\t\zs[^\t]\+''), '':p:~'')') + cd - + return filter(result, 'v:val =~ ''[^/\\ ]$''') +endfunction + +function! s:GetCurrentTagFiles() + return sort(filter(map(tagfiles(), 'fnamemodify(v:val, '':p'')'), 'filereadable(v:val)')) +endfunction + +" FUNCTIONS: MISC ------------------------------------------------------- {{{1 function! s:IsAvailableMode(mode) return exists('a:mode.mode_available') && a:mode.mode_available @@ -631,17 +735,13 @@ function! s:OnCmdCR() call m.on_command_pre(getcmdtype() . getcmdline()) endfor " lets last entry become the newest in the history - if getcmdtype() =~ '[:/=@]' - call histadd(getcmdtype(), getcmdline()) - endif - + call histadd(getcmdtype(), getcmdline()) " this is not mapped again (:help recursive_mapping) return "\<CR>" endfunction function! s:ExpandAbbrevMap(base, abbrev_map) let result = [a:base] - " expand for [pattern, sub_list] in items(a:abbrev_map) let exprs = result @@ -650,7 +750,6 @@ function! s:ExpandAbbrevMap(base, abbrev_map) let result += map(copy(sub_list), 'substitute(expr, pattern, v:val, "g")') endfor endfor - return s:Unique(result) endfunction @@ -659,14 +758,12 @@ function! s:ExpandEx(dir) if a:dir !~ '\S' return [''] endif - " [ ["foo/"], ["**/", "./" ], ["bar/"] ] let lists = [] for i in split(a:dir, '[/\\]\zs') let m = matchlist(i, '^\*\{2,}$[/\\]*$$') call add(lists, (empty(m) ? [i] : [i, '.' . m[1]])) endfor - " expand wlidcards return split(join(map(s:CartesianProduct(lists), 'expand(join(v:val, ""))'), "\n"), "\n") endfunction @@ -675,10 +772,10 @@ function! s:EnumExpandedDirsEntries(dir, excluded) let dirs = s:ExpandEx(a:dir) let entries = s:Concat(map(copy(dirs), 'split(glob(v:val . ".*"), "\n") + ' . \ 'split(glob(v:val . "*" ), "\n")')) - if len(dirs) <= 1 - call map(entries, 'extend(s:SplitPath(v:val), { "suffix" : (isdirectory(v:val) ? s:PATH_SEPARATOR : ""), "head" : a:dir })') - else + if len(dirs) > 1 call map(entries, 'extend(s:SplitPath(v:val), { "suffix" : (isdirectory(v:val) ? s:PATH_SEPARATOR : "") })') + else + call map(entries, 'extend(s:SplitPath(v:val), { "suffix" : (isdirectory(v:val) ? s:PATH_SEPARATOR : ""), "head" : a:dir })') endif if len(a:excluded) call filter(entries, '(v:val.head . v:val.tail . v:val.suffix) !~ a:excluded') @@ -686,29 +783,50 @@ function! s:EnumExpandedDirsEntries(dir, excluded) return entries endfunction -function! s:GetTagList(tagfile) - return map(readfile(a:tagfile), 'matchstr(v:val, ''^[^!\t][^\t]*'')') +function! s:GetBufIndicator(nr) + if !getbufvar(a:nr, '&modifiable') + return '[-]' + elseif getbufvar(a:nr, '&modified') + return '[+]' + elseif getbufvar(a:nr, '&readonly') + return '[R]' + else + return ' ' + endif endfunction -function! s:GetTaggedFileList(tagfile) - execute 'cd ' . fnamemodify(a:tagfile, ':h') - let result = map(readfile(a:tagfile), 'fnamemodify(matchstr(v:val, ''^[^!\t][^\t]*\t\zs[^\t]\+''), '':p:~'')') - cd - - return result +function! s:ModifyWordAsFilename(item, mods) + let a:item.word = fnamemodify(a:item.word, a:mods) + return a:item endfunction -function! s:HighlightPrompt(prompt, highlight) - syntax clear - execute printf('syntax match %s /^\V%s/', a:highlight, escape(a:prompt, '\')) +function! s:SetFormattedTimeToMenu(item, format) + let a:item.menu = strftime(a:format, a:item.time) + return a:item endfunction -function! s:HighlightError() - syntax clear - syntax match Error /^.*$/ +function! s:SetRanks(item, eval_word, eval_base, stats) + "let eval_word = (a:is_path ? s:SplitPath(matchstr(a:item.word, '^.*[^/\\]')).tail : a:item.word) + "let eval_base = (a:is_path ? s:SplitPath(a:base).tail : a:base) + let rank_perfect = (a:eval_word == a:eval_base ? 0 : 1) + if a:eval_word == a:eval_base + let rank_perfect = 1 + let rank_matching = 0 + else + let rank_perfect = 2 + let rank_matching = -s:EvaluateMatchingRate(a:eval_word, a:eval_base) + endif + let a:item.ranks = [ rank_perfect, s:EvaluateLearningRank(a:item.word, a:stats), rank_matching, a:item.index ] + return a:item +endfunction + +function! s:SetFormattedAbbr(item, key, trim_len) + let a:item.abbr = s:TrimLast(printf('%3d: %s', a:item.index, a:item[a:key]), a:trim_len) + return a:item endfunction function! s:CompareTimeDescending(i1, i2) - return a:i1.time == a:i2.time ? 0 : a:i1.time > a:i2.time ? -1 : +1 + return a:i1.time == a:i2.time ? 0 : a:i1.time > a:i2.time ? -1 : +1 endfunction function! s:CompareRanks(i1, i2) @@ -724,40 +842,77 @@ function! s:CompareRanks(i1, i2) return 0 endfunction -function! s:GetCurrentTagFiles() - return sort(filter(map(tagfiles(), 'fnamemodify(v:val, '':p'')'), 'filereadable(v:val)')) +function! s:GetLinePattern(lnum) + return '\C\V\^' . escape(getline(a:lnum), '\') . '\$' +endfunction + +" opens a:path and jumps to the line matching to a:pattern from a:lnum within +" a:range. if not found, jumps to a:lnum. +function! s:JumpToBookmark(path, mode, pattern, lnum, range) + call s:OpenFile(a:path, a:mode) + let ln = a:lnum + for i in range(0, a:range) + if a:lnum + i <= line('$') && getline(a:lnum + i) =~ a:pattern + let ln += i + break + elseif a:lnum - i >= 1 && getline(a:lnum - i) =~ a:pattern + let ln -= i + break + endif + endfor + call cursor(ln, 0) + normal! zvzz +endfunction + +function! s:OpenBuffer(nr, mode) + execute printf([ + \ ':%sbuffer', + \ ':%ssbuffer', + \ ':vertical :%ssbuffer', + \ ':tab :%ssbuffer', + \ ][a:mode], a:nr) +endfunction + +function! s:OpenFile(path, mode) + let nr = bufnr('^' . a:path . '$') + if nr > -1 + call s:OpenBuffer(nr, a:mode) + else + execute [ + \ ':edit ', + \ ':split ', + \ ':vsplit ', + \ ':tabedit ', + \ ][a:mode] . s:EscapeFilename(a:path) + endif endfunction " }}}1 "============================================================================= -" OBJECT: {{{1 -"----------------------------------------------------------------------------- +" OBJECT: g:FuzzyFinderMode.Base ---------------------------------------- {{{1 let g:FuzzyFinderMode = { 'Base' : {} } -function! g:FuzzyFinderMode.Base.launch(initial_text, partial_matching, prev_bufnr, tag_files) +function! g:FuzzyFinderMode.Base.launch(initial_text, partial_matching) " initializes this object call self.extend_options() let self.partial_matching = a:partial_matching - let self.prev_bufnr = a:prev_bufnr - let self.tag_files = a:tag_files " to get local value of current buffer + let self.prev_bufnr = bufnr('%') let self.last_col = -1 call s:InfoFileManager.load() if !s:IsAvailableMode(self) echo 'This mode is not available: ' . self.to_str() return endif - + call self.on_mode_enter_pre() call s:WindowManager.activate(self.make_complete_func('CompleteFunc')) call s:OptionManager.set('completeopt', 'menuone') call s:OptionManager.set('ignorecase', self.ignore_case) - " local autocommands augroup FuzzyfinderLocal autocmd! execute 'autocmd CursorMovedI <buffer> call ' . self.to_str('on_cursor_moved_i()') execute 'autocmd InsertLeave <buffer> nested call ' . self.to_str('on_insert_leave()' ) augroup END - " local mapping for [lhs, rhs] in [ \ [ self.key_open , self.to_str('on_cr(0, 0)' ) ], @@ -773,50 +928,43 @@ function! g:FuzzyFinderMode.Base.launch(initial_text, partial_matching, prev_buf " hacks to be able to use feedkeys(). execute printf('inoremap <buffer> <silent> %s <C-r>=%s ? "" : ""<CR>', lhs, rhs) endfor - - call self.on_mode_enter() - " Starts Insert mode and makes CursorMovedI event now. Command prompt is " needed to forces a completion menu to update every typing. call setline(1, self.prompt . a:initial_text) + call self.on_mode_enter_post() call feedkeys("A", 'n') " startinsert! does not work in InsertLeave handler endfunction function! g:FuzzyFinderMode.Base.on_cursor_moved_i() - let ln = getline('.') - let cl = col('.') - if !self.exists_prompt(ln) - " if command prompt is removed - "call setline('.', self.prompt . ln) - call setline('.', self.restore_prompt(ln)) - call feedkeys(repeat("\<Right>", len(getline('.')) - len(ln)), 'n') - elseif cl <= len(self.prompt) + if !s:ExistsPrompt(getline('.'), self.prompt) + call setline('.', s:RestorePrompt(getline('.'), self.prompt)) + call feedkeys("\<End>", 'n') + elseif col('.') <= len(self.prompt) " if the cursor is moved before command prompt - call feedkeys(repeat("\<Right>", len(self.prompt) - cl + 1), 'n') - elseif cl > strlen(ln) && cl != self.last_col + call feedkeys(repeat("\<Right>", len(self.prompt) - col('.') + 1), 'n') + elseif col('.') > strlen(getline('.')) && col('.') != self.last_col " if the cursor is placed on the end of the line and has been actually moved. - let self.last_col = cl + let self.last_col = col('.') + let self.last_base = s:RemovePrompt(getline('.'), self.prompt) call feedkeys("\<C-x>\<C-u>", 'n') endif endfunction function! g:FuzzyFinderMode.Base.on_insert_leave() - let text = getline('.') - call self.on_mode_leave() - call self.empty_cache_if_existed(0) + let last_pattern = s:RemovePrompt(getline('.'), self.prompt) call s:OptionManager.restore_all() call s:WindowManager.deactivate() - + if exists('s:reserved_command') + call self.on_open(s:reserved_command[0], s:reserved_command[1]) + unlet s:reserved_command + endif + call self.on_mode_leave_post() + call self.empty_cache_if_existed(0) " switchs to next mode, or finishes fuzzyfinder. if exists('s:reserved_switch_mode') let m = self.next_mode(s:reserved_switch_mode < 0) - call m.launch(self.remove_prompt(text), self.partial_matching, self.prev_bufnr, self.tag_files) + call m.launch(last_pattern, self.partial_matching) unlet s:reserved_switch_mode - else - if exists('s:reserved_command') - call feedkeys(self.on_open(s:reserved_command[0], s:reserved_command[1]), 'n') - unlet s:reserved_command - endif endif endfunction @@ -829,13 +977,19 @@ endfunction function! g:FuzzyFinderMode.Base.on_command_pre(cmd) endfunction -function! g:FuzzyFinderMode.Base.on_cr(index, check_dir) +function! g:FuzzyFinderMode.Base.on_cr(index, dir_check) if pumvisible() call feedkeys(printf("\<C-y>\<C-r>=%s(%d, 1) ? '' : ''\<CR>", self.to_str('on_cr'), a:index), 'n') - elseif !a:check_dir || getline('.') !~ '[/\\]$' - let s:reserved_command = [self.remove_prompt(getline('.')), a:index] - call feedkeys("\<Esc>", 'n') + return + endif + if !empty(self.last_base) + call self.add_stat(self.last_base, s:RemovePrompt(getline('.'), self.prompt)) + endif + if a:dir_check && getline('.') =~ '[/\\]$' + return endif + let s:reserved_command = [s:RemovePrompt(getline('.'), self.prompt), a:index] + call feedkeys("\<Esc>", 'n') " stopinsert behavior is strange... endfunction function! g:FuzzyFinderMode.Base.on_bs() @@ -846,24 +1000,25 @@ function! g:FuzzyFinderMode.Base.on_bs() call feedkeys((pumvisible() ? "\<C-e>" : "") . repeat("\<BS>", bs_count), 'n') endfunction -function! g:FuzzyFinderMode.Base.on_mode_enter() +" Before entering Fuzzyfinder buffer. This function should return in a short time. +function! g:FuzzyFinderMode.Base.on_mode_enter_pre() endfunction -function! g:FuzzyFinderMode.Base.on_mode_leave() +" After entering Fuzzyfinder buffer. +function! g:FuzzyFinderMode.Base.on_mode_enter_post() +endfunction + +" After leaving Fuzzyfinder buffer. +function! g:FuzzyFinderMode.Base.on_mode_leave_post() endfunction function! g:FuzzyFinderMode.Base.on_open(expr, mode) - return [ - \ ':edit ', - \ ':split ', - \ ':vsplit ', - \ ':tabedit ', - \ ][a:mode] . s:EscapeFilename(a:expr) . "\<CR>" + call s:OpenFile(a:expr, a:mode) endfunction function! g:FuzzyFinderMode.Base.on_switch_mode(next_prev) let s:reserved_switch_mode = a:next_prev - call feedkeys("\<Esc>", 'n') + call feedkeys("\<Esc>", 'n') " stopinsert behavior is strange... endfunction function! g:FuzzyFinderMode.Base.on_switch_ignore_case() @@ -873,35 +1028,51 @@ function! g:FuzzyFinderMode.Base.on_switch_ignore_case() call self.on_cursor_moved_i() endfunction -" export string list +" export mode-specific information as string list function! g:FuzzyFinderMode.Base.serialize_info() - let header = self.to_key() . "\t" - return map(copy(self.info), 'header . string(v:val)') + let header_data = self.to_key() . ".data\t" + let header_stats = self.to_key() . ".stats\t" + return map(copy(self.data ), 'header_data . string(v:val)') + + \ map(copy(self.stats), 'header_stats . string(v:val)') endfunction -" import related items from string list +" import mode-specific information from string list function! g:FuzzyFinderMode.Base.deserialize_info(lines) - let header = self.to_key() . "\t" - let self.info = map(filter(copy(a:lines), 'v:val[: len(header) - 1] ==# header'), - \ 'eval(v:val[len(header) :])') + let header_data = self.to_key() . ".data\t" + let header_stats = self.to_key() . ".stats\t" + let self.data = map(filter(copy(a:lines), 'v:val[: len(header_data ) - 1] ==# header_data '), + \ 'eval(v:val[len(header_data ) :])') + let self.stats = map(filter(copy(a:lines), 'v:val[: len(header_stats) - 1] ==# header_stats'), + \ 'eval(v:val[len(header_stats) :])') + call filter(self.stats, '!empty(v:val.base)') " NOTE: remove this line someday +endfunction + +function! g:FuzzyFinderMode.Base.add_stat(base, word) + call s:InfoFileManager.load() + let stat = { 'base' : a:base, 'word' : a:word } + call filter(self.stats, 'v:val !=# stat') + call insert(self.stats, stat) + let self.stats = self.stats[0 : self.learning_limit - 1] + call s:InfoFileManager.save() endfunction function! g:FuzzyFinderMode.Base.complete(findstart, base) if a:findstart return 0 - elseif !self.exists_prompt(a:base) || len(self.remove_prompt(a:base)) < self.min_length + elseif !s:ExistsPrompt(a:base, self.prompt) || len(s:RemovePrompt(a:base, self.prompt)) < self.min_length return [] endif call s:HighlightPrompt(self.prompt, self.prompt_highlight) " FIXME: ExpandAbbrevMap duplicates index let result = [] - for expanded_base in s:ExpandAbbrevMap(self.remove_prompt(a:base), self.abbrev_map) + for expanded_base in s:ExpandAbbrevMap(s:RemovePrompt(a:base, self.prompt), self.abbrev_map) let result += self.on_complete(expanded_base) endfor call sort(result, 's:CompareRanks') - if empty(result) + if empty(result) || len(result) >= self.enumerating_limit call s:HighlightError() - else + endif + if !empty(result) call feedkeys("\<C-p>\<Down>", 'n') endif return result @@ -932,58 +1103,24 @@ function! g:FuzzyFinderMode.Base.make_pattern(base) let wi .= char endif endfor - if wi !~ '[*?]$' let wi .= '*' endif - let re = s:ConvertWildcardToRegexp(wi) - if self.migemo_support && a:base !~ '[^\x01-\x7e]' let re .= '\|\m.*' . substitute(migemo(a:base), '\\_s\*', '.*', 'g') . '.*' endif - return { 'base': a:base, 'wi':wi, 're': re } endif endfunction -" glob with caching-feature, etc. -function! g:FuzzyFinderMode.Base.glob_ex(dir, file, excluded, index, matching_limit) - let key = fnamemodify(a:dir, ':p') - call extend(self, { 'cache' : {} }, 'keep') - if !exists('self.cache[key]') - echo 'Caching file list...' - let self.cache[key] = s:EnumExpandedDirsEntries(key, a:excluded) - call s:ExtendIndexToEach(self.cache[key], 1) - endif - echo 'Filtering file list...' - "return map(s:FilterEx(self.cache[key], 'v:val.tail =~ ' . string(a:file), a:matching_limit), - return map(s:FilterMatching(self.cache[key], 'tail', a:file, a:index, a:matching_limit), - \ '{ "index" : v:val.index, "path" : (v:val.head == key ? a:dir : v:val.head) . v:val.tail . v:val.suffix }') -endfunction - -function! g:FuzzyFinderMode.Base.glob_dir_ex(dir, file, excluded, index, matching_limit) - let key = fnamemodify(a:dir, ':p') - call extend(self, { 'cache' : {} }, 'keep') - if !exists('self.cache[key]') - echo 'Caching file list...' - let self.cache[key] = filter(s:EnumExpandedDirsEntries(key, a:excluded), 'len(v:val.suffix)') - call insert(self.cache[key], { 'head' : key, 'tail' : '..', 'suffix' : s:PATH_SEPARATOR }) - call insert(self.cache[key], { 'head' : key, 'tail' : '.' , 'suffix' : '' }) - call s:ExtendIndexToEach(self.cache[key], 1) - endif - echo 'Filtering file list...' - "return map(s:FilterEx(self.cache[key], 'v:val.tail =~ ' . string(a:file), a:matching_limit), - return map(s:FilterMatching(self.cache[key], 'tail', a:file, a:index, a:matching_limit), - \ '{ "index" : v:val.index, "path" : (v:val.head == key ? a:dir : v:val.head) . v:val.tail . v:val.suffix }') +function! g:FuzzyFinderMode.Base.get_filtered_stats(base) + return filter(copy(self.stats), 'v:val.base ==# a:base') endfunction function! g:FuzzyFinderMode.Base.empty_cache_if_existed(force) if exists('self.cache') && (a:force || !exists('self.lasting_cache') || !self.lasting_cache) unlet self.cache - "let self.cache = (type(self.cache) == type({}) ? {} : - " \ type(self.cache) == type([]) ? [] : - " \ type(self.cache) == type('') ? '' : 0) endif endfunction @@ -998,7 +1135,6 @@ endfunction " takes in g:FuzzyFinderOptions function! g:FuzzyFinderMode.Base.extend_options() - let n = filter(keys(g:FuzzyFinderMode), 'g:FuzzyFinderMode[v:val] is self')[0] call extend(self, g:FuzzyFinderOptions.Base, 'force') call extend(self, g:FuzzyFinderOptions[self.to_key()], 'force') endfunction @@ -1016,47 +1152,32 @@ function! g:FuzzyFinderMode.Base.next_mode(rev) " vim crashed using map() endfunction -function! g:FuzzyFinderMode.Base.exists_prompt(in) - return strlen(a:in) >= strlen(self.prompt) && a:in[:strlen(self.prompt) -1] ==# self.prompt -endfunction - -function! g:FuzzyFinderMode.Base.remove_prompt(in) - return a:in[(self.exists_prompt(a:in) ? strlen(self.prompt) : 0):] -endfunction - -function! g:FuzzyFinderMode.Base.restore_prompt(in) - let i = 0 - while i < len(self.prompt) && i < len(a:in) && self.prompt[i] ==# a:in[i] - let i += 1 - endwhile - return self.prompt . a:in[i : ] -endfunction - -"----------------------------------------------------------------------------- +" OBJECT: g:FuzzyFinderMode.Buffer -------------------------------------- {{{1 let g:FuzzyFinderMode.Buffer = copy(g:FuzzyFinderMode.Base) function! g:FuzzyFinderMode.Buffer.on_complete(base) let patterns = self.make_pattern(a:base) - let result = s:FilterMatching(self.cache, 'path', patterns.re, s:SuffixNumber(patterns.base), 0) - return map(result, 's:FormatCompletionItem(v:val.path, v:val.index, v:val.path, self.trim_length, v:val.time, a:base, 1)') + let base_tail = s:SplitPath(a:base).tail + let stats = self.get_filtered_stats(a:base) + let result = s:FilterMatching(self.items, 'word', patterns.re, s:SuffixNumber(patterns.base), self.enumerating_limit) + return map(result, 's:SetRanks(v:val, s:SplitPath(matchstr(v:val.word, ''^.*[^/\\]'')).tail, base_tail, stats)') endfunction function! g:FuzzyFinderMode.Buffer.on_open(expr, mode) - " attempts to convert the path to the number for handling unnamed buffer - return printf([ - \ ':%sbuffer', - \ ':%ssbuffer', - \ ':vertical :%ssbuffer', - \ ':tab :%ssbuffer', - \ ][a:mode] . "\<CR>", filter(self.cache, 'v:val.path == a:expr')[0].buf_nr) + " filter the selected item to get the buffer number for handling unnamed buffer + call filter(self.items, 'v:val.word ==# a:expr') + if !empty(self.items) + call s:OpenBuffer(self.items[0].buf_nr, a:mode) + endif endfunction -function! g:FuzzyFinderMode.Buffer.on_mode_enter() - let self.cache = map(filter(range(1, bufnr('$')), 'buflisted(v:val) && v:val != self.prev_bufnr'), +function! g:FuzzyFinderMode.Buffer.on_mode_enter_post() + let self.items = map(filter(range(1, bufnr('$')), 'buflisted(v:val) && v:val != self.prev_bufnr'), \ 'self.make_item(v:val)') if self.mru_order - call s:ExtendIndexToEach(sort(self.cache, 's:CompareTimeDescending'), 1) + call s:MapToSetSerialIndex(sort(self.items, 's:CompareTimeDescending'), 1) endif + call map(self.items, 's:SetFormattedAbbr(v:val, "abbr", self.trim_length)') endfunction function! g:FuzzyFinderMode.Buffer.on_buf_enter() @@ -1068,69 +1189,101 @@ function! g:FuzzyFinderMode.Buffer.on_buf_write_post() endfunction function! g:FuzzyFinderMode.Buffer.update_buf_times() - if !exists('self.buf_times') - let self.buf_times = {} - endif + call extend(self, { 'buf_times' : {} }, 'keep') let self.buf_times[bufnr('%')] = localtime() endfunction function! g:FuzzyFinderMode.Buffer.make_item(nr) + let path = (empty(bufname(a:nr)) ? '[No Name]' : fnamemodify(bufname(a:nr), ':~:.')) + let time = (exists('self.buf_times[a:nr]') ? self.buf_times[a:nr] : 0) return { \ 'index' : a:nr, \ 'buf_nr' : a:nr, - \ 'path' : empty(bufname(a:nr)) ? '[No Name]' : fnamemodify(bufname(a:nr), ':~:.'), - \ 'time' : (exists('self.buf_times[a:nr]') ? strftime(self.time_format, self.buf_times[a:nr]) : ''), + \ 'word' : path, + \ 'abbr' : s:GetBufIndicator(a:nr) . ' ' . path, + \ 'menu' : strftime(self.time_format, time), + \ 'time' : time, \ } endfunction -"----------------------------------------------------------------------------- +" 'edit'/'split'/'vsplit'/'tabedit' +function! g:FuzzyFinderMode.Buffer.jump_to(item, cmd_open) +endfunction + +" OBJECT: g:FuzzyFinderMode.File ---------------------------------------- {{{1 let g:FuzzyFinderMode.File = copy(g:FuzzyFinderMode.Base) function! g:FuzzyFinderMode.File.on_complete(base) let base = s:ExpandTailDotSequenceToParentDir(a:base) let patterns = map(s:SplitPath(base), 'self.make_pattern(v:val)') - let result = self.glob_ex(patterns.head.base, patterns.tail.re, self.excluded_path, s:SuffixNumber(patterns.tail.base), self.matching_limit) - let result = filter(result, 'bufnr("^" . v:val.path . "$") != self.prev_bufnr') - if len(result) >= self.matching_limit - call s:HighlightError() + let stats = self.get_filtered_stats(a:base) + let result = self.cached_glob(patterns.head.base, patterns.tail.re, self.excluded_path, s:SuffixNumber(patterns.tail.base), self.enumerating_limit) + let result = filter(result, 'bufnr("^" . v:val.word . "$") != self.prev_bufnr') + return map(result, 's:SetRanks(v:val, s:SplitPath(matchstr(v:val.word, ''^.*[^/\\]'')).tail, patterns.tail.base, stats)') +endfunction + +function! g:FuzzyFinderMode.File.cached_glob(dir, file, excluded, index, limit) + let key = fnamemodify(a:dir, ':p') + call extend(self, { 'cache' : {} }, 'keep') + if !exists('self.cache[key]') + echo 'Caching file list...' + let self.cache[key] = s:EnumExpandedDirsEntries(key, a:excluded) + call s:MapToSetSerialIndex(self.cache[key], 1) endif - return map(result, 's:FormatCompletionItem(v:val.path, v:val.index, v:val.path, self.trim_length, "", base, 1)') + echo 'Filtering file list...' + let result = s:FilterMatching(self.cache[key], 'tail', a:file, a:index, a:limit) + call map(result, '{ "index" : v:val.index, "word" : (v:val.head == key ? a:dir : v:val.head) . v:val.tail . v:val.suffix }') + return map(result, 's:SetFormattedAbbr(v:val, "word", self.trim_length)') endfunction -"----------------------------------------------------------------------------- +" OBJECT: g:FuzzyFinderMode.Dir ----------------------------------------- {{{1 let g:FuzzyFinderMode.Dir = copy(g:FuzzyFinderMode.Base) function! g:FuzzyFinderMode.Dir.on_complete(base) let base = s:ExpandTailDotSequenceToParentDir(a:base) let patterns = map(s:SplitPath(base), 'self.make_pattern(v:val)') - let result = self.glob_dir_ex(patterns.head.base, patterns.tail.re, self.excluded_path, s:SuffixNumber(patterns.tail.base), 0) - return map(result, 's:FormatCompletionItem(v:val.path, v:val.index, v:val.path, self.trim_length, "", base, 1)') + let stats = self.get_filtered_stats(a:base) + let result = self.cached_glob_dir(patterns.head.base, patterns.tail.re, self.excluded_path, s:SuffixNumber(patterns.tail.base), self.enumerating_limit) + return map(result, 's:SetRanks(v:val, s:SplitPath(matchstr(v:val.word, ''^.*[^/\\]'')).tail, patterns.tail.base, stats)') endfunction function! g:FuzzyFinderMode.Dir.on_open(expr, mode) - return ':cd ' . escape(a:expr, ' ') . [ - \ "\<CR>", - \ "", - \ "", - \ "", - \ ][a:mode] + execute ':cd ' . s:EscapeFilename(a:expr) endfunction -"----------------------------------------------------------------------------- +function! g:FuzzyFinderMode.Dir.cached_glob_dir(dir, file, excluded, index, limit) + let key = fnamemodify(a:dir, ':p') + call extend(self, { 'cache' : {} }, 'keep') + if !exists('self.cache[key]') + echo 'Caching file list...' + let self.cache[key] = filter(s:EnumExpandedDirsEntries(key, a:excluded), 'len(v:val.suffix)') + call insert(self.cache[key], { 'head' : key, 'tail' : '..', 'suffix' : s:PATH_SEPARATOR }) + call insert(self.cache[key], { 'head' : key, 'tail' : '.' , 'suffix' : '' }) + call s:MapToSetSerialIndex(self.cache[key], 1) + endif + echo 'Filtering file list...' + let result = s:FilterMatching(self.cache[key], 'tail', a:file, a:index, a:limit) + call map(result, '{ "index" : v:val.index, "word" : (v:val.head == key ? a:dir : v:val.head) . v:val.tail . v:val.suffix }') + return map(result, 's:SetFormattedAbbr(v:val, "word", self.trim_length)') +endfunction + +" OBJECT: g:FuzzyFinderMode.MruFile ------------------------------------- {{{1 let g:FuzzyFinderMode.MruFile = copy(g:FuzzyFinderMode.Base) function! g:FuzzyFinderMode.MruFile.on_complete(base) let patterns = self.make_pattern(a:base) - let result = s:FilterMatching(self.cache, 'path', patterns.re, s:SuffixNumber(patterns.base), 0) - return map(result, 's:FormatCompletionItem(v:val.path, v:val.index, v:val.path, self.trim_length, v:val.time, a:base, 1)') + let base_tail = s:SplitPath(a:base).tail + let stats = self.get_filtered_stats(a:base) + let result = s:FilterMatching(self.items, 'word', patterns.re, s:SuffixNumber(patterns.base), self.enumerating_limit) + return map(result, 's:SetRanks(v:val, s:SplitPath(matchstr(v:val.word, ''^.*[^/\\]'')).tail, base_tail, stats)') endfunction -function! g:FuzzyFinderMode.MruFile.on_mode_enter() - let self.cache = copy(self.info) - let self.cache = filter(self.cache, 'bufnr("^" . v:val.path . "$") != self.prev_bufnr') - let self.cache = filter(self.cache, 'filereadable(v:val.path)') - let self.cache = map(self.cache, '{ "path" : fnamemodify(v:val.path, ":~:."), "time" : strftime(self.time_format, v:val.time) }') - let self.cache = s:ExtendIndexToEach(self.cache, 1) +function! g:FuzzyFinderMode.MruFile.on_mode_enter_post() + let self.items = copy(self.data) + let self.items = map(self.items, 'self.format_item_using_cache(v:val)') + let self.items = filter(self.items, '!empty(v:val) && bufnr("^" . v:val.word . "$") != self.prev_bufnr') + let self.items = s:MapToSetSerialIndex(self.items, 1) + let self.items = map(self.items, 's:SetFormattedAbbr(v:val, "word", self.trim_length)') endfunction function! g:FuzzyFinderMode.MruFile.on_buf_enter() @@ -1142,161 +1295,203 @@ function! g:FuzzyFinderMode.MruFile.on_buf_write_post() endfunction function! g:FuzzyFinderMode.MruFile.update_info() - "if !empty(&buftype) || !filereadable(expand('%')) - if !empty(&buftype) + if !empty(&buftype) || expand('%') !~ '\S' return endif call s:InfoFileManager.load() - let self.info = s:UpdateMruList(self.info, { 'path' : expand('%:p'), 'time' : localtime() }, - \ 'path', self.max_item, self.excluded_path) + let self.data = s:UpdateMruList(self.data, { 'word' : expand('%:p'), 'time' : localtime() }, + \ self.max_item, self.excluded_path) call s:InfoFileManager.save() + call self.remove_item_from_cache(expand('%:p')) endfunction -"----------------------------------------------------------------------------- +" returns empty value if invalid item +function! g:FuzzyFinderMode.MruFile.format_item_using_cache(item) + call extend(self, { 'cache' : {} }, 'keep') + if a:item.word !~ '\S' + return {} + endif + if !exists('self.cache[a:item.word]') + let self.cache[a:item.word] = + \ (filereadable(a:item.word) + \ ? s:ModifyWordAsFilename(s:SetFormattedTimeToMenu(copy(a:item), self.time_format), ':p:~') + \ : {}) + endif + return self.cache[a:item.word] +endfunction + +function! g:FuzzyFinderMode.MruFile.remove_item_from_cache(word) + if !exists('self.cache') + return + endif + for items in values(self.cache) + if exists('items[a:word]') + unlet items[a:word] + endif + endfor +endfunction + +" OBJECT: g:FuzzyFinderMode.MruCmd -------------------------------------- {{{1 let g:FuzzyFinderMode.MruCmd = copy(g:FuzzyFinderMode.Base) function! g:FuzzyFinderMode.MruCmd.on_complete(base) let patterns = self.make_pattern(a:base) - let result = s:FilterMatching(self.cache, 'command', patterns.re, s:SuffixNumber(patterns.base), 0) - return map(result, 's:FormatCompletionItem(v:val.command, v:val.index, v:val.command, self.trim_length, v:val.time, a:base, 0)') + let stats = self.get_filtered_stats(a:base) + let result = s:FilterMatching(self.items, 'word', patterns.re, s:SuffixNumber(patterns.base), self.enumerating_limit) + return map(result, 's:SetRanks(v:val, v:val.word, a:base, stats)') endfunction function! g:FuzzyFinderMode.MruCmd.on_open(expr, mode) - redraw - " use feedkeys to remap <CR> - return a:expr . [ - \ "\<C-r>=feedkeys(\"\\<CR>\", 'm')?'':''\<CR>", - \ "", - \ "", - \ "", - \ ][a:mode] + call self.update_info(a:expr) + call histadd(a:expr[0], a:expr[1:]) + call feedkeys(a:expr . "\<CR>", 'n') endfunction -function! g:FuzzyFinderMode.MruCmd.on_mode_enter() - let self.cache = s:ExtendIndexToEach(map(copy(self.info), - \ '{ "command" : v:val.command, "time" : strftime(self.time_format, v:val.time) }'), 1) +function! g:FuzzyFinderMode.MruCmd.on_mode_enter_post() + let self.items = copy(self.data) + let self.items = map(self.items, 's:SetFormattedTimeToMenu(v:val, self.time_format)') + let self.items = s:MapToSetSerialIndex(self.items, 1) + let self.items = map(self.items, 's:SetFormattedAbbr(v:val, "word", self.trim_length)') endfunction function! g:FuzzyFinderMode.MruCmd.on_command_pre(cmd) - call self.update_info(a:cmd) + if getcmdtype() =~ '^[:/?]' + call self.update_info(a:cmd) + endif endfunction function! g:FuzzyFinderMode.MruCmd.update_info(cmd) call s:InfoFileManager.load() - let self.info = s:UpdateMruList(self.info, { 'command' : a:cmd, 'time' : localtime() }, - \ 'command', self.max_item, self.excluded_command) + let self.data = s:UpdateMruList(self.data, { 'word' : a:cmd, 'time' : localtime() }, + \ self.max_item, self.excluded_command) call s:InfoFileManager.save() endfunction -"----------------------------------------------------------------------------- -let g:FuzzyFinderMode.FavFile = copy(g:FuzzyFinderMode.Base) +" OBJECT: g:FuzzyFinderMode.Bookmark ------------------------------------- {{{1 +let g:FuzzyFinderMode.Bookmark = copy(g:FuzzyFinderMode.Base) -function! g:FuzzyFinderMode.FavFile.on_complete(base) +function! g:FuzzyFinderMode.Bookmark.on_complete(base) let patterns = self.make_pattern(a:base) - let result = s:FilterMatching(self.cache, 'path', patterns.re, s:SuffixNumber(patterns.base), 0) - return map(result, 's:FormatCompletionItem(v:val.path, v:val.index, v:val.path, self.trim_length, v:val.time, a:base, 1)') + let stats = self.get_filtered_stats(a:base) + let result = s:FilterMatching(self.items, 'word', patterns.re, s:SuffixNumber(patterns.base), self.enumerating_limit) + return map(result, 's:SetRanks(v:val, v:val.word, a:base, stats)') endfunction -function! g:FuzzyFinderMode.FavFile.on_mode_enter() - let self.cache = copy(self.info) - let self.cache = filter(self.cache, 'bufnr("^" . v:val.path . "$") != self.prev_bufnr') - let self.cache = map(self.cache, '{ "path" : fnamemodify(v:val.path, ":~:."), "time" : strftime(self.time_format, v:val.time) }') - let self.cache = s:ExtendIndexToEach(self.cache, 1) +function! g:FuzzyFinderMode.Bookmark.on_open(expr, mode) + call filter(self.items, 'v:val.word ==# a:expr') + if empty(self.items) + return '' + endif + call s:JumpToBookmark(self.items[0].path, a:mode, self.items[0].pattern, self.items[0].lnum, self.searching_range) endfunction -function! g:FuzzyFinderMode.FavFile.add(in_file, adds) - call s:InfoFileManager.load() - - let file = fnamemodify((empty(a:in_file) ? expand('%') : a:in_file), ':p:~') +function! g:FuzzyFinderMode.Bookmark.on_mode_enter_post() + let self.items = copy(self.data) + let self.items = map(self.items, 's:SetFormattedTimeToMenu(v:val, self.time_format)') + let self.items = s:MapToSetSerialIndex(self.items, 1) + let self.items = map(self.items, 's:SetFormattedAbbr(v:val, "word", self.trim_length)') +endfunction - call filter(self.info, 'v:val.path != file') - if a:adds - call add(self.info, { 'path' : file, 'time' : localtime() }) +function! g:FuzzyFinderMode.Bookmark.bookmark_here(word) + if !empty(&buftype) || expand('%') !~ '\S' + call s:EchoWithHl('Can''t bookmark this buffer.', 'WarningMsg') + return endif - + let item = { + \ 'word' : (a:word =~ '\S' ? substitute(a:word, '\n', ' ', 'g') + \ : pathshorten(expand('%:p:~')) . '|' . line('.') . '| ' . getline('.')), + \ 'path' : expand('%:p'), + \ 'lnum' : line('.'), + \ 'pattern' : s:GetLinePattern(line('.')), + \ 'time' : localtime(), + \ } + let item.word = s:InputHl('Bookmark as:', item.word, 'Question') + if item.word !~ '\S' + call s:EchoWithHl('Canceled', 'WarningMsg') + return + endif + call s:InfoFileManager.load() + call insert(self.data, item) call s:InfoFileManager.save() endfunction -"----------------------------------------------------------------------------- +" OBJECT: g:FuzzyFinderMode.Tag ----------------------------------------- {{{1 let g:FuzzyFinderMode.Tag = copy(g:FuzzyFinderMode.Base) function! g:FuzzyFinderMode.Tag.on_complete(base) let patterns = self.make_pattern(a:base) - let result = self.find_tag(patterns.re, self.matching_limit) - if len(result) >= self.matching_limit - call s:HighlightError() - endif - return map(result, 's:FormatCompletionItem(v:val, -1, v:val, self.trim_length, "", a:base, 1)') + let stats = self.get_filtered_stats(a:base) + let result = self.find_tag(patterns.re, s:SuffixNumber(patterns.base), self.enumerating_limit) + return map(result, 's:SetRanks(v:val, v:val.word, a:base, stats)') endfunction function! g:FuzzyFinderMode.Tag.on_open(expr, mode) - return [ + execute [ \ ':tjump ', \ ':stjump ', \ ':vertical :stjump ', \ ':tab :stjump ', - \ ][a:mode] . a:expr . "\<CR>" + \ ][a:mode] . a:expr endfunction -function! g:FuzzyFinderMode.Tag.find_tag(pattern, matching_limit) +function! g:FuzzyFinderMode.Tag.on_mode_enter_pre() + let self.tag_files = s:GetCurrentTagFiles() +endfunction + +function! g:FuzzyFinderMode.Tag.find_tag(pattern, index, limit) if !len(self.tag_files) return [] endif - let key = join(self.tag_files, "\n") - " cache not created or tags file updated? call extend(self, { 'cache' : {} }, 'keep') if !exists('self.cache[key]') || max(map(copy(self.tag_files), 'getftime(v:val) >= self.cache[key].time')) echo 'Caching tag list...' - let self.cache[key] = { - \ 'time' : localtime(), - \ 'data' : s:Unique(s:Concat(map(copy(self.tag_files), 's:GetTagList(v:val)'))), - \ } + let items = s:Unique(s:Concat(map(copy(self.tag_files), 's:GetTagList(v:val)'))) + let items = s:MapToSetSerialIndex(map(items, '{ "word" : v:val }'), 1) + let self.cache[key] = { 'time' : localtime(), 'items' : items } endif - echo 'Filtering tag list...' - return s:FilterEx(self.cache[key].data, 'v:val =~ ' . string(a:pattern), a:matching_limit) + let result = s:FilterMatching(self.cache[key].items, 'word', a:pattern, a:index, a:limit) + return map(result, 's:SetFormattedAbbr(v:val, "word", self.trim_length)') endfunction -"----------------------------------------------------------------------------- +" OBJECT: g:FuzzyFinderMode.TaggedFile ---------------------------------- {{{1 let g:FuzzyFinderMode.TaggedFile = copy(g:FuzzyFinderMode.Base) function! g:FuzzyFinderMode.TaggedFile.on_complete(base) let patterns = self.make_pattern(a:base) + let base_tail = s:SplitPath(a:base).tail + let stats = self.get_filtered_stats(a:base) echo 'Making tagged file list...' - let result = self.find_tagged_file(patterns.re, self.matching_limit) - if len(result) >= self.matching_limit - call s:HighlightError() - endif - return map(result, 's:FormatCompletionItem(v:val, -1, v:val, self.trim_length, "", a:base, 1)') + let result = self.find_tagged_file(patterns.re, s:SuffixNumber(patterns.base), self.enumerating_limit) + return map(result, 's:SetRanks(v:val, s:SplitPath(matchstr(v:val.word, ''^.*[^/\\]'')).tail, base_tail, stats)') +endfunction + +function! g:FuzzyFinderMode.TaggedFile.on_mode_enter_pre() + let self.tag_files = s:GetCurrentTagFiles() endfunction -function! g:FuzzyFinderMode.TaggedFile.find_tagged_file(pattern, matching_limit) +function! g:FuzzyFinderMode.TaggedFile.find_tagged_file(pattern, index, limit) if !len(self.tag_files) return [] endif - let key = join(self.tag_files, "\n") - " cache not created or tags file updated? call extend(self, { 'cache' : {} }, 'keep') if !exists('self.cache[key]') || max(map(copy(self.tag_files), 'getftime(v:val) >= self.cache[key].time')) echo 'Caching tagged-file list...' - let self.cache[key] = { - \ 'time' : localtime(), - \ 'data' : s:Unique(s:Concat(map(copy(self.tag_files), 's:GetTaggedFileList(v:val)'))), - \ } + let items = s:Unique(s:Concat(map(copy(self.tag_files), 's:GetTaggedFileList(v:val)'))) + let items = s:MapToSetSerialIndex(map(items, '{ "word" : v:val }'), 1) + let self.cache[key] = { 'time' : localtime(), 'items' : items } endif - echo 'Filtering tagged-file list...' - return s:FilterEx(map(self.cache[key].data, 'fnamemodify(v:val, '':.'')'), - \ 'v:val =~ ' . string(a:pattern), - \ a:matching_limit) - + call map(self.cache[key].items, 's:ModifyWordAsFilename(v:val, '':.'')') + let result = s:FilterMatching(self.cache[key].items, 'word', a:pattern, a:index, a:limit) + return map(result, 's:SetFormattedAbbr(v:val, "word", self.trim_length)') endfunction -"----------------------------------------------------------------------------- +" OBJECT: s:OptionManager ----------------------------------------------- {{{1 " sets or restores temporary options let s:OptionManager = { 'originals' : {} } @@ -1312,29 +1507,43 @@ function! s:OptionManager.restore_all() let self.originals = {} endfunction -"----------------------------------------------------------------------------- +" OBJECT: s:WindowManager ----------------------------------------------- {{{1 " manages buffer/window for fuzzyfinder let s:WindowManager = { 'buf_nr' : -1 } function! s:WindowManager.activate(complete_func) - let self.prev_winnr = winnr() let cwd = getcwd() + let self.buf_nr = s:Open1LineBuffer(self.buf_nr, '[Fuzzyfinder]') + call s:SetLocalOptionsForFuzzyfinder(cwd, a:complete_func) + redraw " for 'lazyredraw' + if exists(':AutoComplPopLock') | execute ':AutoComplPopLock' | endif +endfunction + +function! s:WindowManager.deactivate() + if exists(':AutoComplPopUnlock') | execute ':AutoComplPopUnlock' | endif + " must close after returning to previous window + wincmd j + execute self.buf_nr . 'bdelete' +endfunction - if !bufexists(self.buf_nr) +" Returns a buffer number. Creates new buffer if a:buf_nr is a invalid number +function! s:Open1LineBuffer(buf_nr, buf_name) + if !bufexists(a:buf_nr) leftabove 1new - file `='[Fuzzyfinder]'` - let self.buf_nr = bufnr('%') - elseif bufwinnr(self.buf_nr) == -1 + execute printf('file `=%s`', string(a:buf_name)) + elseif bufwinnr(a:buf_nr) == -1 leftabove 1split - execute self.buf_nr . 'buffer' + execute a:buf_nr . 'buffer' delete _ - elseif bufwinnr(self.buf_nr) != bufwinnr('%') - execute bufwinnr(self.buf_nr) . 'wincmd w' + elseif bufwinnr(a:buf_nr) != bufwinnr('%') + execute bufwinnr(a:buf_nr) . 'wincmd w' endif + return bufnr('%') +endfunction +function! s:SetLocalOptionsForFuzzyfinder(cwd, complete_func) " countermeasure for auto-cd script - execute ':lcd ' . cwd - + execute ':lcd ' . a:cwd setlocal filetype=fuzzyfinder setlocal bufhidden=delete setlocal buftype=nofile @@ -1344,46 +1553,23 @@ function! s:WindowManager.activate(complete_func) setlocal nocursorline " for highlighting setlocal nocursorcolumn " for highlighting let &l:completefunc = a:complete_func - - redraw " for 'lazyredraw' - - " suspend autocomplpop.vim - if exists(':AutoComplPopLock') - :AutoComplPopLock - endif endfunction -function! s:WindowManager.deactivate() - " resume autocomplpop.vim - if exists(':AutoComplPopUnlock') - :AutoComplPopUnlock - endif - - close - execute self.prev_winnr . 'wincmd w' -endfunction - -"----------------------------------------------------------------------------- +" OBJECT: s:InfoFileManager --------------------------------------------- {{{1 let s:InfoFileManager = { 'originals' : {} } function! s:InfoFileManager.load() - for m in s:GetAvailableModes() - let m.info = [] - endfor - try let lines = readfile(expand(self.get_info_file())) - catch /.*/ - return - endtry - - " compatibility check - if !count(lines, self.get_info_version_line()) + " compatibility check + if !count(lines, self.get_info_version_line()) call self.warn_old_info() let g:FuzzyFinderOptions.Base.info_file = '' - return - endif - + throw 1 + endif + catch /.*/ + let lines = [] + endtry for m in s:GetAvailableModes() call m.deserialize_info(lines) endfor @@ -1394,7 +1580,6 @@ function! s:InfoFileManager.save() for m in s:GetAvailableModes() let lines += m.serialize_info() endfor - try call writefile(lines, expand(self.get_info_file())) catch /.*/ @@ -1402,24 +1587,19 @@ function! s:InfoFileManager.save() endfunction function! s:InfoFileManager.edit() - new file `='[FuzzyfinderInfo]'` let self.bufnr = bufnr('%') - setlocal filetype=vim setlocal bufhidden=delete setlocal buftype=acwrite setlocal noswapfile - augroup FuzzyfinderInfo autocmd! autocmd BufWriteCmd <buffer> call s:InfoFileManager.on_buf_write_cmd() augroup END - execute '0read ' . expand(self.get_info_file()) setlocal nomodified - endfunction function! s:InfoFileManager.on_buf_write_cmd() @@ -1433,7 +1613,7 @@ function! s:InfoFileManager.on_buf_write_cmd() endfunction function! s:InfoFileManager.get_info_version_line() - return "VERSION\t206" + return "VERSION\t217" endfunction function! s:InfoFileManager.get_info_file() @@ -1441,13 +1621,15 @@ function! s:InfoFileManager.get_info_file() endfunction function! s:InfoFileManager.warn_old_info() - echohl WarningMsg - echo printf("==================================================\n" . - \ " Your Fuzzyfinder information file is no longer \n" . - \ " supported. Please remove \n" . - \ " %-48s\n" . - \ "==================================================\n" , - \ '"' . expand(self.get_info_file()) . '".') + call s:EchoWithHl(printf("=================================================================\n" . + \ " Sorry, but your information file for Fuzzyfinder is no longer \n" . + \ " compatible with this version of Fuzzyfinder. Please remove \n" . + \ " %-63s\n" . + \ "=================================================================\n" , + \ '"' . expand(self.get_info_file()) . '".'), + \ 'WarningMsg') + echohl Question + call input('Press Enter') echohl None endfunction @@ -1459,7 +1641,7 @@ let user_options = (exists('g:FuzzyFinderOptions') ? g:FuzzyFinderOptions : {}) " }}}2 " Initializes g:FuzzyFinderOptions. -let g:FuzzyFinderOptions = { 'Base':{}, 'Buffer':{}, 'File':{}, 'Dir':{}, 'MruFile':{}, 'MruCmd':{}, 'FavFile':{}, 'Tag':{}, 'TaggedFile':{}} +let g:FuzzyFinderOptions = { 'Base':{}, 'Buffer':{}, 'File':{}, 'Dir':{}, 'MruFile':{}, 'MruCmd':{}, 'Bookmark':{}, 'Tag':{}, 'TaggedFile':{}} "----------------------------------------------------------------------------- " [All Mode] This is mapped to select completion item or finish input and " open a buffer/file in previous window. @@ -1494,6 +1676,12 @@ let g:FuzzyFinderOptions.Base.ignore_case = 1 " [All Mode] This is a string to format time string. See :help strftime() for " details. let g:FuzzyFinderOptions.Base.time_format = '(%x %H:%M:%S)' +" [All Mode] This is the ceiling for the number of completion statistics to be +" stored. +let g:FuzzyFinderOptions.Base.learning_limit = 100 +" [All Mode] To speed up the response time, Fuzzyfinder ends enumerating +" completion items when found over this. +let g:FuzzyFinderOptions.Base.enumerating_limit = 50 " [All Mode] If a length of completion item is more than this, it is trimmed " when shown in completion menu. let g:FuzzyFinderOptions.Base.trim_length = 80 @@ -1512,12 +1700,12 @@ let g:FuzzyFinderOptions.Buffer.prompt_highlight = 'Question' " [Buffer Mode] Pressing <BS> after a path separator deletes one directory " name if non-zero is set. let g:FuzzyFinderOptions.Buffer.smart_bs = 1 -" [Buffer Mode] The completion items is sorted in the order of recently used -" if non-zero is set. -let g:FuzzyFinderOptions.Buffer.mru_order = 1 " [Buffer Mode] This is used to sort modes for switching to the next/previous " mode. let g:FuzzyFinderOptions.Buffer.switch_order = 10 +" [Buffer Mode] The completion items is sorted in the order of recently used +" if non-zero is set. +let g:FuzzyFinderOptions.Buffer.mru_order = 1 "----------------------------------------------------------------------------- " [File Mode] This disables all functions of this mode if zero was set. let g:FuzzyFinderOptions.File.mode_available = 1 @@ -1533,9 +1721,6 @@ let g:FuzzyFinderOptions.File.smart_bs = 1 let g:FuzzyFinderOptions.File.switch_order = 20 " [File Mode] The items matching this are excluded from the completion list. let g:FuzzyFinderOptions.File.excluded_path = '\v\~$|\.o$|\.exe$|\.bak$|\.swp$|((^|[/\\])\.[/\\]$)' -" [File Mode] If a number of matched items was over this, the completion -" process is aborted. -let g:FuzzyFinderOptions.File.matching_limit = 200 "----------------------------------------------------------------------------- " [Directory Mode] This disables all functions of this mode if zero was set. let g:FuzzyFinderOptions.Dir.mode_available = 1 @@ -1568,8 +1753,9 @@ let g:FuzzyFinderOptions.MruFile.switch_order = 40 " [Mru-File Mode] The items matching this are excluded from the completion " list. let g:FuzzyFinderOptions.MruFile.excluded_path = '\v\~$|\.bak$|\.swp$' -" [Mru-File Mode] This is an upper limit of MRU items to be stored. -let g:FuzzyFinderOptions.MruFile.max_item = 99 +" [Mru-File Mode] This is the ceiling for the number of MRU items to be +" stored. +let g:FuzzyFinderOptions.MruFile.max_item = 200 "----------------------------------------------------------------------------- " [Mru-Cmd Mode] This disables all functions of this mode if zero was set. let g:FuzzyFinderOptions.MruCmd.mode_available = 1 @@ -1586,22 +1772,24 @@ let g:FuzzyFinderOptions.MruCmd.switch_order = 50 " [Mru-Cmd Mode] The items matching this are excluded from the completion " list. let g:FuzzyFinderOptions.MruCmd.excluded_command = '^$' -" [Mru-Cmd Mode] This is an upper limit of MRU items to be stored. -let g:FuzzyFinderOptions.MruCmd.max_item = 99 +" [Mru-Cmd Mode] This is the ceiling for the number of MRU items to be stored. +let g:FuzzyFinderOptions.MruCmd.max_item = 200 "----------------------------------------------------------------------------- -" [Favorite-File Mode] This disables all functions of this mode if zero was -" set. -let g:FuzzyFinderOptions.FavFile.mode_available = 1 -" [Favorite-File Mode] The prompt string. -let g:FuzzyFinderOptions.FavFile.prompt = '>FavFile>' -" [Favorite-File Mode] The highlight group name for a prompt string. -let g:FuzzyFinderOptions.FavFile.prompt_highlight = 'Question' -" [Favorite-File Mode] Pressing <BS> after a path separator deletes one -" directory name if non-zero is set. -let g:FuzzyFinderOptions.FavFile.smart_bs = 1 -" [Favorite-File Mode] This is used to sort modes for switching to the +" [Bookmark Mode] This disables all functions of this mode if zero was set. +let g:FuzzyFinderOptions.Bookmark.mode_available = 1 +" [Bookmark Mode] The prompt string. +let g:FuzzyFinderOptions.Bookmark.prompt = '>Bookmark>' +" [Bookmark Mode] The highlight group name for a prompt string. +let g:FuzzyFinderOptions.Bookmark.prompt_highlight = 'Question' +" [Bookmark Mode] Pressing <BS> after a path separator deletes one directory +" name if non-zero is set. +let g:FuzzyFinderOptions.Bookmark.smart_bs = 0 +" [Bookmark Mode] This is used to sort modes for switching to the " next/previous mode. -let g:FuzzyFinderOptions.FavFile.switch_order = 60 +let g:FuzzyFinderOptions.Bookmark.switch_order = 60 +" [Bookmark Mode] Fuzzyfinder searches a matching line from bookmarked +" position within this number of lines. +let g:FuzzyFinderOptions.Bookmark.searching_range = 100 "----------------------------------------------------------------------------- " [Tag Mode] This disables all functions of this mode if zero was set. let g:FuzzyFinderOptions.Tag.mode_available = 1 @@ -1617,9 +1805,6 @@ let g:FuzzyFinderOptions.Tag.smart_bs = 0 let g:FuzzyFinderOptions.Tag.switch_order = 70 " [Tag Mode] The items matching this are excluded from the completion list. let g:FuzzyFinderOptions.Tag.excluded_path = '\v\~$|\.bak$|\.swp$' -" [Tag Mode] If a number of matched items was over this, the completion -" process is aborted. -let g:FuzzyFinderOptions.Tag.matching_limit = 200 "----------------------------------------------------------------------------- " [Tagged-File Mode] This disables all functions of this mode if zero was set. let g:FuzzyFinderOptions.TaggedFile.mode_available = 1 @@ -1633,9 +1818,6 @@ let g:FuzzyFinderOptions.TaggedFile.smart_bs = 0 " [Tagged-File Mode] This is used to sort modes for switching to the " next/previous mode. let g:FuzzyFinderOptions.TaggedFile.switch_order = 80 -" [Tagged-File Mode] If a number of matched items was over this, the -" completion process is aborted. -let g:FuzzyFinderOptions.TaggedFile.matching_limit = 200 " overwrites default values of g:FuzzyFinderOptions with user-defined values - {{{2 call map(user_options, 'extend(g:FuzzyFinderOptions[v:key], v:val, ''force'')') @@ -1647,7 +1829,7 @@ call map(copy(g:FuzzyFinderMode), 'v:val.extend_options()') " COMMANDS/AUTOCOMMANDS/MAPPINGS/ETC.: {{{1 let s:PATH_SEPARATOR = (has('win32') || has('win64') ? '\' : '/') -let s:MATCHING_RATE_BASE = 10000000 +let s:MATCHING_RATE_BASE = 1000000 let s:ABBR_TRIM_MARK = '...' augroup FuzzyfinderGlobal @@ -1659,16 +1841,16 @@ augroup END " cnoremap has a problem, which doesn't expand cabbrev. cmap <silent> <expr> <CR> <SID>OnCmdCR() -command! -bang -narg=? -complete=buffer FuzzyFinderBuffer call g:FuzzyFinderMode.Buffer.launch (<q-args>, len(<q-bang>), bufnr('%'), s:GetCurrentTagFiles()) -command! -bang -narg=? -complete=file FuzzyFinderFile call g:FuzzyFinderMode.File.launch (<q-args>, len(<q-bang>), bufnr('%'), s:GetCurrentTagFiles()) -command! -bang -narg=? -complete=dir FuzzyFinderDir call g:FuzzyFinderMode.Dir.launch (<q-args>, len(<q-bang>), bufnr('%'), s:GetCurrentTagFiles()) -command! -bang -narg=? -complete=file FuzzyFinderMruFile call g:FuzzyFinderMode.MruFile.launch (<q-args>, len(<q-bang>), bufnr('%'), s:GetCurrentTagFiles()) -command! -bang -narg=? -complete=file FuzzyFinderMruCmd call g:FuzzyFinderMode.MruCmd.launch (<q-args>, len(<q-bang>), bufnr('%'), s:GetCurrentTagFiles()) -command! -bang -narg=? -complete=file FuzzyFinderFavFile call g:FuzzyFinderMode.FavFile.launch (<q-args>, len(<q-bang>), bufnr('%'), s:GetCurrentTagFiles()) -command! -bang -narg=? -complete=tag FuzzyFinderTag call g:FuzzyFinderMode.Tag.launch (<q-args>, len(<q-bang>), bufnr('%'), s:GetCurrentTagFiles()) -command! -bang -narg=? -complete=file FuzzyFinderTaggedFile call g:FuzzyFinderMode.TaggedFile.launch(<q-args>, len(<q-bang>), bufnr('%'), s:GetCurrentTagFiles()) +command! -bang -narg=? -complete=buffer FuzzyFinderBuffer call g:FuzzyFinderMode.Buffer.launch (<q-args>, len(<q-bang>)) +command! -bang -narg=? -complete=file FuzzyFinderFile call g:FuzzyFinderMode.File.launch (<q-args>, len(<q-bang>)) +command! -bang -narg=? -complete=dir FuzzyFinderDir call g:FuzzyFinderMode.Dir.launch (<q-args>, len(<q-bang>)) +command! -bang -narg=? -complete=file FuzzyFinderMruFile call g:FuzzyFinderMode.MruFile.launch (<q-args>, len(<q-bang>)) +command! -bang -narg=? -complete=file FuzzyFinderMruCmd call g:FuzzyFinderMode.MruCmd.launch (<q-args>, len(<q-bang>)) +command! -bang -narg=? -complete=file FuzzyFinderBookmark call g:FuzzyFinderMode.Bookmark.launch (<q-args>, len(<q-bang>)) +command! -bang -narg=? -complete=tag FuzzyFinderTag call g:FuzzyFinderMode.Tag.launch (<q-args>, len(<q-bang>)) +command! -bang -narg=? -complete=file FuzzyFinderTaggedFile call g:FuzzyFinderMode.TaggedFile.launch(<q-args>, len(<q-bang>)) command! -bang -narg=? -complete=file FuzzyFinderEditInfo call s:InfoFileManager.edit() -command! -bang -narg=? -complete=file FuzzyFinderAddFavFile call g:FuzzyFinderMode.FavFile.add(<q-args>, 1) +command! -bang -narg=? -complete=file FuzzyFinderAddBookmark call g:FuzzyFinderMode.Bookmark.bookmark_here(<q-args>) command! -bang -narg=0 FuzzyFinderRemoveCache for m in s:GetAvailableModes() | call m.empty_cache_if_existed(1) | endfor " }}}1 plugin/fuzzyfinder.vim @@ -4,25 +4,22 @@ if has("ruby") " COPIED FROM FUZZYFINDER.VIM {{{ " since they can't be called from outside fuzzyfinder.vim " ==================================================================================== -function! s:GetCurrentTagFiles() - return sort(filter(map(tagfiles(), 'fnamemodify(v:val, '':p'')'), 'filereadable(v:val)')) -endfunction -function! s:HighlightPrompt(prompt, highlight) - syntax clear - execute printf('syntax match %s /^\V%s/', a:highlight, escape(a:prompt, '\')) +function! s:ExistsPrompt(line, prompt) + return strlen(a:line) >= strlen(a:prompt) && a:line[:strlen(a:prompt) -1] ==# a:prompt endfunction -function! s:HighlightError() - syntax clear - syntax match Error /^.*$/ +function! s:RemovePrompt(line, prompt) + return a:line[(s:ExistsPrompt(a:line, a:prompt) ? strlen(a:prompt) : 0):] endfunction + " ------------------------------------------------------------------------------------ " }}} " ==================================================================================== -command! -bang -narg=? -complete=file FuzzyFinderTextMate call FuzzyFinderTextMateLauncher(<q-args>, len(<q-bang>), bufnr('%'), s:GetCurrentTagFiles()) - +command! -bang -narg=? -complete=file FuzzyFinderTextMate call FuzzyFinderTextMateLauncher(<q-args>, len(<q-bang>)) +command! FuzzyFinderTextMateRefreshFiles ruby refresh_finder + function! InstantiateTextMateMode() "{{{ ruby << RUBY begin @@ -55,14 +52,22 @@ RUBY endif " Configuration option: g:fuzzy_ignore - " A semi-colon delimited list of file glob patterns to ignore + " A delimited list of file glob patterns to ignore. Entries may be delimited + " with either commas or semi-colons. if !exists('g:fuzzy_ignore') let g:fuzzy_ignore = "" endif - " Configuration option: g:fuzzy_matching_limit + " Configuration option: g:fuzzy_path_display + " Set to `abbr` if you want to display the abbreviated path to a file, + " `full` to display the full path + if !exists('g:fuzzy_path_display') + let g:fuzzy_path_display = 'abbr' + endif + + " Configuration option: g:fuzzy_enumerating_limit " The maximum number of matches to return at a time. Defaults to 200, via the - " g:FuzzyFinderMode.TextMate.matching_limit variable, but using a global variable + " g:FuzzyFinderMode.TextMate.enumerating_limit variable, but using a global variable " makes it easier to set this value. ruby << RUBY @@ -70,77 +75,60 @@ ruby << RUBY @finder ||= begin roots = VIM.evaluate("g:fuzzy_roots").split("\n") ceiling = VIM.evaluate("g:fuzzy_ceiling").to_i - ignore = VIM.evaluate("g:fuzzy_ignore").split(/;/) + ignore = VIM.evaluate("g:fuzzy_ignore").split(/[;,]/) FuzzyFileFinder.new(roots, ceiling, ignore) end end + + def refresh_finder + @finder = nil + finder + nil + end RUBY let g:FuzzyFinderMode.TextMate = copy(g:FuzzyFinderMode.Base) - " ================================================================================ - " This function is copied almost whole-sale from fuzzyfinder.vim. Ideally, I could - " used the on_complete callback to more cleanly add the new behavior, but the - " TextMate-style completion broke a few of fuzzyfinder.vim's assumptions, and the - " only way to patch that up was to override Base.complete...which required me to - " copy-and-paste much of the original implementation. - " - " Ugly. But effective. - " ================================================================================ - function! g:FuzzyFinderMode.TextMate.complete(findstart, base) - if a:findstart - return 0 - elseif !self.exists_prompt(a:base) || len(self.remove_prompt(a:base)) < self.min_length - return [] - endif - call s:HighlightPrompt(self.prompt, self.prompt_highlight) - - let result = [] - - if exists('g:fuzzy_matching_limit') - let l:limit = g:fuzzy_matching_limit + function! g:FuzzyFinderMode.TextMate.on_complete(base) + if exists('g:fuzzy_enumerating_limit') + let l:enumerating_limit = g:fuzzy_enumerating_limit else - let l:limit = self.matching_limit + let l:enumerating_limit = self.enumerating_limit endif - + let result = [] ruby << RUBY - text = VIM.evaluate('self.remove_prompt(a:base)') - limit = VIM.evaluate('l:limit').to_i - matches = finder.find(text, limit) - matches.sort_by { |a| [-a[:score], a[:path]] }.each_with_index do |match, index| + text = VIM.evaluate('s:RemovePrompt(a:base,self.prompt)') + enumerating_limit = VIM.evaluate('l:enumerating_limit').to_i + path_display = VIM.evaluate("g:fuzzy_path_display") + ceiling = VIM.evaluate('g:fuzzy_ceiling').to_i + + matches = finder.find(text, ceiling) + matches_length = matches.length + matches.sort_by { |a| [-a[:score], a[:path]] }[0,enumerating_limit].each_with_index do |match, index| word = match[:path] - abbr = "%2d: %s" % [index+1, match[:abbr]] + abbr = "%2d: %s" % [index+1, match[path_display.to_sym]] menu = "[%5d]" % [match[:score] * 10000] - VIM.evaluate("add(result, { 'word' : #{word.inspect}, 'abbr' : #{abbr.inspect}, 'menu' : #{menu.inspect} })") + VIM.evaluate("add(result, { 'word' : fnamemodify(#{word.inspect},':~:.'), 'abbr' : #{abbr.inspect}, 'menu' : #{menu.inspect}, 'ranks': [#{index}] })") end RUBY - - if empty(result) || len(result) >= self.matching_limit - call s:HighlightError() - endif - - if !empty(result) - call feedkeys("\<C-p>\<Down>", 'n') - endif - return result endfunction - function! FuzzyFinderTextMateLauncher(initial_text, partial_matching, prev_bufnr, tag_files) - call g:FuzzyFinderMode.TextMate.launch(a:initial_text, a:partial_matching, a:prev_bufnr, a:tag_files) + function! FuzzyFinderTextMateLauncher(initial_text, partial_matching) + call g:FuzzyFinderMode.TextMate.launch(a:initial_text, a:partial_matching) endfunction - + let g:FuzzyFinderOptions.TextMate = copy(g:FuzzyFinderOptions.File) endfunction "}}} if !exists('loaded_fuzzyfinder') "{{{ - function! FuzzyFinderTextMateLauncher(initial_text, partial_matching, prev_bufnr, tag_files) + function! FuzzyFinderTextMateLauncher(initial_text, partial_matching) call InstantiateTextMateMode() - function! FuzzyFinderTextMateLauncher(initial_text, partial_matching, prev_bufnr, tag_files) - call g:FuzzyFinderMode.TextMate.launch(a:initial_text, a:partial_matching, a:prev_bufnr, a:tag_files) + function! FuzzyFinderTextMateLauncher(initial_text, partial_matching) + call g:FuzzyFinderMode.TextMate.launch(a:initial_text, a:partial_matching) endfunction - call g:FuzzyFinderMode.TextMate.launch(a:initial_text, a:partial_matching, a:prev_bufnr, a:tag_files) + call g:FuzzyFinderMode.TextMate.launch(a:initial_text, a:partial_matching) endfunction finish end "}}} @@ -148,4 +136,3 @@ end "}}} call InstantiateTextMateMode() endif - plugin/fuzzyfinder_textmate.vim @@ -37,7 +37,7 @@ function! s:error(str) endfunction function! s:autoload(...) - if !exists("g:autoloaded_rails") + if !exists("g:autoloaded_rails") && v:version >= 700 runtime! autoload/rails.vim endif if exists("g:autoloaded_rails") @@ -48,7 +48,11 @@ function! s:autoload(...) endif if !exists("g:rails_no_autoload_warning") let g:rails_no_autoload_warning = 1 - call s:error("Disabling rails.vim: autoload/rails.vim is missing") + if v:version >= 700 + call s:error("Disabling rails.vim: autoload/rails.vim is missing") + else + call s:error("Disabling rails.vim: Vim version 7 or higher required") + endif endif return "" endfunction @@ -62,24 +66,20 @@ function! s:SetOptDefault(opt,val) endif endfunction -call s:SetOptDefault("rails_level",3) call s:SetOptDefault("rails_statusline",1) call s:SetOptDefault("rails_syntax",1) call s:SetOptDefault("rails_mappings",1) call s:SetOptDefault("rails_abbreviations",1) -call s:SetOptDefault("rails_expensive",1+0*(has("win32")||has("win32unix"))) +call s:SetOptDefault("rails_expensive",1) call s:SetOptDefault("rails_dbext",g:rails_expensive) -call s:SetOptDefault("rails_subversion",0) call s:SetOptDefault("rails_default_file","README") call s:SetOptDefault("rails_default_database","") call s:SetOptDefault("rails_root_url",'http://localhost:3000/') -call s:SetOptDefault("rails_modelines",1) +call s:SetOptDefault("rails_modelines",0) call s:SetOptDefault("rails_menu",1) call s:SetOptDefault("rails_gnu_screen",1) call s:SetOptDefault("rails_history_size",5) -call s:SetOptDefault("rails_debug",0) call s:SetOptDefault("rails_generators","controller\nintegration_test\nmailer\nmigration\nmodel\nobserver\nplugin\nresource\nscaffold\nsession_migration") -call s:SetOptDefault("rails_rake_tasks","db:charset\ndb:collation\ndb:create\ndb:create:all\ndb:drop\ndb:drop:all\ndb:fixtures:identify\ndb:fixtures:load\ndb:migrate\ndb:reset\ndb:rollback\ndb:schema:dump\ndb:schema:load\ndb:sessions:clear\ndb:sessions:create\ndb:structure:dump\ndb:test:clone\ndb:test:clone_structure\ndb:test:prepare\ndb:test:purge\ndb:version\ndoc:app\ndoc:clobber_app\ndoc:clobber_plugins\ndoc:clobber_rails\ndoc:plugins\ndoc:rails\ndoc:reapp\ndoc:rerails\nlog:clear\nnotes\nnotes:fixme\nnotes:optimize\nnotes:todo\nrails:freeze:edge\nrails:freeze:gems\nrails:unfreeze\nrails:update\nrails:update:configs\nrails:update:javascripts\nrails:update:scripts\nroutes\nstats\ntest\ntest:functionals\ntest:integration\ntest:plugins\ntest:recent\ntest:uncommitted\ntest:units\ntmp:cache:clear\ntmp:clear\ntmp:create\ntmp:pids:clear\ntmp:sessions:clear\ntmp:sockets:clear") if g:rails_dbext if exists("g:loaded_dbext") && executable("sqlite3") && ! executable("sqlite") " Since dbext can't find it by itself @@ -99,11 +99,15 @@ endfunction function! s:Detect(filename) let fn = substitute(fnamemodify(a:filename,":p"),'\c^file://','','') + let sep = matchstr(fn,'^[^\\/]\{3,\}\zs[\\/]') + if sep != "" + let fn = getcwd().sep.fn + endif if fn =~ '[\/]config[\/]environment\.rb$' return s:BufInit(strpart(fn,0,strlen(fn)-22)) endif if isdirectory(fn) - let fn = fnamemodify(fn,":s?[\/]$??") + let fn = fnamemodify(fn,':s?[\/]$??') else let fn = fnamemodify(fn,':s?$.*$[\/][^\/]*$?\1?') endif @@ -122,7 +126,7 @@ function! s:Detect(filename) return s:BufInit(fn) endif let ofn = fn - let fn = fnamemodify(ofn,':s?$.*$[\/]$app\|config\|db\|doc\|lib\|log\|public\|script\|spec\|test\|tmp\|vendor$$$\|[\/].*$$?\1?') + let fn = fnamemodify(ofn,':s?$.*$[\/]$app\|config\|db\|doc\|features\|lib\|log\|public\|script\|spec\|stories\|test\|tmp\|vendor$$$\|[\/].*$$?\1?') endwhile return 0 endfunction @@ -144,10 +148,10 @@ augroup railsPluginDetect autocmd FileType netrw if !exists("b:rails_root") | call s:Detect(expand("<afile>:p")) | endif | if exists("b:rails_root") | silent doau User BufEnterRails | endif autocmd BufEnter * if exists("b:rails_root")|silent doau User BufEnterRails|endif autocmd BufLeave * if exists("b:rails_root")|silent doau User BufLeaveRails|endif - autocmd FileType railslog if s:autoload()|call RailslogSyntax()|endif + autocmd Syntax railslog if s:autoload()|call rails#log_syntax()|endif augroup END -command! -bar -bang -nargs=* -complete=dir Rails :if s:autoload()|call RailsNewApp(<bang>0,<f-args>)|endif +command! -bar -bang -nargs=* -complete=dir Rails :if s:autoload()|call rails#new_app_command(<bang>0,<f-args>)|endif " }}}1 " Menus {{{1 @@ -164,6 +168,10 @@ function! s:gsub(str,pat,rep) return substitute(a:str,'\v\C'.a:pat,a:rep,'g') endfunction +function! s:menucmd(priority) + return 'anoremenu <script> '.(exists("$CREAM") ? 87 : '').s:gsub(g:rails_installed_menu,'[^.]','').'.'.a:priority.' ' +endfunction + function! s:CreateMenus() abort if exists("g:rails_installed_menu") && g:rails_installed_menu != "" exe "aunmenu ".s:gsub(g:rails_installed_menu,'\&','') @@ -175,14 +183,14 @@ function! s:CreateMenus() abort else let g:rails_installed_menu = '&Plugin.&Rails' endif + let dots = s:gsub(g:rails_installed_menu,'[^.]','') + let menucmd = s:menucmd(200) if exists("$CREAM") - let menucmd = '87anoremenu <script> ' exe menucmd.g:rails_installed_menu.'.-PSep- :' exe menucmd.g:rails_installed_menu.'.&Related\ file\ :R\ /\ Alt+] :R<CR>' exe menucmd.g:rails_installed_menu.'.&Alternate\ file\ :A\ /\ Alt+[ :A<CR>' exe menucmd.g:rails_installed_menu.'.&File\ under\ cursor\ Ctrl+Enter :Rfind<CR>' else - let menucmd = 'anoremenu <script> ' exe menucmd.g:rails_installed_menu.'.-PSep- :' exe menucmd.g:rails_installed_menu.'.&Related\ file\ :R\ /\ ]f :R<CR>' exe menucmd.g:rails_installed_menu.'.&Alternate\ file\ :A\ /\ [f :A<CR>' @@ -195,36 +203,24 @@ function! s:CreateMenus() abort exe menucmd.g:rails_installed_menu.'.&Other\ files.Application\ &README :find doc/README_FOR_APP<CR>' exe menucmd.g:rails_installed_menu.'.&Other\ files.&Environment :find config/environment.rb<CR>' exe menucmd.g:rails_installed_menu.'.&Other\ files.&Database\ Configuration :find config/database.yml<CR>' - exe menucmd.g:rails_installed_menu.'.&Other\ files.Database\ &Schema :call <SID>findschema()<CR>' + exe menucmd.g:rails_installed_menu.'.&Other\ files.Database\ &Schema :Rmigration 0<CR>' exe menucmd.g:rails_installed_menu.'.&Other\ files.R&outes :find config/routes.rb<CR>' exe menucmd.g:rails_installed_menu.'.&Other\ files.&Test\ Helper :find test/test_helper.rb<CR>' exe menucmd.g:rails_installed_menu.'.-FSep- :' exe menucmd.g:rails_installed_menu.'.Ra&ke\ :Rake :Rake<CR>' - let tasks = g:rails_rake_tasks - while tasks != '' - let task = matchstr(tasks,'.\{-\}\ze\%(\n\|$\)') - let tasks = s:sub(tasks,'.{-}%(\n|$)','') - exe menucmd.g:rails_installed_menu.'.Rake\ &tasks\ :Rake.'.s:sub(s:sub(task,'^[^:]*$','&:all'),':','.').' :Rake '.task.'<CR>' - endwhile - let tasks = g:rails_generators - while tasks != '' - let task = matchstr(tasks,'.\{-\}\ze\%(\n\|$\)') - let tasks = s:sub(tasks,'.{-}%(\n|$)','') - exe menucmd.'<silent> '.g:rails_installed_menu.'.&Generate\ :Rgen.'.s:gsub(task,'_','\\ ').' :call <SID>menuprompt("Rgenerate '.task.'","Arguments for script/generate '.task.': ")<CR>' - exe menucmd.'<silent> '.g:rails_installed_menu.'.&Destroy\ :Rdestroy.'.s:gsub(task,'_','\\ ').' :call <SID>menuprompt("Rdestroy '.task.'","Arguments for script/destroy '.task.': ")<CR>' - endwhile + let menucmd = substitute(menucmd,'200 $','500 ','') exe menucmd.g:rails_installed_menu.'.&Server\ :Rserver.&Start\ :Rserver :Rserver<CR>' exe menucmd.g:rails_installed_menu.'.&Server\ :Rserver.&Force\ start\ :Rserver! :Rserver!<CR>' exe menucmd.g:rails_installed_menu.'.&Server\ :Rserver.&Kill\ :Rserver!\ - :Rserver! -<CR>' - exe menucmd.'<silent> '.g:rails_installed_menu.'.&Evaluate\ Ruby\.\.\.\ :Rp :call <SID>menuprompt("Rp","Code to execute and output: ")<CR>' - exe menucmd.g:rails_installed_menu.'.&Console\ :Rconsole :Rconsole<CR>' + exe substitute(menucmd,'<script>','<script> <silent>','').g:rails_installed_menu.'.&Evaluate\ Ruby\.\.\.\ :Rp :call <SID>menuprompt("Rp","Code to execute and output: ")<CR>' + exe menucmd.g:rails_installed_menu.'.&Console\ :Rscript :Rscript console<CR>' exe menucmd.g:rails_installed_menu.'.&Preview\ :Rpreview :Rpreview<CR>' exe menucmd.g:rails_installed_menu.'.&Log\ file\ :Rlog :Rlog<CR>' - exe s:sub(menucmd,'anoremenu','vnoremenu').' <silent> '.g:rails_installed_menu.'.E&xtract\ as\ partial\ :Rextract :call <SID>menuprompt("'."'".'<,'."'".'>Rextract","Partial name (e.g., template or /controller/template): ")<CR>' + exe substitute(s:sub(menucmd,'anoremenu','vnoremenu'),'<script>','<script> <silent>','').g:rails_installed_menu.'.E&xtract\ as\ partial\ :Rextract :call <SID>menuprompt("'."'".'<,'."'".'>Rextract","Partial name (e.g., template or /controller/template): ")<CR>' exe menucmd.g:rails_installed_menu.'.&Migration\ writer\ :Rinvert :Rinvert<CR>' exe menucmd.' '.g:rails_installed_menu.'.-HSep- :' - exe menucmd.'<silent> '.g:rails_installed_menu.'.&Help\ :help\ rails :if <SID>autoload()<Bar>exe RailsHelpCommand("")<Bar>endif<CR>' - exe menucmd.'<silent> '.g:rails_installed_menu.'.Abo&ut\ :if <SID>autoload()<Bar>exe RailsHelpCommand("about")<Bar>endif<CR>' + exe substitute(menucmd,'<script>','<script> <silent>','').g:rails_installed_menu.'.&Help\ :help\ rails :if <SID>autoload()<Bar>exe RailsHelpCommand("")<Bar>endif<CR>' + exe substitute(menucmd,'<script>','<script> <silent>','').g:rails_installed_menu.'.Abo&ut\ :if <SID>autoload()<Bar>exe RailsHelpCommand("about")<Bar>endif<CR>' let g:rails_did_menus = 1 call s:ProjectMenu() call s:menuBufLeave() @@ -264,6 +260,27 @@ function! s:menuBufEnter() exe 'amenu disable '.menu.'.Migration\ writer' endif call s:ProjectMenu() + silent! exe 'aunmenu '.menu.'.Rake\ tasks' + silent! exe 'aunmenu '.menu.'.Generate' + silent! exe 'aunmenu '.menu.'.Destroy' + if rails#app().cache.needs('rake_tasks') || empty(rails#app().rake_tasks()) + exe substitute(s:menucmd(300),'<script>','<script> <silent>','').g:rails_installed_menu.'.Rake\ &tasks\ :Rake.Fill\ this\ menu :call rails#app().rake_tasks()<Bar>call <SID>menuBufLeave()<Bar>call <SID>menuBufEnter()<CR>' + else + let i = 0 + while i < len(rails#app().rake_tasks()) + let task = rails#app().rake_tasks()[i] + exe s:menucmd(300).g:rails_installed_menu.'.Rake\ &tasks\ :Rake.'.s:sub(task,':',':.').' :Rake '.task.'<CR>' + let i += 1 + endwhile + endif + let i = 0 + let menucmd = substitute(s:menucmd(400),'<script>','<script> <silent>','').g:rails_installed_menu + while i < len(rails#app().generators()) + let generator = rails#app().generators()[i] + exe menucmd.'.&Generate\ :Rgen.'.s:gsub(generator,'_','\\ ').' :call <SID>menuprompt("Rgenerate '.generator.'","Arguments for script/generate '.generator.': ")<CR>' + exe menucmd.'.&Destroy\ :Rdestroy.'.s:gsub(generator,'_','\\ ').' :call <SID>menuprompt("Rdestroy '.generator.'","Arguments for script/destroy '.generator.': ")<CR>' + let i += 1 + endwhile endif endfunction @@ -274,6 +291,12 @@ function! s:menuBufLeave() exe 'amenu enable '.menu.'.Help\ ' exe 'amenu enable '.menu.'.About\ ' exe 'amenu enable '.menu.'.Projects' + silent! exe 'aunmenu '.menu.'.Rake\ tasks' + silent! exe 'aunmenu '.menu.'.Generate' + silent! exe 'aunmenu '.menu.'.Destroy' + exe s:menucmd(300).g:rails_installed_menu.'.Rake\ tasks\ :Rake.-TSep- :' + exe s:menucmd(400).g:rails_installed_menu.'.&Generate\ :Rgen.-GSep- :' + exe s:menucmd(400).g:rails_installed_menu.'.&Destroy\ :Rdestroy.-DSep- :' endif endfunction @@ -285,17 +308,6 @@ function! s:menuprompt(vimcmd,prompt) exe a:vimcmd." ".res endfunction -function! s:findschema() - let env = exists('$RAILS_ENV') ? $RAILS_ENV : "development" - if filereadable(b:rails_root."/db/schema.rb") - edit `=b:rails_root.'/db/schema.rb'` - elseif filereadable(b:rails_root.'/db/'.env.'_structure.sql') - edit `=b:rails_root.'/db/'.env.'_structure.sql'` - else - return s:error("Schema not found: try :Rake db:schema:dump") - endif -endfunction - call s:CreateMenus() augroup railsPluginMenu plugin/rails.vim bc4eb1616314ffe78bf2dd719e715d5c86b59eb3 Rich Manalang rich.manalang@gmail.com http://github.com/manalang/vim-config/commit/b3afbc62a2709a0ec2e97f6ed965b2cddf86276f b3afbc62a2709a0ec2e97f6ed965b2cddf86276f

2009-05-06T09:49:33-07:00

updates f9d6405ffbe1c11cb3462370e234d6b0cd7dfd38 Rich Manalang rich.manalang@gmail.com