@@ -792,6 +792,7 @@ endfunction
792792
793793function ! s: app_has (feature) dict
794794 let map = {
795+ \ 'assets': 'app/assets/',
795796 \ 'test': 'test/',
796797 \ 'spec': 'spec/',
797798 \ 'cucumber': 'features/',
@@ -2249,16 +2250,24 @@ function! s:layoutList(A,L,P)
22492250endfunction
22502251
22512252function ! s: stylesheetList (A,L,P )
2252- let list = rails#app ().relglob (' public/stylesheets/' ,' **/*' ,' .css' )
2253- if rails#app ().has (' sass' )
2254- call extend (list ,rails#app ().relglob (' public/stylesheets/sass/' ,' **/*' ,' .s?ss' ))
2255- call s: uniq (list )
2253+ if rails#app ().has (' assets' )
2254+ let list = rails#app ().relglob (' app/assets/stylesheets/' ,' **/*' ,' .css' )
2255+ else
2256+ let list = rails#app ().relglob (' public/stylesheets/' ,' **/*' ,' .css' )
2257+ if rails#app ().has (' sass' )
2258+ call extend (list ,rails#app ().relglob (' public/stylesheets/sass/' ,' **/*' ,' .s?ss' ))
2259+ endif
22562260 endif
2261+ call s: uniq (list )
22572262 return s: completion_filter (list ,a: A )
22582263endfunction
22592264
22602265function ! s: javascriptList (A,L,P )
2261- return s: completion_filter (rails#app ().relglob (" public/javascripts/" ," **/*" ," .js" ),a: A )
2266+ if rails#app ().has (' assets' )
2267+ return s: completion_filter (rails#app ().relglob (" app/assets/javascripts/" , " **/*" , " .js" ), a: A )
2268+ else
2269+ return s: completion_filter (rails#app ().relglob (" public/javascripts/" , " **/*" , " .js" ), a: A )
2270+ endif
22622271endfunction
22632272
22642273function ! s: metalList (A,L,P )
@@ -2722,25 +2731,29 @@ endfunction
27222731
27232732function ! s: stylesheetEdit (cmd,... )
27242733 let name = a: 0 ? a: 1 : s: controller (1 )
2725- if rails#app ().has (' sass' ) && rails#app ().has_file (' public/stylesheets/sass/' .name.' .sass' )
2726- return s: EditSimpleRb (a: cmd ," stylesheet" ,name," public/stylesheets/sass/" ," .sass" ,1 )
2734+ if rails#app ().has (' assets' ) && rails#app ().has_file (' app/assets/stylesheets/' .name.' .css' )
2735+ return s: EditSimpleRb (a: cmd , " stylesheet" , name, " app/assets/stylesheets/" , " .css" )
2736+ elseif rails#app ().has (' sass' ) && rails#app ().has_file (' public/stylesheets/sass/' .name.' .sass' )
2737+ return s: EditSimpleRb (a: cmd , " stylesheet" , name, " public/stylesheets/sass/" , " .sass" , 1 )
27272738 elseif rails#app ().has (' sass' ) && rails#app ().has_file (' public/stylesheets/sass/' .name.' .scss' )
2728- return s: EditSimpleRb (a: cmd ," stylesheet" ,name," public/stylesheets/sass/" ," .scss" ,1 )
2739+ return s: EditSimpleRb (a: cmd , " stylesheet" , name, " public/stylesheets/sass/" , " .scss" , 1 )
27292740 elseif rails#app ().has (' lesscss' ) && rails#app ().has_file (' app/stylesheets/' .name.' .less' )
2730- return s: EditSimpleRb (a: cmd ," stylesheet" ,name," app/stylesheets/" ," .less" ,1 )
2741+ return s: EditSimpleRb (a: cmd , " stylesheet" , name, " app/stylesheets/" , " .less" , 1 )
27312742 else
2732- return s: EditSimpleRb (a: cmd ," stylesheet" ,name," public/stylesheets/" ," .css" ,1 )
2743+ return s: EditSimpleRb (a: cmd , " stylesheet" , name, " public/stylesheets/" , " .css" , 1 )
27332744 endif
27342745endfunction
27352746
27362747function ! s: javascriptEdit (cmd,... )
27372748 let name = a: 0 ? a: 1 : s: controller (1 )
2738- if rails#app ().has (' coffee' ) && rails#app ().has_file (' app/scripts/' .name.' .coffee' )
2739- return s: EditSimpleRb (a: cmd ,' javascript' ,name,' app/scripts/' ,' .coffee' ,1 )
2749+ if rails#app ().has (" assets" ) && rails#app ().has_file (' app/assets/javascripts/' .name.' .js' )
2750+ return s: EditSimpleRb (a: cmd , ' javascript' , name, ' app/assets/javascripts/' , ' .js' )
2751+ elseif rails#app ().has (' coffee' ) && rails#app ().has_file (' app/scripts/' .name.' .coffee' )
2752+ return s: EditSimpleRb (a: cmd , ' javascript' , name, ' app/scripts/' , ' .coffee' , 1 )
27402753 elseif rails#app ().has (' coffee' ) && rails#app ().has_file (' app/scripts/' .name.' .js' )
2741- return s: EditSimpleRb (a: cmd ,' javascript' ,name,' app/scripts/' ,' .js' ,1 )
2754+ return s: EditSimpleRb (a: cmd ,' javascript' , name, ' app/scripts/' , ' .js' , 1 )
27422755 else
2743- return s: EditSimpleRb (a: cmd ,' javascript' ,name,' public/javascripts/' ,' .js' ,1 )
2756+ return s: EditSimpleRb (a: cmd , ' javascript' , name, ' public/javascripts/' , ' .js' , 1 )
27442757 endif
27452758endfunction
27462759
@@ -2886,14 +2899,14 @@ endfunction
28862899
28872900function ! s: environmentEdit (cmd,... )
28882901 if a: 0 || rails#app ().has_file (' config/application.rb' )
2889- return s: EditSimpleRb (a: cmd ," environment" ,a: 0 ? a: 1 : " ../application" ," config/environments/" ," .rb" )
2902+ return s: EditSimpleRb (a: cmd , " environment" , a: 0 ? a: 1 : " ../application" ," config/environments/" , " .rb" )
28902903 else
2891- return s: EditSimpleRb (a: cmd ," environment" ," environment" ," config/" ," .rb" )
2904+ return s: EditSimpleRb (a: cmd , " environment" , " environment" , " config/" , " .rb" )
28922905 endif
28932906endfunction
28942907
28952908function ! s: initializerEdit (cmd,... )
2896- return s: EditSimpleRb (a: cmd ," initializer" ,a: 0 ? a: 1 : " ../routes" ," config/initializers/" ," .rb" )
2909+ return s: EditSimpleRb (a: cmd , " initializer" , a: 0 ? a: 1 : " ../routes" , " config/initializers/" , " .rb" )
28972910endfunction
28982911
28992912" }}}1
0 commit comments