diff --git a/vim/en.utf-8.add b/vim/en.utf-8.add index 0291dc9..e1ad53f 100644 --- a/vim/en.utf-8.add +++ b/vim/en.utf-8.add @@ -115,3 +115,4 @@ CloudFlare Cloudflare test When +exit diff --git a/vim/en.utf-8.add.spl b/vim/en.utf-8.add.spl index 7f8f056..c052d9f 100644 Binary files a/vim/en.utf-8.add.spl and b/vim/en.utf-8.add.spl differ diff --git a/vim/rc.d/01.plugin-youcompleteme.vim b/vim/rc.d/01.plugin-youcompleteme.vim index f99c341..1dd9c92 100644 --- a/vim/rc.d/01.plugin-youcompleteme.vim +++ b/vim/rc.d/01.plugin-youcompleteme.vim @@ -25,5 +25,5 @@ nnoremap :call ToggleYCM() nnoremap gd :YcmCompleter GoToDefinition augroup ycm_hover - autocmd FileType rust,typescript,javascript,python nnoremap ? (YCMHover) + autocmd FileType rust,typescript,javascript,python nnoremap K (YCMHover) augroup end diff --git a/vim/rc.d/32.utility-scwrypts.vim b/vim/rc.d/32.utility-scwrypts.vim index bb1ff80..d3dd314 100644 --- a/vim/rc.d/32.utility-scwrypts.vim +++ b/vim/rc.d/32.utility-scwrypts.vim @@ -2,12 +2,12 @@ " 31.utility-execute.vim wrapper for scwrypts-specific execution " -function ExecuteScwrypt(scwrypt = '', args = '', output = '', syntax = 'bash') +function ExecuteScwrypt(scwrypt = '', args = '', output = '', syntax = 'bash', loglevel = '0') let b:scwryptsPrevArgs = a:args - call ExecuteCommand('scwrypts -n ' . a:scwrypt . ' -- ' . a:args, a:output, 'shell', a:syntax) + call ExecuteCommand('scwrypts --log-level ' . a:loglevel . ' ' . a:scwrypt . ' -- ' . a:args, a:output, 'shell', a:syntax) echom 'scwrypts -n ' . a:scwrypt . '--' . a:args endfunction -function ExecuteScwryptInteractive(scwrypt = '', args = '', output = '', syntax = 'bash') - call ExecuteScwrypt(a:scwrypt, a:args . input('scwrypts ' . a:scwrypt . '--' . a:args), a:output, a:syntax) +function ExecuteScwryptInteractive(scwrypt = '', args = '', output = '', syntax = 'bash', loglevel = '4') + call ExecuteScwrypt(a:scwrypt, a:args . input('scwrypts ' . a:scwrypt . '--' . a:args), a:output, a:syntax, a:loglevel) endfunction diff --git a/vim/rc.d/34.utility-quick-repl.vim b/vim/rc.d/34.utility-quick-repl.vim index 63bff49..e66eeba 100644 --- a/vim/rc.d/34.utility-quick-repl.vim +++ b/vim/rc.d/34.utility-quick-repl.vim @@ -51,7 +51,7 @@ function QuickREPL(repl = '') let b:quick_repl = l:repl let l:output = get(g:quickrepl_output_format_overrides_by_repl_command, l:repl, g:quickrepl_output_format_default) - let l:repl_args = get(g:quickrepl_repl_command_args, l:repl, '') + let l:repl_args = get(g:quickrepl_repl_command_args_by_repl_command, l:repl, '') call ExecuteCommand(l:repl . ' ' . l:repl_args, l:output) endfunction diff --git a/vim/rc.d/35.utility-quick-command.vim b/vim/rc.d/35.utility-quick-command.vim index 708b1ab..d22608f 100644 --- a/vim/rc.d/35.utility-quick-command.vim +++ b/vim/rc.d/35.utility-quick-command.vim @@ -67,4 +67,4 @@ endfunction nnoremap t :call QuickCommand() nnoremap gst :call QuickCommandSetGlobal() -nnoremap t :call QuickCommandReset() +"nnoremap t :call QuickCommandReset() diff --git a/vim/rc.d/42.file-execute.vim b/vim/rc.d/42.file-execute.vim index 78d962b..2a3d866 100644 --- a/vim/rc.d/42.file-execute.vim +++ b/vim/rc.d/42.file-execute.vim @@ -63,9 +63,9 @@ augroup file_specific_commands autocmd FileType *.scwrypts let b:scwryptsEnvs = split(system('scwrypts --list-envs'), '\n') autocmd FileType *.scwrypts let b:scwryptsEnvChoices = split(system('echo SCWRYPTS_ENV=; scwrypts --list-envs | awk "{print \"\"NR\". \"\$0}"'), '\n') - autocmd FileType *.scwrypts let b:executeDefault = "call ExecuteScwrypt(b:scwryptsAutoName, ' ', 'split-pane-vertical')" - autocmd FileType *.scwrypts let b:executeInteractive = "call ExecuteScwryptInteractive(b:scwryptsAutoName, ' ', 'split-pane-vertical')" + autocmd FileType *.scwrypts let b:executeDefault = "call ExecuteScwrypt(b:scwryptsAutoName, ' ', 'split-pane-horizontal', 'bash', '4')" + autocmd FileType *.scwrypts let b:executeInteractive = "call ExecuteScwryptInteractive(b:scwryptsAutoName, ' ', 'split-pane-horizontal')" autocmd FileType *.scwrypts let b:executeBuild = "let $SCWRYPTS_ENV=b:scwryptsEnvs[inputlist(b:scwryptsEnvChoices) - 1]" - autocmd FileType *.scwrypts let b:executeTest = "call ExecuteScwrypt(b:scwryptsAutoName, b:scwryptsPrevArgs, 'split-pane-vertical')" + autocmd FileType *.scwrypts let b:executeTest = "call ExecuteScwrypt(b:scwryptsAutoName, b:scwryptsPrevArgs, 'split-pane-horizontal', 'bash', '4')" augroup end " }}}