From 1a51524ad540da00736027313cd89747c86c1690 Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Sun, 28 Oct 2018 14:02:09 +0100 Subject: vim-patch:40962ec9c0e7 Update runtime files. https://github.com/vim/vim/commit/40962ec9c0e7b8699e101182b06ddd39dc0e1212 --- runtime/ftplugin/python.vim | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'runtime/ftplugin/python.vim') diff --git a/runtime/ftplugin/python.vim b/runtime/ftplugin/python.vim index 54926418de..56f19cb323 100644 --- a/runtime/ftplugin/python.vim +++ b/runtime/ftplugin/python.vim @@ -3,7 +3,7 @@ " Maintainer: Tom Picton " Previous Maintainer: James Sully " Previous Maintainer: Johannes Zellner -" Last Change: Thur, 09 November 2017 +" Last Change: Wed, 20 December 2017 " https://github.com/tpict/vim-ftplugin-python if exists("b:did_ftplugin") | finish | endif @@ -20,6 +20,9 @@ setlocal comments=b:#,fb:- setlocal commentstring=#\ %s setlocal omnifunc=pythoncomplete#Complete +if has('python3') + setlocal omnifunc=python3complete#Complete +endif set wildignore+=*.pyc -- cgit From 5c4a4217352edf82d32c03e6bec8c64b8f16a28c Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Mon, 29 Oct 2018 06:39:10 +0100 Subject: vim-patch:98ef233e14fa Update runtime files. Convert a couple of help files to utf-8. https://github.com/vim/vim/commit/98ef233e14faaaf42e0342da1803d493ce0337b2 --- runtime/ftplugin/python.vim | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) (limited to 'runtime/ftplugin/python.vim') diff --git a/runtime/ftplugin/python.vim b/runtime/ftplugin/python.vim index 56f19cb323..ee271efaaf 100644 --- a/runtime/ftplugin/python.vim +++ b/runtime/ftplugin/python.vim @@ -3,7 +3,7 @@ " Maintainer: Tom Picton " Previous Maintainer: James Sully " Previous Maintainer: Johannes Zellner -" Last Change: Wed, 20 December 2017 +" Last Change: Sun, 18 March 2018 " https://github.com/tpict/vim-ftplugin-python if exists("b:did_ftplugin") | finish | endif @@ -14,7 +14,25 @@ set cpo&vim setlocal cinkeys-=0# setlocal indentkeys-=0# setlocal include=^\\s*\\(from\\\|import\\) -setlocal includeexpr=substitute(v:fname,'\\.','/','g') + +" For imports with leading .., append / and replace additional .s with ../ +let b:grandparent_match = '^\(.\.\)\(\.*\)' +let b:grandparent_sub = '\=submatch(1)."/".repeat("../",strlen(submatch(2)))' + +" For imports with a single leading ., replace it with ./ +let b:parent_match = '^\.\(\.\)\@!' +let b:parent_sub = './' + +" Replace any . sandwiched between word characters with / +let b:child_match = '\(\w\)\.\(\w\)' +let b:child_sub = '\1/\2' + +setlocal includeexpr=substitute(substitute(substitute( + \v:fname, + \b:grandparent_match,b:grandparent_sub,''), + \b:parent_match,b:parent_sub,''), + \b:child_match,b:child_sub,'g') + setlocal suffixesadd=.py setlocal comments=b:#,fb:- setlocal commentstring=#\ %s -- cgit From 9ef01272b23cffe98b5b19e34d05f1ac44cbeab1 Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Mon, 29 Oct 2018 08:27:28 +0100 Subject: vim-patch:7dda86f2ff35 Update runtime files. https://github.com/vim/vim/commit/7dda86f2ff35bb80afce4da24782fd58216bbe50 --- runtime/ftplugin/python.vim | 58 ++++++++++++++++++++++----------------------- 1 file changed, 29 insertions(+), 29 deletions(-) (limited to 'runtime/ftplugin/python.vim') diff --git a/runtime/ftplugin/python.vim b/runtime/ftplugin/python.vim index ee271efaaf..5c4a59b1a9 100644 --- a/runtime/ftplugin/python.vim +++ b/runtime/ftplugin/python.vim @@ -3,7 +3,7 @@ " Maintainer: Tom Picton " Previous Maintainer: James Sully " Previous Maintainer: Johannes Zellner -" Last Change: Sun, 18 March 2018 +" Last Change: Sun, 15 April 2018 " https://github.com/tpict/vim-ftplugin-python if exists("b:did_ftplugin") | finish | endif @@ -53,35 +53,35 @@ let b:prev='\v^\s*(class\|def\|async def)>' let b:next_end='\v\S\n*(%$\|^(\s*\n*)*(class\|def\|async def)\|^\S)' let b:prev_end='\v\S\n*(^(\s*\n*)*(class\|def\|async def)\|^\S)' -execute "nnoremap ]] :call Python_jump('n', '". b:next_toplevel."', 'W')" -execute "nnoremap [[ :call Python_jump('n', '". b:prev_toplevel."', 'Wb')" -execute "nnoremap ][ :call Python_jump('n', '". b:next_endtoplevel."', 'W', 0)" -execute "nnoremap [] :call Python_jump('n', '". b:prev_endtoplevel."', 'Wb', 0)" -execute "nnoremap ]m :call Python_jump('n', '". b:next."', 'W')" -execute "nnoremap [m :call Python_jump('n', '". b:prev."', 'Wb')" -execute "nnoremap ]M :call Python_jump('n', '". b:next_end."', 'W', 0)" -execute "nnoremap [M :call Python_jump('n', '". b:prev_end."', 'Wb', 0)" - -execute "onoremap ]] :call Python_jump('o', '". b:next_toplevel."', 'W')" -execute "onoremap [[ :call Python_jump('o', '". b:prev_toplevel."', 'Wb')" -execute "onoremap ][ :call Python_jump('o', '". b:next_endtoplevel."', 'W', 0)" -execute "onoremap [] :call Python_jump('o', '". b:prev_endtoplevel."', 'Wb', 0)" -execute "onoremap ]m :call Python_jump('o', '". b:next."', 'W')" -execute "onoremap [m :call Python_jump('o', '". b:prev."', 'Wb')" -execute "onoremap ]M :call Python_jump('o', '". b:next_end."', 'W', 0)" -execute "onoremap [M :call Python_jump('o', '". b:prev_end."', 'Wb', 0)" - -execute "xnoremap ]] :call Python_jump('x', '". b:next_toplevel."', 'W')" -execute "xnoremap [[ :call Python_jump('x', '". b:prev_toplevel."', 'Wb')" -execute "xnoremap ][ :call Python_jump('x', '". b:next_endtoplevel."', 'W', 0)" -execute "xnoremap [] :call Python_jump('x', '". b:prev_endtoplevel."', 'Wb', 0)" -execute "xnoremap ]m :call Python_jump('x', '". b:next."', 'W')" -execute "xnoremap [m :call Python_jump('x', '". b:prev."', 'Wb')" -execute "xnoremap ]M :call Python_jump('x', '". b:next_end."', 'W', 0)" -execute "xnoremap [M :call Python_jump('x', '". b:prev_end."', 'Wb', 0)" +execute "nnoremap ]] :call Python_jump('n', '". b:next_toplevel."', 'W', v:count1)" +execute "nnoremap [[ :call Python_jump('n', '". b:prev_toplevel."', 'Wb', v:count1)" +execute "nnoremap ][ :call Python_jump('n', '". b:next_endtoplevel."', 'W', 0, v:count1)" +execute "nnoremap [] :call Python_jump('n', '". b:prev_endtoplevel."', 'Wb', 0, v:count1)" +execute "nnoremap ]m :call Python_jump('n', '". b:next."', 'W', v:count1)" +execute "nnoremap [m :call Python_jump('n', '". b:prev."', 'Wb', v:count1)" +execute "nnoremap ]M :call Python_jump('n', '". b:next_end."', 'W', 0, v:count1)" +execute "nnoremap [M :call Python_jump('n', '". b:prev_end."', 'Wb', 0, v:count1)" + +execute "onoremap ]] :call Python_jump('o', '". b:next_toplevel."', 'W', v:count1)" +execute "onoremap [[ :call Python_jump('o', '". b:prev_toplevel."', 'Wb', v:count1)" +execute "onoremap ][ :call Python_jump('o', '". b:next_endtoplevel."', 'W', 0, v:count1)" +execute "onoremap [] :call Python_jump('o', '". b:prev_endtoplevel."', 'Wb', 0, v:count1)" +execute "onoremap ]m :call Python_jump('o', '". b:next."', 'W', v:count1)" +execute "onoremap [m :call Python_jump('o', '". b:prev."', 'Wb', v:count1)" +execute "onoremap ]M :call Python_jump('o', '". b:next_end."', 'W', 0, v:count1)" +execute "onoremap [M :call Python_jump('o', '". b:prev_end."', 'Wb', 0, v:count1)" + +execute "xnoremap ]] :call Python_jump('x', '". b:next_toplevel."', 'W', v:count1)" +execute "xnoremap [[ :call Python_jump('x', '". b:prev_toplevel."', 'Wb', v:count1)" +execute "xnoremap ][ :call Python_jump('x', '". b:next_endtoplevel."', 'W', 0, v:count1)" +execute "xnoremap [] :call Python_jump('x', '". b:prev_endtoplevel."', 'Wb', 0, v:count1)" +execute "xnoremap ]m :call Python_jump('x', '". b:next."', 'W', v:count1)" +execute "xnoremap [m :call Python_jump('x', '". b:prev."', 'Wb', v:count1)" +execute "xnoremap ]M :call Python_jump('x', '". b:next_end."', 'W', 0, v:count1)" +execute "xnoremap [M :call Python_jump('x', '". b:prev_end."', 'Wb', 0, v:count1)" if !exists('*Python_jump') - fun! Python_jump(mode, motion, flags, ...) range + fun! Python_jump(mode, motion, flags, count, ...) range let l:startofline = (a:0 >= 1) ? a:1 : 1 if a:mode == 'x' @@ -92,7 +92,7 @@ if !exists('*Python_jump') normal! 0 endif - let cnt = v:count1 + let cnt = a:count mark ' while cnt > 0 call search(a:motion, a:flags) -- cgit