Skip to content

Commit c9a73db

Browse files
graywhtpope
authored andcommitted
Add support for Sass 3 (Scss).
1 parent ec59f44 commit c9a73db

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

autoload/rails.vim

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -716,7 +716,7 @@ function! s:readable_calculate_file_type() dict abort
716716
let r = "task"
717717
elseif f =~ '\<log/.*\.log$'
718718
let r = "log"
719-
elseif e == "css" || e == "sass" || e == "less"
719+
elseif e == "css" || e =~ "s[ac]ss" || e == "less"
720720
let r = "stylesheet-".e
721721
elseif e == "js"
722722
let r = "javascript"
@@ -1351,7 +1351,7 @@ function! s:readable_preview_urls(lnum) dict abort
13511351
let url += [self.getvar('rails_preview')]
13521352
end
13531353
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')]
13551355
elseif self.name() =~ '^public/'
13561356
let urls = urls + [s:sub(self.name(),'^public','')]
13571357
elseif self.name() =~ '^app/stylesheets/'
@@ -2624,6 +2624,8 @@ function! s:stylesheetEdit(cmd,...)
26242624
let name = a:0 ? a:1 : s:controller(1)
26252625
if rails#app().has('sass') && rails#app().has_file('public/stylesheets/sass/'.name.'.sass')
26262626
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)
26272629
elseif rails#app().has('lesscss') && rails#app().has_file('app/stylesheets/'.name.'.less')
26282630
return s:EditSimpleRb(a:cmd,"stylesheet",name,"app/stylesheets/",".less",1)
26292631
else
@@ -4481,6 +4483,8 @@ function! RailsBufInit(path)
44814483
setlocal filetype=haml
44824484
elseif &ft =~ '^\%(sass\|conf\)\=$' && expand("%:e") == "sass"
44834485
setlocal filetype=sass
4486+
elseif &ft =~ '^\%(scss\|conf\)\=$' && expand("%:e") == "scss"
4487+
setlocal filetype=scss
44844488
elseif &ft =~ '^\%(lesscss\|conf\)\=$' && expand("%:e") == "less"
44854489
setlocal filetype=lesscss
44864490
elseif &ft =~ '^\%(dryml\)\=$' && expand("%:e") == "dryml"
@@ -4587,7 +4591,7 @@ function! s:BufSettings()
45874591
call self.setvar('&includeexpr','RailsIncludeexpr()')
45884592
call self.setvar('&suffixesadd', ".rb,.".s:gsub(s:view_types,',',',.').",.css,.js,.yml,.csv,.rake,.sql,.html,.xml")
45894593
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\)$'
45914595
call self.setvar('&shiftwidth',2)
45924596
call self.setvar('&softtabstop',2)
45934597
call self.setvar('&expandtab',1)

0 commit comments

Comments
 (0)