From: Josef Fortier Date: Sat, 23 Feb 2019 21:38:57 +0000 (-0600) Subject: Settings work, "increment" works X-Git-Url: https://git.madduck.net/etc/vim.git/commitdiff_plain/5af4f8855e8f1d65e24e8988f325413f171de903?ds=sidebyside;hp=--cc Settings work, "increment" works --- 5af4f8855e8f1d65e24e8988f325413f171de903 diff --git a/autoload/password_store.vim b/autoload/password_store.vim index d8ebedc..6b6260b 100644 --- a/autoload/password_store.vim +++ b/autoload/password_store.vim @@ -11,7 +11,8 @@ set compatible&vim " Return vim to users choice function! password_store#generate() abort if executable('pwgen') - return systemlist('pwgen -N1 ' . g:password_store_settings.pw_length )[0] + let l:result = systemlist('pwgen -N1 ' . password_store#setting('pw_length') ) + return l:result[0] endif endfunction diff --git a/ftdetect/pass.vim b/ftdetect/pass.vim index e80d8b6..0ce0f48 100644 --- a/ftdetect/pass.vim +++ b/ftdetect/pass.vim @@ -14,7 +14,7 @@ autocmd VimEnter \,$TMPDIR/pass.?*/?*.txt \,/tmp/pass.?*/?*.txt \ setlocal filetype=pass | - \ if password_store#setting('enable_syntax') ==# 'true' | setlocal syntax=pass_delayed | endif + \ if password_store#setting('enable_syntax') ==# 'true' | setlocal syntax=pass.obfuscated | endif " Cleanup at end let &cpoptions = s:save_cpo diff --git a/syntax/pass_delayed.vim b/syntax/obfuscated.vim similarity index 61% rename from syntax/pass_delayed.vim rename to syntax/obfuscated.vim index b925920..bc66594 100644 --- a/syntax/pass_delayed.vim +++ b/syntax/obfuscated.vim @@ -7,23 +7,13 @@ 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.*/ 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\}$/ -" 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^[^:]+:' -highlight link password_store_header PreProc - - diff --git a/syntax/pass.vim b/syntax/pass.vim new file mode 100644 index 0000000..1645720 --- /dev/null +++ b/syntax/pass.vim @@ -0,0 +1,15 @@ +if exists('b:current_syntax') | finish| endif + +" first line (by convention always a single pasword) +syntax match password_store_password /\%1l.*/ +highlight link password_store_password Comment + +" highlight short passwords +syntax match password_store_password_short /\%1l.\{,6\}$/ +highlight link password_store_password_short Error + +" colon field value is the suggested path for additional information +syntax match password_store_header '\v^[^:]+:' +highlight link password_store_header PreProc + +