Generalize highlighting

Read values from current colorscheme for "redacted" highlights

diff --git a/syntax/pass.vim b/syntax/pass.vim
index e8deaefc134fb16e14386705d33620a041a19e60..b925920211cffc0338be30c02d09eea07affb9ff 100644 (file)
--- a/syntax/pass.vim
+++ b/syntax/pass.vim
@@ -1,11 +1,26 @@
 if exists('b:current_syntax') | finish|  endif
 
 if exists('b:current_syntax') | finish|  endif
 

-" first line (by convention always a single pasword
+" set redacted colors from colorscheme
+let s:error_highlight_str = execute( 'highlight Error' )
+let s:error_fg = matchstr(s:error_highlight_str, 'guifg=\zs\S*')
+
+let s:comment_highlight_str = execute( 'highlight Comment' )
+let s:comment_fg = matchstr(s:comment_highlight_str, 'guifg=\zs\S*')
+
+" first line (by convention always a single pasword)

 syntax match password_store_password /\%1l.*/
 syntax match password_store_password /\%1l.*/

-highlight password_store_password guifg=DarkGray guibg=DarkGray ctermfg=8 ctermbg=8
+execute 'highlight password_store_password ' .
+            \ ' guibg=' . s:comment_fg .
+            \ ' guifg=' . s:comment_fg .
+            \ ' ctermfg=1 ctermbg=1'

 
 

+" highlight short passwords

 syntax match password_store_password_short /\%1l.\{,6\}$/
 syntax match password_store_password_short /\%1l.\{,6\}$/

-highlight password_store_password_short guifg=Red guibg=Red ctermfg=1 ctermbg=1
+" highlight password_store_password_short guifg=Red guibg=Red ctermfg=1 ctermbg=1
+execute 'highlight password_store_password_short ' .
+            \ ' guibg=' . s:error_fg .
+            \ ' guifg=' . s:error_fg .
+            \ ' ctermfg=1 ctermbg=1'

 
 " colon field value is the suggested path for additional information
 syntax match password_store_header '\v^[^:]+:'
 
 " colon field value is the suggested path for additional information
 syntax match password_store_header '\v^[^:]+:'