Gratuitous s:findview() refactoring

Author: tpope

autoload/rails.vim

@@ -2031,15 +2031,12 @@ function! s:RailsIncludefind(str,...)
   elseif line =~# '\<def\s\+' && expand("%:t") =~# '_controller\.rb'
     let str = s:sub(s:sub(RailsFilePath(),'/controllers/','/views/'),'_controller\.rb$','/'.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)
+    for t in split(s:view_types,',')
+      if filereadable(str.format.'.'.t)
         let str .= '.'.t
         break
       endif
-    endwhile
+    endfor
   elseif str =~# '_\%(path\|url\)$' || (line =~# ':as\s*=>\s*$' && RailsFileType() =~# '^config-routes\>')
     if line !~# ':as\s*=>\s*$'
       let str = s:sub(str,'_%(path|url)$','')
@@ -2550,42 +2547,27 @@ function! s:viewEdit(cmd,...)
 endfunction
 
 function! s:findview(name)
-  " TODO: full support of nested extensions
-  let c = a:name
-  let pre = "app/views/"
-  let file = ""
-  if c !~ '/'
-    let controller = s:controller(1)
+  let self = rails#buffer()
+  let name = a:name
+  let pre = 'app/views/'
+  if name !~# '/'
+    let controller = self.controller_name(1)
     if controller != ''
-      let c = controller.'/'.c
+      let name = controller.'/'.name
     endif
   endif
-  if c =~ '\.\w\+\.\w\+$' || c =~ '\.'.s:viewspattern().'$'
-    return pre.c
-  elseif rails#app().has_file(pre.c.".rhtml")
-    let file = pre.c.".rhtml"
-  elseif rails#app().has_file(pre.c.".rxml")
-    let file = pre.c.".rxml"
+  if name =~# '\.\w\+\.\w\+$' || name =~# '\.'.s:viewspattern().'$'
+    return pre.name
   else
-    let format = "." . s:format('html')
-    let vt = s:view_types.","
-    while 1
-      while vt != ""
-        let t = matchstr(vt,'[^,]*')
-        let vt = s:sub(vt,'[^,]*,','')
-        if rails#app().has_file(pre.c.format.".".t)
-          let file = pre.c.format.".".t
-          break
+    for format in ['.'.self.format('html'), '']
+      for type in split(s:view_types,',')
+        if self.app().has_file(pre.name.format.'.'.type)
+          return pre.name.format.'.'.type
         endif
-      endwhile
-      if format == '' || file != ''
-        break
-      else
-        let format = ''
-      endif
-    endwhile
+      endfor
+    endfor
   endif
-  return file
+  return ''
 endfunction
 
 function! s:findlayout(name)