diff options
| author | Adam Stankiewicz <sheerun@sher.pl> | 2013-11-02 23:27:57 +0100 |
|---|---|---|
| committer | Adam Stankiewicz <sheerun@sher.pl> | 2013-11-02 23:27:57 +0100 |
| commit | 30c1920e4fa4e612238e1f435907c40ecfa47f33 (patch) | |
| tree | f88ffb408895a5baf93fe81fdd12acba17f32d44 /ftplugin/go | |
| parent | 57cfac7ae384466c3ff2543a9200319dc1d459a0 (diff) | |
| download | vim-polyglot-1.4.1.tar.gz vim-polyglot-1.4.1.zip | |
Massive update :)v1.4.1
Diffstat (limited to 'ftplugin/go')
| -rw-r--r-- | ftplugin/go/fmt.vim | 16 | ||||
| -rw-r--r-- | ftplugin/go/import.vim | 35 |
2 files changed, 41 insertions, 10 deletions
diff --git a/ftplugin/go/fmt.vim b/ftplugin/go/fmt.vim index 30814fdf..5447d457 100644 --- a/ftplugin/go/fmt.vim +++ b/ftplugin/go/fmt.vim @@ -12,11 +12,25 @@ " It tries to preserve cursor position and avoids " replacing the buffer with stderr output. " +" Options: +" +" g:go_fmt_commands [default=1] +" +" Flag to indicate whether to enable the commands listed above. +" if exists("b:did_ftplugin_go_fmt") finish endif -command! -buffer Fmt call s:GoFormat() + +if !exists("g:go_fmt_commands") + let g:go_fmt_commands = 1 +endif + + +if g:go_fmt_commands + command! -buffer Fmt call s:GoFormat() +endif function! s:GoFormat() let view = winsaveview() diff --git a/ftplugin/go/import.vim b/ftplugin/go/import.vim index 1d969e46..91c8697a 100644 --- a/ftplugin/go/import.vim +++ b/ftplugin/go/import.vim @@ -24,23 +24,40 @@ " imported, an error will be displayed and the buffer will be " untouched. " -" In addition to these commands, there are also two shortcuts mapped: +" If you would like to add shortcuts, you can do so by doing the following: " -" \f - Runs :Import fmt -" \F - Runs :Drop fmt +" Import fmt +" au Filetype go nnoremap <buffer> <LocalLeader>f :Import fmt<CR> " -" The backslash is the default maplocalleader, so it is possible that +" Drop fmt +" au Filetype go nnoremap <buffer> <LocalLeader>F :Drop fmt<CR> +" +" Import the word under your cursor +" au Filetype go nnoremap <buffer> <LocalLeader>k +" \ :exe 'Import ' . expand('<cword>')<CR> +" +" The backslash '\' is the default maplocalleader, so it is possible that " your vim is set to use a different character (:help maplocalleader). " +" Options: +" +" g:go_import_commands [default=1] +" +" Flag to indicate whether to enable the commands listed above. +" if exists("b:did_ftplugin_go_import") finish endif -command! -buffer -nargs=? -complete=customlist,go#complete#Package Drop call s:SwitchImport(0, '', <f-args>) -command! -buffer -nargs=1 -complete=customlist,go#complete#Package Import call s:SwitchImport(1, '', <f-args>) -command! -buffer -nargs=* -complete=customlist,go#complete#Package ImportAs call s:SwitchImport(1, <f-args>) -map <buffer> <LocalLeader>f :Import fmt<CR> -map <buffer> <LocalLeader>F :Drop fmt<CR> +if !exists("g:go_import_commands") + let g:go_import_commands = 1 +endif + +if g:go_import_commands + command! -buffer -nargs=? -complete=customlist,go#complete#Package Drop call s:SwitchImport(0, '', <f-args>) + command! -buffer -nargs=1 -complete=customlist,go#complete#Package Import call s:SwitchImport(1, '', <f-args>) + command! -buffer -nargs=* -complete=customlist,go#complete#Package ImportAs call s:SwitchImport(1, <f-args>) +endif function! s:SwitchImport(enabled, localname, path) let view = winsaveview() |