Color: support % in rgb(...)

Author: tyru

autoload/vital/__vital__/Color.vim

@@ -58,7 +58,7 @@ endfunction
 " Constructors
 
 let s:RGB_HEX_RE = '\v^#(\x{3}(\x{3})?)$'
-let s:RGB_RE = '\v^rgb\((\d+),\s*(\d+),\s*(\d+)\)$'
+let s:RGB_RE = '\v^rgb\((\d+\%?),\s*(\d+\%?),\s*(\d+\%?)\)$'
 let s:HSL_RE = '\v^hsl\((\d+),\s*(\d+)\%,\s*(\d+)\%\)$'
 let s:VIM_RGB_FILE = expand('$VIMRUNTIME/rgb.txt')
 function! s:parse(str) abort
@@ -76,9 +76,10 @@ function! s:parse(str) abort
     return s:rgb(r, g, b)
   endif
   " e.g. rgb(255,255,255)
+  " e.g. rgb(100%,100%,100%)
   let m = matchlist(a:str, s:RGB_RE)
   if !empty(m)
-    let [r, g, b] = [str2float(m[1]), str2float(m[2]), str2float(m[3])]
+    let [r, g, b] = map(m[1:3], 's:_per2float(v:val, 255.0)')
     return s:rgb(r, g, b)
   endif
   " e.g. hsl(0,0%,100%)
@@ -99,6 +100,10 @@ function! s:parse(str) abort
   throw 'vital: Color: parse(): invalid format: ' . a:str
 endfunction
 
+function! s:_per2float(per, n) abort
+  return a:per =~# '%$' ? str2float(a:per[:-2]) * a:n / 100.0 : str2float(a:per)
+endfunction
+
 let s:RGB_FILE_RE = '\v^\s*(\d+)\s+(\d+)\s+(\d+)\s+(.+)$'
 function! s:_parse_rgb_file(file) abort
   let color_map = {}

doc/vital/Color.txt

@@ -28,7 +28,8 @@ parse({str})		*Vital.Color.parse()*
           * e.g. `#FFF`
           * e.g. `#000000`
         * CSS RGB format
-          * e.g. `rgb(100,100,100)`
+          * e.g. `rgb(255,255,255)`
+          * e.g. `rgb(100%,0%,0%)`
         * CSS HSL format
           * e.g. `hsl(0,50%,100%)`
           * `%` is mandatory
@@ -38,6 +39,7 @@ parse({str})		*Vital.Color.parse()*
 	let c1 = s:Color.parse('#012')
 	let c2 = s:Color.parse('#c0ffee')
 	let c3 = s:Color.parse('rgb(100,100,100)')
+	let c3 = s:Color.parse('rgb(0%,100%,100%)')
 	let c4 = s:Color.parse('hsl(0,50%,100%)')
 	let c5 = s:Color.parse('ForestGreen')
 <

test/Color.vim

@@ -14,6 +14,8 @@ function! s:suite.rgb()
   call s:assert.equals(s:C.parse('#012').as_rgb_str(), 'rgb('.0x00.','.0x11.','.0x22.')')
   call s:assert.equals(s:C.parse('rgb(123, 56, 78)').as_rgb_hex(), '#7B384E')
   call s:assert.equals(s:C.parse('rgb(123, 56, 78)').as_rgb_str(), 'rgb('.0x7B.','.0x38.','.0x4E.')')
+  call s:assert.equals(s:C.parse('rgb(100%, 0%, 0%)').as_rgb_hex(), '#FF0000')
+  call s:assert.equals(s:C.parse('rgb(100%, 0%, 0%)').as_rgb_str(), 'rgb('.0xFF.','.0x00.','.0x00.')')
   call s:assert.equals(s:C.rgb(255, 255, 255).as_rgb_hex(), '#FFFFFF')
   call s:assert.equals(s:C.rgb(255, 255, 255).as_rgb_str(), 'rgb('.0xFF.','.0xFF.','.0xFF.')')
   call s:assert.equals(s:C.rgb(255, 0, 0).as_rgb_hex(), '#FF0000')
@@ -113,15 +115,26 @@ function! s:suite.error_parse()
   \ 'deadbee',
   \ 'deadbeef',
   \ '0xc0ffee',
-  \ 'rgb(0,0%,0%)',
+  \ 'rgb(-1%,0%,0%)',
+  \ 'rgb(-2%,0%,0%)',
+  \ 'rgb(0%,-1%,0%)',
+  \ 'rgb(0%,-2%,0%)',
+  \ 'rgb(0%,0%,-1%)',
+  \ 'rgb(0%,0%,-2%)',
+  \ 'rgb(101%,0%,0%)',
+  \ 'rgb(102%,0%,0%)',
+  \ 'rgb(0%,101%,0%)',
+  \ 'rgb(0%,102%,0%)',
+  \ 'rgb(0%,0%,101%)',
+  \ 'rgb(0%,0%,102%)',
   \ 'hsl(0,0,0)',
   \ 'rgb(0,0,0);',
   \ 'hsl(0,0%,0%);',
   \ 'unknown_color_name',
   \]
     try
       call s:C.parse(l:V)
-    catch /vital: Color: parse():/
+    catch /vital: Color:/
       call s:assert.true(1, string(l:V) . ' should not be parsed')
     endtry
   endfor