Merge branch 'master' into master

.editorconfig

@@ -0,0 +1,13 @@
+# EditorConfig helps developers define and maintain consistent
+# coding styles between different editors and IDEs
+# editorconfig.org
+
+root = true
+
+[*]
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+indent_style = tab
+indent_size = 4

after/syntax/css/vim-coloresque.vim

@@ -26,6 +26,7 @@ function! s:FGForBG(color)
     let r = s:hex[color[0:1]]
     let g = s:hex[color[2:3]]
     let b = s:hex[color[4:5]]
+
     return r*30 + g*59 + b*11 > 12000 ? s:black : s:white
 endfunction
 
@@ -34,24 +35,7 @@ let s:fg_color_calc = 'let color = "#" . toupper(a:color)'
 
 function! s:RestoreColors()
     for part in keys(b:color_pattern)
-
-      "if b:color_pattern[part]=="ffffff"
-        "echoe part
-      "endif
-      
         call s:MatchColorValue(b:color_pattern[part], part)
-      "echoe color
-      "echoe b:color_pattern[color]
-      "let group = 'cssColor' . tolower(strpart(b:color_pattern[part]["color"], 1))
-      ""exe 'syn match' group '/'.escape(pattern, '/').'/ contained'
-      "exe 'syn cluster cssColors add='.group
-      "exe 'hi' group s:color_prefix.'bg='.b:color_pattern[part]["bg"] s:color_prefix.'fg='.b:color_pattern[part]["fg"]
-      
-      "if !exists('b:matchescache')
-        "let b:matchescache={}
-      "endif
-
-      "let b:matchescache[part] = matchadd(group, part, -1)
     endfor
 endfunction
 
@@ -73,8 +57,6 @@ function! s:MatchColorValue(color, part)
         let b:matchescache[a:part] = matchadd(group, a:part, -1)
     endif
 
-  "call add(w:matchescache, matchadd(group, a:part, -1))
-
     return ''
 endfunction
 
@@ -111,17 +93,15 @@ function! s:ClearMatches()
     if !exists('b:matchescache')
         return
     endif
-  "for i in values(b:matchescache)
-    "call matchdelete(i)
-  "endfor
+
     unlet b:matchescache
 endfunction
 
 function! s:VimCssInit(update)
-
     if a:update==1
         call s:ClearMatches()
     endif
+
     setlocal isk+=-
     setlocal isk+=#
     setlocal isk+=.
@@ -131,27 +111,17 @@ function! s:VimCssInit(update)
         return
     endif
 
-
     if len(keys(b:color_pattern))>0
         call s:RestoreColors()
         return
     endif
 
-    "let b:matchescache = {}
-
     call s:AdditionalColors()
 
-    "for i in range(1, line("$"))
     call s:PreviewCSSColor(join(getline(1,'$'), "\n"))
-    "endfor
-
 endfunction
 
 function! s:AdditionalColors()
-    "if exists('&b:colorDictRegExp')&&b:colorDictRegExp!=''
-        "return
-    "endif
-
     " w3c Colors
     " plus extra colors
     let w:colorDict = {
@@ -304,12 +274,10 @@ function! s:AdditionalColors()
         \ 'yellowgreen': '#9acd32'
         \ }
 
-  "let w:colorDictRegExp = '\(' 
     for _color in keys(w:colorDict)
-    "let w:colorDictRegExp.='\<'._color.'\>\|' 
         call s:MatchColorValue(strpart(w:colorDict[tolower(_color)], 1), '\<\c'._color.'\>')
     endfor
-  "let w:colorDictRegExp=strpart(w:colorDictRegExp, 0, len(w:colorDictRegExp)-2).'\)\c'
+
 endfunction
 
 function! s:ProcessByLine(w)
@@ -317,18 +285,12 @@ function! s:ProcessByLine(w)
 endfunction
 
 function! s:PreviewCSSColor(str)
-  "if !exists('&w:colorDictRegExp')
-  "endif
-
     let line=a:str "getline(a:w)
     let colorexps = {
         \ 'hex'  : '#[0-9A-Fa-f]\{3\}\>\|#[0-9A-Fa-f]\{6\}\>',
         \ 'rgba' : 'rgba\?(\s*\(\d\{1,3}%\?\)\s*,\s*\(\d\{1,3}%\?\)\s*,\s*\(\d\{1,3}%\?\)\s*\%(,[^)]*\)\?)',
         \ 'hsla' : 'hsla\?(\s*\(\d\{1,3}%\?\)\s*,\s*\(\d\{1,3}%\?\)\s*,\s*\(\d\{1,3}%\?\)\s*\%(,[^)]*\)\?)'
         \ }
-    "\ 'color': w:colorDictRegExp
-
-  "let foundcolor=''
 
     for exp in keys(colorexps)
         let place=0
@@ -386,8 +348,7 @@ if has('gui_running') || &t_Co==256
         endfor
     endif
 
-  if !has('gui_running') && !has('termguicolors')
-
+    if !has('gui_running') && !has("termguicolors")
         let s:black = 0
         let s:white = 15
 
@@ -412,6 +373,7 @@ if has('gui_running') || &t_Co==256
                     \ [ 0xFF, 0x00, 0xFF, 13 ],
                     \ [ 0x00, 0xFF, 0xFF, 14 ],
                     \ [ 0xFF, 0xFF, 0xFF, 15 ]]
+
         " grayscale ramp
         " (value is 8+10*lum for lum in 0..23)
         let s:xtermcolor += [
@@ -451,6 +413,7 @@ if has('gui_running') || &t_Co==256
                     \         + repeat([3],40)
                     \         + repeat([4],40)
                     \         + repeat([5],20)
+
         " tweak the mapping for the exact matches (0 and 1 already correct)
         let s:xvquant[s:cubergb[2]] = 2
         let s:xvquant[s:cubergb[3]] = 3
@@ -482,6 +445,7 @@ if has('gui_running') || &t_Co==256
                 let smallest_distance = distance
                 let best_match = idx
             endfor
+
             return best_match
         endfunction
     endif
@@ -625,14 +589,10 @@ if has('gui_running') || &t_Co==256
     hi cssColorfffff0 guibg=#FFFFF0 guifg=#000000 ctermbg=15  ctermfg=16  | syn cluster cssColors add=cssColorfffff0
     hi cssColorffffff guibg=#FFFFFF guifg=#000000 ctermbg=231 ctermfg=16  | syn cluster cssColors add=cssColorffffff
 
-  "call s:VimCssInit(1)
-
     augroup coloresque
         au!
         autocmd CursorMovedI <buffer> silent call s:ProcessByLine('.')
         autocmd ColorScheme <buffer> silent call s:VimCssInit(1)
         autocmd BufEnter <buffer> silent call s:VimCssInit(1)
     augroup END
-
-  "autocmd CursorMoved  <buffer> silent call s:ProcessByLine('.')
 endif