Perform stupid gf tricks on whole lines

tpope · tpope · commit 035a38f263f0 · 2011-08-25T22:17:37.000-04:00
diff --git a/ftplugin/ruby.vim b/ftplugin/ruby.vim
@@ -290,17 +290,16 @@ function! RubyCursorIdentifier()
 endfunction
 
 function! s:gf(count,map,edit) abort
-  let target = expand('<cfile>')
-  if target ==# '^require' && getline('.') =~# '^\s*require_relative\s*\(["'']\).*\1'
+  if getline('.') =~# '^\s*require_relative\s*\(["'']\).*\1\s*$'
     let target = matchstr(getline('.'),'\(["'']\)\zs.\{-\}\ze\1')
     return a:edit.' %:h/'.target.'.rb'
-  endif
-  if target =~# '^\%(require\|load\|autoload\)$' && getline('.') =~# '^\s*\%(require \|load \|autoload :\w\+,\)\s*\|^\s*require(\=\s*File\.expand_path(\(["'']\)\.\./.*\1,\s*__FILE__)'
+  elseif getline('.') =~# '^\s*\%(require \|load \|autoload :\w\+,\)\s*\|^\s*require(\=\s*File\.expand_path(\(["'']\)\.\./.*\1,\s*__FILE__)\s*$'
     let target = matchstr(getline('.'),'\(["'']\)\.\./\zs.\{-\}\ze\1')
     return a:edit.' %:h/'.target.'.rb'
-  endif
-  if target =~# '^\%(require\|load\|autoload\)$' && getline('.') =~# '^\s*\%(require \|load \|autoload :\w\+,\)\s*\(["'']\).*\1'
+  elseif getline('.') =~# '^\s*\%(require \|load \|autoload :\w\+,\)\s*\(["'']\).*\1\s*$'
     let target = matchstr(getline('.'),'\(["'']\)\zs.\{-\}\ze\1')
+  else
+    let target = expand('<cfile>')
   endif
   let found = findfile(target, &path, a:count)
   if found ==# ''
