neovim: refactor

2 files changed, 43 insertions, 13 deletions

diff --git a/.config/nvim/plugin/autosave.vim b/.config/nvim/plugin/autosave.vim
index 6339dcb..ab8a227 100644
--- a/.config/nvim/plugin/autosave.vim
+++ b/.config/nvim/plugin/autosave.vim
@@ -5,25 +5,17 @@ if exists('g:loaded_autosave')
 endif
 
 
-
 command! -bar
     \ AutosaveEnable
-    \ call autosave#enable()
-
+    \ lua require('autosave').enable()
 
 command! -bar
     \ AutosaveDisable
-    \ call autosave#disable()
-
+    \ lua require('autosave').disable()
 
 command! -bar
     \ AutosaveToggle
-    \ if exists('b:autosave_timer') |
-    \     call autosave#disable() |
-    \ else |
-    \     call autosave#enable() |
-    \ endif
-
+    \ lua require('autosave').toggle()
 
 
 let g:loaded_autosave = 1
diff --git a/.config/nvim/plugin/dummy.vim b/.config/nvim/plugin/dummy.vim
index ce7b901..dcf8ae4 100644
--- a/.config/nvim/plugin/dummy.vim
+++ b/.config/nvim/plugin/dummy.vim
@@ -6,9 +6,47 @@ endif
 
 
 
-command! -bar -complete=customlist,dummy#complete -nargs=1
+let s:text = {}
+
+let s:text.lipsum = [
+    \ 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor',
+    \ 'incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis',
+    \ 'nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.',
+    \ 'Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore',
+    \ 'eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt',
+    \ 'in culpa qui officia deserunt mollit anim id est laborum.',
+    \ ]
+
+let s:text.lipsum1 = join(s:text.lipsum)
+
+let s:text.quickbrownfox = 'The quick brown fox jumps over the lazy dog.'
+
+let s:text.ABC = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+
+let s:text.abc = 'abcdefghijklmnopqrstuvwxyz'
+
+let s:text.hiragana = 'あいうえおかきくけこさしすせそたちつてとなにぬねのはひふへほまみむめもやゆよらりるれろわをん'
+
+let s:text.katakana = 'アイウエオカキクケコサシスセソタチツテトナニヌネノハヒフヘホマミムメモヤユヨラリルレロワヲン'
+
+let s:text.ihatovo = 'あのイーハトーヴォのすきとおった風、夏でも底に冷たさをもつ青いそら、うつくしい森で飾られたモリーオ市、郊外のぎらぎらひかる草の波。'
+
+
+
+function! Dummy_insert(type)
+    call append(line('.'), get(s:text, a:type, ''))
+endfunction
+
+
+function! Dummy_complete(arglead, cmdline, cursorpos) abort
+    return sort(filter(keys(s:text), {idx, val -> val[0:len(a:arglead)-1] =~? a:arglead}))
+endfunction
+
+
+
+command! -bar -complete=customlist,Dummy_complete -nargs=1
     \ Dummy
-    \ call dummy#insert(<f-args>)
+    \ call Dummy_insert(<f-args>)