@@ -716,7 +716,7 @@ function! s:readable_calculate_file_type() dict abort
716
716
let r = " task"
717
717
elseif f = ~ ' \<log/.*\.log$'
718
718
let r = " log"
719
- elseif e == " css" || e == " sass " || e == " less"
719
+ elseif e == " css" || e = ~ " s[ac]ss " || e == " less"
720
720
let r = " stylesheet-" .e
721
721
elseif e == " js"
722
722
let r = " javascript"
@@ -1351,7 +1351,7 @@ function! s:readable_preview_urls(lnum) dict abort
1351
1351
let url += [self .getvar (' rails_preview' )]
1352
1352
end
1353
1353
if self .name () = ~ ' ^public/stylesheets/sass/'
1354
- let urls = urls + [s: sub (s: sub (self .name (),' ^public/stylesheets/sass/' ,' /stylesheets/' ),' \.sass $' ,' .css' )]
1354
+ let urls = urls + [s: sub (s: sub (self .name (),' ^public/stylesheets/sass/' ,' /stylesheets/' ),' \.s[ac]ss $' ,' .css' )]
1355
1355
elseif self .name () = ~ ' ^public/'
1356
1356
let urls = urls + [s: sub (self .name (),' ^public' ,' ' )]
1357
1357
elseif self .name () = ~ ' ^app/stylesheets/'
@@ -2624,6 +2624,8 @@ function! s:stylesheetEdit(cmd,...)
2624
2624
let name = a: 0 ? a: 1 : s: controller (1 )
2625
2625
if rails#app ().has (' sass' ) && rails#app ().has_file (' public/stylesheets/sass/' .name.' .sass' )
2626
2626
return s: EditSimpleRb (a: cmd ," stylesheet" ,name," public/stylesheets/sass/" ," .sass" ,1 )
2627
+ elseif rails#app ().has (' sass' ) && rails#app ().has_file (' public/stylesheets/sass/' .name.' .scss' )
2628
+ return s: EditSimpleRb (a: cmd ," stylesheet" ,name," public/stylesheets/sass/" ," .scss" ,1 )
2627
2629
elseif rails#app ().has (' lesscss' ) && rails#app ().has_file (' app/stylesheets/' .name.' .less' )
2628
2630
return s: EditSimpleRb (a: cmd ," stylesheet" ,name," app/stylesheets/" ," .less" ,1 )
2629
2631
else
@@ -4481,6 +4483,8 @@ function! RailsBufInit(path)
4481
4483
setlocal filetype = haml
4482
4484
elseif &ft = ~ ' ^\%(sass\|conf\)\=$' && expand (" %:e" ) == " sass"
4483
4485
setlocal filetype = sass
4486
+ elseif &ft = ~ ' ^\%(scss\|conf\)\=$' && expand (" %:e" ) == " scss"
4487
+ setlocal filetype = scss
4484
4488
elseif &ft = ~ ' ^\%(lesscss\|conf\)\=$' && expand (" %:e" ) == " less"
4485
4489
setlocal filetype = lesscss
4486
4490
elseif &ft = ~ ' ^\%(dryml\)\=$' && expand (" %:e" ) == " dryml"
@@ -4587,7 +4591,7 @@ function! s:BufSettings()
4587
4591
call self .setvar (' &includeexpr' ,' RailsIncludeexpr()' )
4588
4592
call self .setvar (' &suffixesadd' , " .rb,." .s: gsub (s: view_types ,' ,' ,' ,.' )." ,.css,.js,.yml,.csv,.rake,.sql,.html,.xml" )
4589
4593
let ft = self .getvar (' &filetype' )
4590
- if ft = ~ ' ^\%(e\=ruby\|[yh]aml\|javascript\|css\|sass \|lesscss\)$'
4594
+ if ft = ~ ' ^\%(e\=ruby\|[yh]aml\|javascript\|css\|s[ac]ss \|lesscss\)$'
4591
4595
call self .setvar (' &shiftwidth' ,2 )
4592
4596
call self .setvar (' &softtabstop' ,2 )
4593
4597
call self .setvar (' &expandtab' ,1 )
0 commit comments