Merge pull request #1 from phux/master

sahibalejandro · web-flow · commit 07c9575ca9ac · 2017-04-29T12:59:17.000-05:00
Fixed importing in wrong window if multiple splits open
diff --git a/plugin/vim-php.vim b/plugin/vim-php.vim
@@ -13,6 +13,8 @@ let s:action = 'use'
 " Tag kinds, to use on s:GetTagKind(...)
 let s:kinds = {'c': 'Class', 't': 'Trait', 'i': 'Interface'}
 
+let s:previous_win_nr = 0
+
 " Define commands for PHP user
 command! PHPImportClass call s:PHPImportClass('use')
 command! PHPExpandFQCN call s:PHPImportClass('expand_fqcn')
@@ -22,6 +24,7 @@ command! PHPExpandFQCNAbsolute call s:PHPImportClass('expand_fqcn_absolute')
 " Start the import process
 "
 function! s:PHPImportClass(action)
+    let s:previous_win_nr = winnr()
     let s:action = a:action
     let l:class = expand('<cword>')
     let s:tags = s:SearchTags(l:class)
@@ -88,6 +91,8 @@ function! s:SelectOption(index)
         let s:windowIsOpen = 0
     endif
 
+    execute ":".s:previous_win_nr."wincmd w"
+
     if s:action == 'use'
         if s:FqcnExists(l:fqcn)
             call s:Message(l:kind.' "'.l:fqcn.'" already in use.')
