6.01 :

- Improved error handling.
- Improved head match.
- Use completefunc_complete if available.
- Fixed trunk string.
- Escape complete candidates.
- Improved Windows pty support.
- Improved password input.
- Improved echo back.
- Improved encoding.
- Implemented next_prompt() in iexe.
- Implemented arguments completion.
- Set interactive option in Windows iexe.
- Fixed force exit error.

Author: Shougo

autoload/vimshell/complete/helper.vim

@@ -235,5 +235,8 @@ endfunction"}}}
 function! vimshell#complete#helper#compare_rank(i1, i2)"{{{
     return a:i1.rank < a:i2.rank ? 1 : a:i1.rank == a:i2.rank ? 0 : -1
 endfunction"}}}
+function! vimshell#complete#helper#keyword_filter(list, cur_keyword_str)"{{{
+    return filter(a:list, 'v:val =~ ' . string('^' . escape(a:cur_keyword_str, '~" \.^$[]*')))
+endfunction"}}}
 
 " vim: foldmethod=marker

autoload/vimshell/complete/interactive_complete.vim

@@ -0,0 +1,103 @@
+"=============================================================================
+" FILE: interactive_complete.vim
+" AUTHOR: Shougo Matsushita <[email protected]>
+" Last Modified: 03 Jun 2009
+" License: MIT license  {{{
+"     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.
+" }}}
+"=============================================================================
+
+function! vimshell#complete#interactive_complete#complete()"{{{
+    let &iminsert = 0
+    let &imsearch = 0
+
+    " Interactive completion.
+
+    if exists(':NeoComplCacheDisable') && exists('*neocomplcache#complfunc#completefunc_complete#call_completefunc')
+        return neocomplcache#complfunc#completefunc_complete#call_completefunc('vimshell#complete#interactive_complete#omnifunc')
+    else
+        " Set complete function.
+        let &l:omnifunc = 'vimshell#complete#interactive_complete#omnifunc'
+        
+        return "\<C-x>\<C-o>\<C-p>"
+    endif
+endfunction"}}}
+
+function! vimshell#complete#interactive_complete#omnifunc(findstart, base)"{{{
+    if a:findstart
+        let l:pos = mode() ==# 'i' ? 2 : 1
+        let l:cur_text = col('.') < l:pos ? '' : getline('.')[: col('.') - l:pos]
+        return match(l:cur_text, '\%([[:alnum:]_+~-]\|\\[ ]\)*$')
+    endif
+
+    " Save option.
+    let l:ignorecase_save = &ignorecase
+
+    " Complete.
+    if g:VimShell_SmartCase && a:base =~ '\u'
+        let &ignorecase = 0
+    else
+        let &ignorecase = g:VimShell_IgnoreCase
+    endif
+
+    let l:complete_words = s:get_complete_candidates(a:base)
+
+    " Restore option.
+    let &ignorecase = l:ignorecase_save
+    if &l:omnifunc != ''
+        let &l:omnifunc = ''
+    endif
+
+    return l:complete_words
+endfunction"}}}
+
+function! s:get_complete_candidates(cur_keyword_str)"{{{
+    let l:list = []
+
+    " Do command completion.
+    let l:in = getline('.')
+    let l:prompt = l:in
+
+    if l:in == '...'
+        let l:in = ''
+        " Working
+    elseif !exists('b:prompt_history')
+        let l:in = ''
+    elseif exists("b:prompt_history['".line('.')."']")
+        let l:in = l:in[len(b:prompt_history[line('.')]) : ]
+    endif
+    
+    call b:vimproc_sub[0].write(l:in . "\<TAB>")
+    
+    " Get output.
+    let l:read = b:vimproc_sub[0].read(-1, 40)
+    let l:output = ''
+    while vimshell#head_match(split(l:output, '\r\n\|\n', 1)[-1], l:prompt)
+        let l:output .= l:read
+        let l:outputed = 1
+
+        let l:read = b:vimproc_sub[0].read(-1, 40)
+    endwhile
+    let l:candidates = split(l:output, '\r\n\|\n')[: -2]
+
+    return vimshell#complete#helper#keyword_filter(l:candidates, a:cur_keyword_str)
+endfunction"}}}
+
+" vim: foldmethod=marker

autoload/vimshell/interactive.vim

@@ -1,7 +1,7 @@
 "=============================================================================
 " FILE: interactive.vim
 " AUTHOR:  Shougo Matsushita <[email protected]>
-" Last Modified: 25 Dec 2009
+" Last Modified: 03 Jun 2009
 " License: MIT license  {{{
 "     Permission is hereby granted, free of charge, to any person obtaining
 "     a copy of this software and associated documentation files (the
@@ -50,6 +50,12 @@ function! vimshell#interactive#execute_pty_inout(is_interactive)"{{{
         " Password input.
         set imsearch=0
         let l:in = inputsecret('Input Secret : ')
+
+        if &termencoding != '' && &encoding != &termencoding
+            " Convert encoding.
+            let l:in = iconv(l:in, &encoding, &termencoding)
+        endif
+
         call b:vimproc_sub[0].write(l:in . "\<NL>")
         let b:vimproc_is_secret = 0
     elseif !b:vimproc_sub[0].eof
@@ -98,13 +104,8 @@ function! vimshell#interactive#execute_pty_inout(is_interactive)"{{{
             " Still nothing? We give up.
             if l:prompt_search == 0
                 echohl WarningMsg | echo "Invalid input." | echohl None
-                "normal! G$
-                "startinsert!
-                "return
             endif
         endif
-        " Delete input string for echoback.
-        call setline(line('.'), getline('.')[: -(len(l:in)+1)])
 
         " record command history
         if !exists('b:interactive_command_history')
@@ -116,33 +117,60 @@ function! vimshell#interactive#execute_pty_inout(is_interactive)"{{{
         let b:interactive_command_position = 0
 
         try
+            if &termencoding != '' && &encoding != &termencoding
+                " Convert encoding.
+                let l:in = iconv(l:in, &encoding, &termencoding)
+            endif
+
             if l:in =~ "$"
                 " EOF.
                 call b:vimproc_sub[0].write(l:in[:-2] . s:is_win ? "" : "")
+                let b:skip_echoback = l:in[:-2]
                 call vimshell#interactive#execute_pty_out()
 
                 call vimshell#interactive#exit()
                 return
             elseif l:in =~ '\t$'
                 " Completion.
                 call b:vimproc_sub[0].write(l:in)
+                let b:skip_echoback = l:in[: -1]
             elseif l:in != '...'
-                if l:in =~ '^\.\.\.'
+                if l:in =~ '^-> '
                     " Delete ...
                     let l:in = l:in[3:]
                 endif
 
                 call b:vimproc_sub[0].write(l:in . "\<NL>")
+                let b:skip_echoback = l:in
             endif
         catch
             call b:vimproc_sub[0].close()
         endtry
     endif
 
-    call append(line('$'), '...')
-    normal! G$
+    if getline('$') != '...'
+        call append(line('$'), '...')
+        normal! G$
+    endif
 
     call vimshell#interactive#execute_pty_out()
+    
+    while b:vimproc_is_secret
+        " Password input.
+        set imsearch=0
+        let l:in = inputsecret('Input Secret : ')
+
+        if &termencoding != '' && &encoding != &termencoding
+            " Convert encoding.
+            let l:in = iconv(l:in, &encoding, &termencoding)
+        endif
+        
+        call b:vimproc_sub[0].write(l:in . "\<NL>")
+        let b:vimproc_is_secret = 0
+
+        call vimshell#interactive#execute_pty_out()
+    endwhile
+    
     if getline(line('$')) =~ '^\s*$'
         call setline(line('$'), '...')
     endif
@@ -162,21 +190,30 @@ function! vimshell#interactive#execute_pty_out()"{{{
     let l:i = 0
     let l:submax = len(b:vimproc_sub) - 1
     let l:outputed = 0
+    let l:output = ''
     for sub in b:vimproc_sub
         if !sub.eof
             let l:read = sub.read(-1, 40)
             while l:read != ''
-                if l:i < l:submax
-                    " Write pipe.
-                    call b:vimproc_sub[l:i + 1].write(l:read)
-                else
-                    call s:print_buffer(b:vimproc_fd, l:read)
-                    redraw
-                endif
+                let l:output .= l:read
+                let l:outputed = 1
 
                 let l:read = sub.read(-1, 40)
-                let l:outputed = 1
             endwhile
+
+            if l:output != ''
+                if exists('b:skip_echoback')
+                    if vimshell#head_match(l:output, b:skip_echoback)
+                        let l:output = l:output[len(b:skip_echoback) :]
+                    else
+                        " Newline.
+                        let l:output = "\<NL>" . l:output
+                    endif
+                endif
+
+                call s:print_buffer(b:vimproc_fd, l:output)
+                redraw
+            endif
         endif
 
         let l:i += 1
@@ -186,6 +223,7 @@ function! vimshell#interactive#execute_pty_out()"{{{
     if !exists('b:prompt_history')
         let b:prompt_history = {}
     endif
+
     if l:outputed
         let b:prompt_history[line('.')] = getline('.')
     endif
@@ -280,7 +318,7 @@ function! vimshell#interactive#force_exit()"{{{
         try
             " 15 == SIGTERM
             call sub.vp_kill(15)
-        catch /No such process/
+        catch
         endtry
     endfor
 
@@ -330,11 +368,7 @@ function! vimshell#interactive#interrupt()"{{{
         endtry
     endfor
 
-    if has('win32') || has('win64')
-        call vimshell#interactive#execute_pipe_out()
-    else
-        call vimshell#interactive#execute_pty_out()
-    endif
+    call vimshell#interactive#execute_pty_out()
 endfunction"}}}
 
 function! vimshell#interactive#highlight_escape_sequence()"{{{
@@ -431,7 +465,11 @@ function! s:print_buffer(fd, string)"{{{
         return
     endif
 
-    if a:string =~ s:password_regex
+    " Convert encoding.
+    let l:string = (&termencoding != '' && &encoding != &termencoding) ?
+                \ iconv(a:string, &termencoding, &encoding) : a:string
+
+    if l:string =~ s:password_regex
         " Set secret flag.
         let b:vimproc_is_secret = 1
     endif
@@ -441,23 +479,16 @@ function! s:print_buffer(fd, string)"{{{
             " Nothing.
         elseif a:fd.stdout == '/dev/clip'
             " Write to clipboard.
-            let @+ .= a:string
+            let @+ .= l:string
         else
             " Write file.
-            let l:file = extend(readfile(a:fd.stdout), split(a:string, '\r\n\|\n'))
+            let l:file = extend(readfile(a:fd.stdout), split(l:string, '\r\n\|\n'))
             call writefile(l:file, a:fd.stdout)
         endif
 
         return
     endif
 
-    " Convert encoding for system().
-    if has('win32') || has('win64')
-        let l:string = iconv(a:string, 'cp932', &encoding) 
-    else
-        let l:string = iconv(a:string, 'utf-8', &encoding) 
-    endif
-
     " Strip <CR>.
     if getline(line('$')) == '...'
         $delete
@@ -480,28 +511,25 @@ function! s:error_buffer(fd, string)"{{{
         return
     endif
 
+    " Convert encoding.
+    let l:string = (&termencoding != '' && &encoding != &termencoding) ?
+                \ iconv(a:string, &termencoding, &encoding) : a:string
+
     if a:fd.stderr != ''
         if a:fd.stderr == '/dev/null'
             " Nothing.
         elseif a:fd.stderr == '/dev/clip'
             " Write to clipboard.
-            let @+ .= a:string
+            let @+ .= l:string
         else
             " Write file.
-            let l:file = extend(readfile(a:fd.stderr), split(a:string, '\r\n\|\n'))
+            let l:file = extend(readfile(a:fd.stderr), split(l:string, '\r\n\|\n'))
             call writefile(l:file, a:fd.stderr)
         endif
 
         return
     endif
 
-    " Convert encoding for system().
-    if has('win32') || has('win64')
-        let l:string = iconv(a:string, 'cp932', &encoding) 
-    else
-        let l:string = iconv(a:string, 'utf-8', &encoding) 
-    endif
-
     " Print buffer.
     " Strip <CR>.
     let l:last_line = getline(line('$'))