support incsearch

Author: ZSaberLv0

plugin/incsearch.vim

@@ -27,36 +27,85 @@ function! s:onUpdate()
     if empty(cmd)
         return
     endif
-    let hlsearchSaved = &hlsearch
-    set nohlsearch
+    let pattern = E2v(cmd['pattern'])
+
+    if !exists('s:hlsearchSaved')
+        let s:hlsearchSaved = &hlsearch
+    endif
     if !exists('s:patternSaved')
         let s:patternSaved = @/
         if !has('nvim')
             let s:eregex_incsearch_abort = 1
         endif
     endif
-    let @/ = E2v(cmd['pattern'])
-    if hlsearchSaved
+    if !exists('s:stateSaved')
+        let s:stateSaved = winsaveview()
+    endif
+
+    set nohlsearch
+
+    if !empty(pattern)
+        let @/ = pattern
+
+        let pos = searchpos(pattern, 'cnw')
+        if pos[0] > 0 && pos[1] > 0
+            if pos[1] > 1
+                let pos[1] -= 1
+            endif
+            let curpos = getpos('.')
+            let curpos[1] = pos[0]
+            let curpos[2] = pos[1]
+            call setpos('.', curpos)
+        endif
+    endif
+
+    if s:hlsearchSaved && !empty(pattern)
         set hlsearch
+    else
+        set nohlsearch
     endif
     redraw
 endfunction
 
 function! s:onLeave()
-    if !exists('s:patternSaved')
-        return
+    if exists('s:hlsearchSaved')
+        let hlsearchSaved = s:hlsearchSaved
+        unlet s:hlsearchSaved
+    endif
+    if exists('s:patternSaved')
+        let patternSaved = s:patternSaved
+        unlet s:patternSaved
+    endif
+    if exists('s:stateSaved')
+        let stateSaved = s:stateSaved
+        unlet s:stateSaved
+    endif
+
+    if exists('hlsearchSaved')
+        if hlsearchSaved
+            set hlsearch
+        else
+            set nohlsearch
+        endif
     endif
-    let patternSaved = s:patternSaved
-    unlet s:patternSaved
+
     if has('nvim')
         let abort = get(v:event, 'abort', 0)
     else
         let abort = get(s:, 'eregex_incsearch_abort', 0)
     endif
-    if abort
+    if !abort
+        return
+    endif
+
+    if exists('patternSaved')
         let @/ = patternSaved
-        redraw!
     endif
+    if exists('stateSaved')
+        call winrestview(stateSaved)
+    endif
+
+    redraw!
 endfunction
 
 " input: M/abc
@@ -72,8 +121,8 @@ endfunction
 " }
 function! s:cmdParse(cmdline)
     let token = nr2char(127)
-    let items = split(substitute(a:cmdline, '\\/', token, 'g'), '/')
-    if len(items) <= 1
+    let items = split(substitute(a:cmdline, '\\/', token, 'g'), '/', 1)
+    if len(items) < 2
         return {}
     endif
     let modes = get(g:, 'eregex_incsearch_modes', get(b:, 'eregex_incsearch_modes', 'MSGV'))
@@ -84,7 +133,7 @@ function! s:cmdParse(cmdline)
     endif
     return {
                 \   'method' : method,
-                \   'pattern' : substitute(items[1], token, '\\/', 'g'),
+                \   'pattern' : substitute(get(items, 1, ''), token, '\\/', 'g'),
                 \ }
 endfunction