From 7a0f2d974f9ac5bc85607e8c769d3370dd18ac74 Mon Sep 17 00:00:00 2001 From: Adam Stankiewicz Date: Sat, 7 Dec 2019 12:21:37 +0100 Subject: Update --- ftplugin/ansible.vim | 4 ---- ftplugin/cucumber.vim | 2 +- ftplugin/dart.vim | 1 + ftplugin/git.vim | 2 +- ftplugin/gitcommit.vim | 2 +- ftplugin/gitrebase.vim | 19 +++++++++++-------- ftplugin/rust.vim | 3 +-- ftplugin/vala.vim | 29 +++++++++++++++++++++++++++++ 8 files changed, 45 insertions(+), 17 deletions(-) create mode 100644 ftplugin/vala.vim (limited to 'ftplugin') diff --git a/ftplugin/ansible.vim b/ftplugin/ansible.vim index 7e94ba9d..1f83ddf7 100644 --- a/ftplugin/ansible.vim +++ b/ftplugin/ansible.vim @@ -1,9 +1,5 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ansible') == -1 -" Slow yaml highlighting workaround -if exists('+regexpengine') && ('®expengine' == 0) - setlocal regexpengine=1 -endif set isfname+=@-@ set path+=./../templates,./../files,templates,files diff --git a/ftplugin/cucumber.vim b/ftplugin/cucumber.vim index 296fd752..5d34213b 100644 --- a/ftplugin/cucumber.vim +++ b/ftplugin/cucumber.vim @@ -3,7 +3,7 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cucumber') == - " Vim filetype plugin " Language: Cucumber " Maintainer: Tim Pope -" Last Change: 2013 Jun 01 +" Last Change: 2016 Aug 29 " Only do this when not done yet for this buffer if (exists("b:did_ftplugin")) diff --git a/ftplugin/dart.vim b/ftplugin/dart.vim index 99dd9a8c..69dae68c 100644 --- a/ftplugin/dart.vim +++ b/ftplugin/dart.vim @@ -27,6 +27,7 @@ let &l:errorformat = setlocal includeexpr=dart#resolveUri(v:fname) setlocal isfname+=: +setlocal iskeyword+=$ let b:undo_ftplugin = 'setl et< fo< sw< sts< com< cms< inex< isf<' diff --git a/ftplugin/git.vim b/ftplugin/git.vim index f26c62cf..4e17198b 100644 --- a/ftplugin/git.vim +++ b/ftplugin/git.vim @@ -3,7 +3,7 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'git') == -1 " Vim filetype plugin " Language: generic git output " Maintainer: Tim Pope -" Last Change: 2013 May 30 +" Last Change: 2016 Aug 29 " Only do this when not done yet for this buffer if (exists("b:did_ftplugin")) diff --git a/ftplugin/gitcommit.vim b/ftplugin/gitcommit.vim index ca849a2c..14bc6425 100644 --- a/ftplugin/gitcommit.vim +++ b/ftplugin/gitcommit.vim @@ -3,7 +3,7 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'git') == -1 " Vim filetype plugin " Language: git commit file " Maintainer: Tim Pope -" Last Change: 2013 May 30 +" Last Change: 2016 Aug 29 " Only do this when not done yet for this buffer if (exists("b:did_ftplugin")) diff --git a/ftplugin/gitrebase.vim b/ftplugin/gitrebase.vim index 1395c8ab..70fed8f4 100644 --- a/ftplugin/gitrebase.vim +++ b/ftplugin/gitrebase.vim @@ -3,7 +3,7 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'git') == -1 " Vim filetype plugin " Language: git rebase --interactive " Maintainer: Tim Pope -" Last Change: 2010 May 21 +" Last Change: 2016 Aug 29 " Only do this when not done yet for this buffer if (exists("b:did_ftplugin")) @@ -20,12 +20,15 @@ if !exists("b:undo_ftplugin") endif let b:undo_ftplugin = b:undo_ftplugin."|setl com< cms< fo< ml<" -function! s:choose(word) +function! s:choose(word) abort s/^\(\w\+\>\)\=\(\s*\)\ze\x\{4,40\}\>/\=(strlen(submatch(1)) == 1 ? a:word[0] : a:word) . substitute(submatch(2),'^$',' ','')/e endfunction -function! s:cycle() - call s:choose(get({'s':'edit','p':'squash','e':'reword','r':'fixup'},getline('.')[0],'pick')) +function! s:cycle(count) abort + let words = ['pick', 'edit', 'fixup', 'squash', 'reword', 'drop'] + let index = index(map(copy(words), 'v:val[0]'), getline('.')[0]) + let index = ((index < 0 ? 0 : index) + 10000 * len(words) + a:count) % len(words) + call s:choose(words[index]) endfunction command! -buffer -bar -range Pick :,call s:choose('pick') @@ -34,16 +37,16 @@ command! -buffer -bar -range Edit :,call s:choose('edit') command! -buffer -bar -range Reword :,call s:choose('reword') command! -buffer -bar -range Fixup :,call s:choose('fixup') command! -buffer -bar -range Drop :,call s:choose('drop') -command! -buffer -bar Cycle :call s:cycle() -" The above are more useful when they are mapped; for example: -"nnoremap S :Cycle +command! -buffer -count=1 -bar -bang Cycle call s:cycle(0 ? - : ) if exists("g:no_plugin_maps") || exists("g:no_gitrebase_maps") finish endif nnoremap K col('.') < 7 && expand('cword>') =~ '\X' && getline('.') =~ '^\w\+\s\+\x\+\>' ? 'wK' : 'K' +nnoremap :=v:count1Cycle +nnoremap :=v:count1Cycle! -let b:undo_ftplugin = b:undo_ftplugin . "|nunmap K" +let b:undo_ftplugin = b:undo_ftplugin . "|exe 'nunmap K'|exe 'nunmap '|exe 'nunmap '" endif diff --git a/ftplugin/rust.vim b/ftplugin/rust.vim index d8de0f1a..dab5d5ab 100644 --- a/ftplugin/rust.vim +++ b/ftplugin/rust.vim @@ -3,7 +3,6 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1 " Language: Rust " Description: Vim ftplugin for Rust " Maintainer: Chris Morgan -" Maintainer: Kevin Ballard " Last Change: June 08, 2016 " For bugs, patches and license go to https://github.com/rust-lang/rust.vim @@ -139,7 +138,7 @@ command! -bar RustInfoToClipboard call rust#debugging#InfoToClipboard() command! -bar -nargs=1 RustInfoToFile call rust#debugging#InfoToFile() " See |:RustTest| for docs -command! -buffer -nargs=* -bang RustTest call rust#Test(0, ) +command! -buffer -nargs=* -count -bang RustTest call rust#Test(, , 0, ) if !exists("b:rust_last_rustc_args") || !exists("b:rust_last_args") let b:rust_last_rustc_args = [] diff --git a/ftplugin/vala.vim b/ftplugin/vala.vim new file mode 100644 index 00000000..e243d674 --- /dev/null +++ b/ftplugin/vala.vim @@ -0,0 +1,29 @@ +if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vala') == -1 + +if exists('b:did_ftplugin') + finish +endif +let b:did_ftplugin = 1 + +setlocal efm=%f:%l.%c-%[%^:]%#:\ %t%[%^:]%#:\ %m + +" Insert a CCode attribute for the symbol below the cursor +" https://wiki.gnome.org/Projects/Vala/LegacyBindings +function! CCode() abort + normal yiwO[CCode (cname = "pa")] +endfunction + +" Set Vala Coding Style +" https://wiki.gnome.org/Projects/Vala/Hacking#Coding_Style +function! ValaCodingStyle() abort + set ts=4 sts=4 sw=4 tw=0 wm=0 +endfunction + +command! -buffer -bar CCode call CCode() +command! -buffer -bar ValaCodingStyle call ValaCodingStyle() + +if get(g:, 'vala_syntax_folding_enabled', 1) + setlocal foldmethod=syntax +endif + +endif -- cgit v1.2.3