Skip to content

Commit

Permalink
Disable smart_auto_mappings by default
Browse files Browse the repository at this point in the history
Ref: #568
  • Loading branch information
blueyed authored and davidhalter committed Apr 5, 2019
1 parent f26b2a8 commit 914754a
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 14 deletions.
2 changes: 1 addition & 1 deletion autoload/jedi.vim
Original file line number Diff line number Diff line change
Expand Up @@ -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
\ }

Expand Down
10 changes: 5 additions & 5 deletions doc/jedi-vim.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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<space>` 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*
Expand Down
35 changes: 27 additions & 8 deletions test/vspec/completions.vim
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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

0 comments on commit 914754a

Please sign in to comment.