From d50dd19f6f93becacf30419695e21200dc210a34 Mon Sep 17 00:00:00 2001 From: Jesse Luehrs Date: Thu, 8 Mar 2018 02:40:01 -0500 Subject: initial implementation --- LICENSE | 19 ++++++++++++ README.md | 15 ++++++++++ doc/history-sync.txt | 20 +++++++++++++ plugin/history-sync.vim | 77 +++++++++++++++++++++++++++++++++++++++++++++++++ sh/history-sync.zsh | 17 +++++++++++ 5 files changed, 148 insertions(+) create mode 100644 LICENSE create mode 100644 README.md create mode 100644 doc/history-sync.txt create mode 100644 plugin/history-sync.vim create mode 100644 sh/history-sync.zsh diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..d59eb6e --- /dev/null +++ b/LICENSE @@ -0,0 +1,19 @@ +Copyright 2018 Jesse Luehrs + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +of the Software, and to permit persons to whom the Software is furnished to do +so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/README.md b/README.md new file mode 100644 index 0000000..01445ac --- /dev/null +++ b/README.md @@ -0,0 +1,15 @@ +# Overview + +When opening files in Vim from the shell, this plugin adds an entry to Vim's +command history in the form `:e foo.rb` . Also, when opening files in Vim, +adds an entry to the shell history in the form `vim foo.rb` . + +# Installation + +This plugin can be installed as a standard Vim package (see `:help packages`). +Simply clone this repository into ~/.vim/pack/plugins/start/vim-history-sync to +install the Vim files for this plugin. + +To enable this plugin, add `. /path/to/vim-history-sync/sh/history-sync.zsh` +to your .zshrc. Currently only zsh is supported, although patches are welcome +to add support for other shells. diff --git a/doc/history-sync.txt b/doc/history-sync.txt new file mode 100644 index 0000000..7ed0c4f --- /dev/null +++ b/doc/history-sync.txt @@ -0,0 +1,20 @@ +*history-sync.txt* Keeps your shell history and Vim history in sync. + +Author: Jesse Luehrs +License: MIT + +============================================================================= +OVERVIEW *history-sync-overview* + +When opening files in Vim from the shell, this plugin adds an entry to Vim's +command history in the form `:e foo.rb` . Also, when opening files in Vim, +adds an entry to the shell history in the form `vim foo.rb` . + +============================================================================= +INSTALLATION *history-sync-installation* + +To enable this plugin, add `. /path/to/vim-history-sync/sh/history-sync.zsh` +to your .zshrc. Currently only zsh is supported, although patches are welcome +to add support for other shells. + + vim:tw=78:et:ft=help:norl: diff --git a/plugin/history-sync.vim b/plugin/history-sync.vim new file mode 100644 index 0000000..3f32333 --- /dev/null +++ b/plugin/history-sync.vim @@ -0,0 +1,77 @@ +if $SHELL !~# 'zsh' || !exists('g:_zsh_hist_fname') + finish +endif + +let s:initial_files = {} + +augroup zshhistory + autocmd! + autocmd VimEnter * call init_zsh_hist() + autocmd BufNewFile,BufRead * call zsh_hist_append() + autocmd BufDelete * call remove_initial_file(expand("")) + autocmd VimLeave * call reorder_zsh_hist() +augroup END + +function! s:remove_initial_file (file) + if has_key(s:initial_files, a:file) + unlet s:initial_files[a:file] + endif +endfunction + +function! s:get_buffer_list_text () + redir => l:output + ls! + redir END + return l:output +endfunction + +function! s:get_buffer_list () + silent let l:output = get_buffer_list_text() + let l:buffer_list = [] + for l:buffer_desc in split(l:output, "\n") + let l:name = bufname(str2nr(l:buffer_desc)) + if l:name != "" + call add(l:buffer_list, l:name) + endif + endfor + return l:buffer_list +endfunction + +function! s:init_zsh_hist () + for l:fname in get_buffer_list() + if strlen(l:fname) > 0 + let s:initial_files[l:fname] = 1 + call histadd(":", "e " . l:fname) + endif + endfor + call delete(g:_zsh_hist_fname) +endfunction + +function! s:zsh_hist_append () + let l:to_append = expand("%:~:.") + " XXX these set buftype too late to be caught by this... + " this is broken, but not sure what a better fix is + if &buftype == '' && l:to_append !~# '^\(__Gundo\|Startify\|\[denite\]\)' + if !has_key(s:initial_files, l:to_append) + if filereadable(g:_zsh_hist_fname) + let l:hist = readfile(g:_zsh_hist_fname) + else + let l:hist = [] + endif + call add(l:hist, l:to_append) + call writefile(l:hist, g:_zsh_hist_fname) + endif + endif +endfunction + +function! s:reorder_zsh_hist () + let l:current_file = expand("%:~:.") + if filereadable(g:_zsh_hist_fname) + let l:hist = readfile(g:_zsh_hist_fname) + if !has_key(s:initial_files, l:current_file) + call filter(l:hist, 'v:val != l:current_file') + endif + call add(l:hist, l:current_file) + call writefile(l:hist, g:_zsh_hist_fname) + endif +endfunction diff --git a/sh/history-sync.zsh b/sh/history-sync.zsh new file mode 100644 index 0000000..586417f --- /dev/null +++ b/sh/history-sync.zsh @@ -0,0 +1,17 @@ +mkdir -p $HOME/.cache/vim/hist +function vim { + local zsh_hist_fname + zsh_hist_fname=$HOME/.cache/vim/hist/$$ + command vim --cmd "let g:_zsh_hist_fname = '$zsh_hist_fname'" "$@" + if [[ -r $zsh_hist_fname ]]; then + while read line; do + if echo $line | grep -q "[[:space:]']"; then + line=${line/\'/\'\\\\\'\'} + line="'$line'" + fi + print -s "vim $line" + done < $zsh_hist_fname + fc -AI + rm -f $zsh_hist_fname + fi +} -- cgit v1.2.3