fix ap#140

Support non-percent saturation/luminance & whiteness/blackness in SASS and SCSS but prevent them in standard CSS
adamhotep · May 30, 2023 · a6846bf · a6846bf
1 parent 1db0b4d
commit a6846bf
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/autoload/css_color.vim b/autoload/css_color.vim
@@ -81,9 +81,10 @@ function! s:hsl2rgb(h,u,s,l)
 	return rgb
 endfunction
 
+" vet hsl and hwb values
 function! s:pctvet(h,s,l)
-	" for hsl & hwb, hue cannot be a percent, the others must be percents.
-	if a:h =~ "%$" || a:s !~ "%$" || a:l !~ "%$"
+	" hue cannot be a percent, others must be percents (except for sass & scss)
+	if a:h =~ "%$" || b:current_syntax !~ "s[ac]ss$" && (a:s !~ "%$" || a:l !~ "%$")
 		return [s:_invalid, s:_invalid, s:_invalid]
 	endif
 	let [s,l] = map( [a:s, a:l], 'v:val >= 100 ? 1.0 : v:val / 100.0' )

diff --git a/tests/example.sass b/tests/example.sass
@@ -10,7 +10,7 @@ s
 !color1 = #359
 !color2 = #335599
 !color3 = rgba(144, 0, 0, .5)
-!color4 = hsl(0, 100%, 50%)
+!color4 = hsl(0, 100, 50)
 
 /*
  * #123, #456

diff --git a/tests/example.scss b/tests/example.scss
@@ -6,7 +6,7 @@ s { background: hsl(0, 100%, 50%) }
 $color1: #359;
 $color2: #335599;
 $color3: rgba(144, 0, 0, .5);
-$color4: hsl(0, 100%, 50%);
+$color4: hsl(0, 100, 50);
 
 /*
  * #123, #456