@@ -2634,14 +2634,13 @@ function! s:CommandEdit(cmd, name, projections, ...)
26342634 endif
26352635endfunction
26362636
2637- function ! s: EditSimpleRb (cmd,name,target,prefix,suffix, ... )
2637+ function ! s: LegacyCommandEdit (cmd,name,target,prefix,suffix)
26382638 let cmd = s: findcmdfor (a: cmd )
26392639 if a: target == " "
26402640 return s: error (" E471: Argument required" )
26412641 endif
2642- let f = a: 0 ? a: target : rails#underscore (a: target )
2643- let jump = matchstr (f ,' [#!].*\|:\d*\%(:in\)\=$' )
2644- let f = s: sub (f ,' [#!].*|:\d*%(:in)=$' ,' ' )
2642+ let jump = matchstr (a: target , ' [#!].*\|:\d*\%(:in\)\=$' )
2643+ let f = s: sub (a: target , ' [#!].*|:\d*%(:in)=$' , ' ' )
26452644 if jump = ~ ' ^!'
26462645 let cmd = s: editcmdfor (cmd)
26472646 endif
@@ -2650,7 +2649,7 @@ function! s:EditSimpleRb(cmd,name,target,prefix,suffix,...)
26502649 else
26512650 let f .= a: suffix .jump
26522651 endif
2653- let f = s: gsub ( a: prefix, ' \n ' , f . ' \n ' ) .f
2652+ let f = a: prefix .f
26542653 return s: findedit (cmd,f )
26552654endfunction
26562655
@@ -2880,33 +2879,33 @@ endfunction
28802879function ! s: stylesheetEdit (cmd,... )
28812880 let name = a: 0 ? a: 1 : s: controller (1 )
28822881 if rails#app ().has (' sass' ) && rails#app ().has_file (' public/stylesheets/sass/' .name.' .sass' )
2883- return s: EditSimpleRb (a: cmd ," stylesheet" ,name," public/stylesheets/sass/" ," .sass" , 1 )
2882+ return s: LegacyCommandEdit (a: cmd ," stylesheet" ,name," public/stylesheets/sass/" ," .sass" )
28842883 elseif rails#app ().has (' sass' ) && rails#app ().has_file (' public/stylesheets/sass/' .name.' .scss' )
2885- return s: EditSimpleRb (a: cmd ," stylesheet" ,name," public/stylesheets/sass/" ," .scss" , 1 )
2884+ return s: LegacyCommandEdit (a: cmd ," stylesheet" ,name," public/stylesheets/sass/" ," .scss" )
28862885 elseif rails#app ().has (' lesscss' ) && rails#app ().has_file (' app/stylesheets/' .name.' .less' )
2887- return s: EditSimpleRb (a: cmd ," stylesheet" ,name," app/stylesheets/" ," .less" , 1 )
2886+ return s: LegacyCommandEdit (a: cmd ," stylesheet" ,name," app/stylesheets/" ," .less" )
28882887 else
28892888 let types = rails#app ().relglob (' app/assets/stylesheets/' .name,' .*' ,' ' )
28902889 if ! empty (types)
2891- return s: EditSimpleRb (a: cmd ,' stylesheet' ,name,' app/assets/stylesheets/' ,types[0 ], 1 )
2890+ return s: LegacyCommandEdit (a: cmd ,' stylesheet' ,name,' app/assets/stylesheets/' ,types[0 ])
28922891 else
2893- return s: EditSimpleRb (a: cmd ,' stylesheet' ,name,' public/stylesheets/' ,' .css' , 1 )
2892+ return s: LegacyCommandEdit (a: cmd ,' stylesheet' ,name,' public/stylesheets/' ,' .css' )
28942893 endif
28952894 endif
28962895endfunction
28972896
28982897function ! s: javascriptEdit (cmd,... )
28992898 let name = a: 0 ? a: 1 : s: controller (1 )
29002899 if rails#app ().has (' coffee' ) && rails#app ().has_file (' app/scripts/' .name.' .coffee' )
2901- return s: EditSimpleRb (a: cmd ,' javascript' ,name,' app/scripts/' ,' .coffee' , 1 )
2900+ return s: LegacyCommandEdit (a: cmd ,' javascript' ,name,' app/scripts/' ,' .coffee' )
29022901 elseif rails#app ().has (' coffee' ) && rails#app ().has_file (' app/scripts/' .name.' .js' )
2903- return s: EditSimpleRb (a: cmd ,' javascript' ,name,' app/scripts/' ,' .js' , 1 )
2902+ return s: LegacyCommandEdit (a: cmd ,' javascript' ,name,' app/scripts/' ,' .js' )
29042903 else
29052904 let types = rails#app ().relglob (' app/assets/javascripts/' .name,' .*' ,' ' )
29062905 if ! empty (types)
2907- return s: EditSimpleRb (a: cmd ,' javascript' ,name,' app/assets/javascripts/' ,types[0 ], 1 )
2906+ return s: LegacyCommandEdit (a: cmd ,' javascript' ,name,' app/assets/javascripts/' ,types[0 ])
29082907 else
2909- return s: EditSimpleRb (a: cmd ,' javascript' ,name,' public/javascripts/' ,' .js' , 1 )
2908+ return s: LegacyCommandEdit (a: cmd ,' javascript' ,name,' public/javascripts/' ,' .js' )
29102909 endif
29112910 endif
29122911endfunction
0 commit comments