From 6d05c25873f2f43225e179b30586fb6fb3c125ca Mon Sep 17 00:00:00 2001
From: Daniel Hahler <github@thequod.de>
Date: Mon, 15 Jan 2018 08:37:35 +0100
Subject: [PATCH] Factor out jedi#setup_completion (#768)

---
 after/ftplugin/python/jedi.vim | 24 ++----------------------
 autoload/jedi.vim              | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/after/ftplugin/python/jedi.vim b/after/ftplugin/python/jedi.vim
index 2798207..f198360 100644
--- a/after/ftplugin/python/jedi.vim
+++ b/after/ftplugin/python/jedi.vim
@@ -1,23 +1,3 @@
-if !jedi#init_python()
-    finish
-endif
-
-if g:jedi#auto_initialization
-    if g:jedi#completions_enabled
-        " We need our own omnifunc, so this overrides the omnifunc set by
-        " $VIMRUNTIME/ftplugin/python.vim.
-        setlocal omnifunc=jedi#completions
-
-        " map ctrl+space for autocompletion
-        if g:jedi#completions_command ==# '<C-Space>'
-            " In terminals, <C-Space> sometimes equals <Nul>.
-            imap <buffer> <Nul> <C-Space>
-            smap <buffer> <Nul> <C-Space>
-        endif
-        if len(g:jedi#completions_command)
-            execute 'inoremap <expr> <buffer> '.g:jedi#completions_command.' jedi#complete_string(0)'
-            " A separate mapping for select mode: deletes and completes.
-            execute 'snoremap <expr> <buffer> '.g:jedi#completions_command." '\<C-g>c'.jedi#complete_string(0)"
-        endif
-    endif
+if jedi#init_python() && g:jedi#auto_initialization && g:jedi#completions_enabled
+    call jedi#setup_completion()
 endif
diff --git a/autoload/jedi.vim b/autoload/jedi.vim
index c890df9..54ac65a 100644
--- a/autoload/jedi.vim
+++ b/autoload/jedi.vim
@@ -614,6 +614,24 @@ function! jedi#smart_auto_mappings() abort
 endfunction
 
 
+function! jedi#setup_completion() abort
+    " We need our own omnifunc, so this overrides the omnifunc set by
+    " $VIMRUNTIME/ftplugin/python.vim.
+    setlocal omnifunc=jedi#completions
+
+    " map ctrl+space for autocompletion
+    if g:jedi#completions_command ==# '<C-Space>'
+        " In terminals, <C-Space> sometimes equals <Nul>.
+        imap <buffer> <Nul> <C-Space>
+        smap <buffer> <Nul> <C-Space>
+    endif
+    if len(g:jedi#completions_command)
+        execute 'inoremap <expr> <buffer> '.g:jedi#completions_command.' jedi#complete_string(0)'
+        " A separate mapping for select mode: deletes and completes.
+        execute 'snoremap <expr> <buffer> '.g:jedi#completions_command." '\<C-g>c'.jedi#complete_string(0)"
+    endif
+endfunction
+
 "PythonJedi jedi_vim.jedi.set_debug_function(jedi_vim.print_to_stdout, speed=True, warnings=False, notices=False)
 "PythonJedi jedi_vim.jedi.set_debug_function(jedi_vim.print_to_stdout)