From a394adbdf634ab99b82054b0b3a96f9aadcf4056 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Fri, 4 Jan 2019 22:26:37 +1300 Subject: Revert "Add experimental delimit_operator.vim plugin" This reverts commit 6ed48b12e451a0770d5a3f236e66e0e7e9a39c8d. I don't think this is the right approach. The main reason I dropped surround.vim was because I didn't like how often I was doing something that doesn't work at all in vanilla Vim. If I make a half-assed re-implementation, I'm just perpetuating the problem. --- vim/autoload/delimit_operator.vim | 50 --------------------------------------- vim/plugin/delimit_operator.vim | 12 ---------- vim/vimrc | 8 ------- 3 files changed, 70 deletions(-) delete mode 100644 vim/autoload/delimit_operator.vim delete mode 100644 vim/plugin/delimit_operator.vim diff --git a/vim/autoload/delimit_operator.vim b/vim/autoload/delimit_operator.vim deleted file mode 100644 index 026fe63f..00000000 --- a/vim/autoload/delimit_operator.vim +++ /dev/null @@ -1,50 +0,0 @@ -let s:pairs = { - \ '(': ')', - \ '<': '>', - \ '[': ']', - \ '{': '}', - \ } - -function! delimit_operator#Operatorfunc(type) abort - - let l:save = { - \ 'unnamed': @@, - \ 'clipboard': &clipboard, - \ 'selection': &selection - \ } - - set clipboard-=unnamed - set clipboard-=unnamedplus - - set selection=inclusive - - let l:delimiters = { - \ 'open': s:char, - \ 'close': get(s:pairs, s:char, s:char) - \ } - - if a:type ==# 'line' - silent normal! '[V']y - elseif a:type ==# 'block' - silent execute "normal! `[\`]y" - else - silent normal! `[v`]y - endif - - let @@ = l:delimiters['open'] - \ . @@ - \ . l:delimiters['close'] - - silent normal! gvp - - let @@ = l:save['unnamed'] - let &clipboard = l:save['clipboard'] - let &selection = l:save['selection'] - -endfunction - -function! delimit_operator#Map() abort - let s:char = nr2char(getchar()) - set operatorfunc=delimit_operator#Operatorfunc - return 'g@' -endfunction diff --git a/vim/plugin/delimit_operator.vim b/vim/plugin/delimit_operator.vim deleted file mode 100644 index 0a3e62fc..00000000 --- a/vim/plugin/delimit_operator.vim +++ /dev/null @@ -1,12 +0,0 @@ -if exists('g:loaded_delimit_operator') || &compatible - finish -endif -if v:version < 700 - finish -endif -let g:loaded_delimit_operator = 1 - -nnoremap (DelimitOperator) - \ delimit_operator#Map() -xnoremap (DelimitOperator) - \ delimit_operator#Map() diff --git a/vim/vimrc b/vim/vimrc index bf30df7d..724a32e7 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -421,13 +421,5 @@ nnoremap : ^"zyg_:z " \! executes line with 'shell' nnoremap ! ^"zyg_:!z -" Testing out delimit_operator.vim, in development -" Use q for a prefix key, followed by the wrapping quote -for s:char in ["'", '"', '`', '[', '<', '(', '{', '*'] - execute 'nmap q'.s:char.' (DelimitOperator)'.s:char - execute 'xmap q'.s:char.' (DelimitOperator)'.s:char -endfor -unlet s:char - " Source any .vim files from ~/.vim/config runtime! config/*.vim -- cgit v1.2.3