add less and css support

shmargum · Apr 18, 2020 · 3b16cb3 · 3b16cb3
1 parent b70c898
commit 3b16cb3
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/autoload/sass-colors.rb b/autoload/sass-colors.rb
@@ -431,7 +431,7 @@
   CSS_COLORS_INVERSE[v] = k
 end
 
-prefix_regex = /\/(?:stylesheets|sass|scss|style|styles)\//
+prefix_regex = /\/(?:stylesheets|sass|scss|less|style|styles)\//
 if ENV['VIM_SASS_COLORS_BASE_FOLDERS']
   prefix_regex = /\/(?:#{ENV['VIM_SASS_COLORS_BASE_FOLDERS'].split(',').join('|')})\//
 end

diff --git a/autoload/vim_sass_colors.vim b/autoload/vim_sass_colors.vim
@@ -66,8 +66,8 @@ function! vim_sass_colors#run()
 
     " only add $variable name to group
     if l:cname != 'placeholder'
-      let l:new_match =  matchadd(l:group, '\v\$'.l:cname.'([^a-zA-Z0-9-_])@=')
-      let l:new_match2 =  matchadd(l:group, '\v\$'.l:cname.'($)@=')
+      let l:new_match =  matchadd(l:group, '\v[$@]'.l:cname.'([^a-zA-Z0-9-_])@=')
+      let l:new_match2 =  matchadd(l:group, '\v[$@]'.l:cname.'($)@=')
       call add(w:vim_sass_color_matches, l:new_match)
       call add(w:vim_sass_color_matches, l:new_match2)
     endif

diff --git a/ftplugin/css.vim b/ftplugin/css.vim
@@ -0,0 +1,5 @@
+if exists("w:did_vim_sass_colors")
+  finish
+endif
+let w:did_vim_sass_colors = 1
+call vim_sass_colors#init()
diff --git a/ftplugin/less.vim b/ftplugin/less.vim
@@ -0,0 +1,5 @@
+if exists("w:did_vim_sass_colors")
+  finish
+endif
+let w:did_vim_sass_colors = 1
+call vim_sass_colors#init()