NotificationsYou must be signed in to change notification settings
Fork773
Star5.5k

Commitbfd70f7

committed

fixed auto insert for rope complete

For details, see `:h completeopt` in vim.vim has many flags of option &completeopt, the flags like menu, menuone,noinsert, noselect and so on control the autocomplete behaviour.e.g. if the set completeopt=menu, and there's only one possiblecompletions, the vim will not popup a menu and just insert thecompletions, this like auto insert __init__ describe above, user there'sno chance to confirm the completions they want or not.but if set completeopt=menuone,noinsert, vim will popup menu also whenthere is only one match. for case above, vim will popup a menu with onecompletion item __init__ and let user choose insert it or escape, if addnoselect with &completeopt, vim will even not selected the firstcompletion item.

1 parentac97c66 commitbfd70f7Copy full SHA for bfd70f7

File tree

2 files changed

-3

lines changed

autoload/pymode
- rope.vim
pymode
- rope.py

2 files changed

-3

lines changed

`‎autoload/pymode/rope.vim`

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,14 +15,18 @@ endfunction`
`15`	`15`
`16`	`16`	`fun!pymode#rope#complete(dot)`
`17`	`17`	`ifpumvisible()`
`18`		`-return"\<C-n>"`
	`18`	`+ifstridx('noselect', &completeopt)!=-1`
	`19`	`+return"\<C-n>"`
	`20`	`+else`
	`21`	`+return""`
	`22`	`+endif`
`19`	`23`	`endif`
`20`	`24`	`ifa:dot`
`21`	`25`	`PymodePython rope.complete(True)`
`22`	`26`	`else`
`23`	`27`	`PymodePython rope.complete()`
`24`	`28`	`endif`
`25`		`-returnpumvisible() ?"\<C-p>\<Down>" :""`
	`29`	`+returnpumvisible()&&stridx('noselect', &completeopt)!=-1?"\<C-p>\<Down>" :""`
`26`	`30`	`endfunction`
`27`	`31`
`28`	`32`	`fun!pymode#rope#complete_on_dot()"{{{`

`‎pymode/rope.py`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,8 @@ def complete(dot=False):`
`94`	`94`	`line=env.lines[row-1]`
`95`	`95`	`cline=line[:col]+p_prefix+line[col:]`
`96`	`96`	`ifcline!=line:`
`97`		`-env.curbuf[row-1]=env.prepare_value(cline,dumps=False)`
	`97`	`+if'noinsert'notinenv.var('&completeopt'):`
	`98`	`+env.curbuf[row-1]=env.prepare_value(cline,dumps=False)`
`98`	`99`	`env.current.window.cursor= (row,col+len(p_prefix))`
`99`	`100`	`env.run('complete',col-len(prefix)+len(p_prefix)+1,proposals)`
`100`	`101`	`returnTrue`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commitbfd70f7

File tree

2 files changed

2 files changed

`‎autoload/pymode/rope.vim`

`‎pymode/rope.py`

0 commit comments