From 914754a04e0ea0882b3172230199fd771b02dc95 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Thu, 28 Mar 2019 13:34:26 +0100 Subject: [PATCH] Disable smart_auto_mappings by default Ref: https://github.com/davidhalter/jedi-vim/issues/568 --- autoload/jedi.vim | 2 +- doc/jedi-vim.txt | 10 +++++----- test/vspec/completions.vim | 35 +++++++++++++++++++++++++++-------- 3 files changed, 33 insertions(+), 14 deletions(-) diff --git a/autoload/jedi.vim b/autoload/jedi.vim index 4062c30..0eb52c0 100644 --- a/autoload/jedi.vim +++ b/autoload/jedi.vim @@ -34,7 +34,7 @@ let s:default_settings = { \ 'popup_select_first': 1, \ 'quickfix_window_height': 10, \ 'force_py_version': "'auto'", - \ 'smart_auto_mappings': 1, + \ 'smart_auto_mappings': 0, \ 'use_tag_stack': 1 \ } diff --git a/doc/jedi-vim.txt b/doc/jedi-vim.txt index abd66c5..b3a3ac4 100644 --- a/doc/jedi-vim.txt +++ b/doc/jedi-vim.txt @@ -498,14 +498,14 @@ Default: "auto" 6.13. `g:jedi#smart_auto_mappings` *g:jedi#smart_auto_mappings* When you start typing `from module.name` jedi-vim automatically -adds the "import" statement and displays the autocomplete popup. +can add the "import" statement and trigger the autocompletion popup. -This option can be disabled in the .vimrc: - -`let g:jedi#smart_auto_mappings = 0` +You can enable this using: > + let g:jedi#smart_auto_mappings = 1 +< Options: 0 or 1 -Default: 1 (enabled by default) +Default: 0 (disabled by default) ------------------------------------------------------------------------------ 6.14. `g:jedi#use_tag_stack` *g:jedi#use_tag_stack* diff --git a/test/vspec/completions.vim b/test/vspec/completions.vim index 8701d8a..068e539 100644 --- a/test/vspec/completions.vim +++ b/test/vspec/completions.vim @@ -27,15 +27,9 @@ describe 'completions' set completeopt-=longest end - it 'smart import' + it 'no smart import by default' exec "normal ifrom os " - Expect getline('.') == 'from os import ' - end - - it 'no smart import after space' - exec "normal! ifrom os " - exec "normal a " - Expect getline('.') == 'from os ' + Expect getline('.') == 'from os ' end it 'import' @@ -109,4 +103,29 @@ describe 'completions' end end +describe 'smart completions' + before + new + let g:jedi#smart_auto_mappings = 1 + set filetype=python + end + + after + " default + let g:jedi#smart_auto_mappings = 0 + bd! + end + + it 'smart import' + exec "normal ifrom os " + Expect getline('.') == 'from os import ' + end + + it 'no smart import after space' + exec "normal! ifrom os " + exec "normal a " + Expect getline('.') == 'from os ' + end +end + " vim: et:ts=4:sw=4