From a6de243fcac4c23d65417f441491beefda9d188f Mon Sep 17 00:00:00 2001 From: amix Date: Tue, 27 Dec 2016 11:46:49 -0300 Subject: [PATCH] Updated plugins --- .../ctrlp.vim/autoload/ctrlp.vim | 7 +- sources_non_forked/ctrlp.vim/doc/ctrlp.txt | 22 + .../lightline.vim/autoload/lightline.vim | 26 +- .../lightline/colorscheme/molokai.vim | 36 + .../lightline.vim/doc/lightline.txt | 12 +- .../lightline.vim/test/highlight.vim | 120 ++-- .../lightline.vim/test/link.vim | 110 +-- sources_non_forked/syntastic/CONTRIBUTING.md | 8 +- sources_non_forked/syntastic/README.markdown | 22 +- .../syntastic/autoload/syntastic/util.vim | 20 +- .../syntastic/doc/syntastic-checkers.txt | 15 +- .../syntastic/doc/syntastic.txt | 4 +- .../syntastic/plugin/syntastic.vim | 19 +- .../syntax_checkers/stylus/stylint.vim | 22 +- .../vim-fugitive/plugin/fugitive.vim | 2 +- .../vim-go/.github/ISSUE_TEMPLATE.md | 22 +- sources_non_forked/vim-go/CHANGELOG.md | 132 +++- sources_non_forked/vim-go/README.md | 13 +- .../vim-go/autoload/ctrlp/decls.vim | 12 +- .../vim-go/autoload/go/alternate.vim | 2 +- .../vim-go/autoload/go/asmfmt.vim | 16 +- sources_non_forked/vim-go/autoload/go/cmd.vim | 210 ++++-- .../vim-go/autoload/go/complete.vim | 24 +- .../vim-go/autoload/go/coverage.vim | 129 +++- sources_non_forked/vim-go/autoload/go/def.vim | 153 +++-- sources_non_forked/vim-go/autoload/go/doc.vim | 205 +++--- sources_non_forked/vim-go/autoload/go/fmt.vim | 6 +- .../vim-go/autoload/go/guru.vim | 648 ++++++++++++------ .../vim-go/autoload/go/impl.vim | 10 +- .../vim-go/autoload/go/import.vim | 4 +- sources_non_forked/vim-go/autoload/go/job.vim | 109 +++ .../vim-go/autoload/go/jobcontrol.vim | 85 +-- .../vim-go/autoload/go/lint.vim | 141 +++- .../vim-go/autoload/go/list.vim | 25 +- .../vim-go/autoload/go/package.vim | 10 +- .../vim-go/autoload/go/path.vim | 14 +- .../vim-go/autoload/go/play.vim | 8 +- .../vim-go/autoload/go/rename.vim | 109 ++- .../vim-go/autoload/go/statusline.vim | 112 +++ .../vim-go/autoload/go/template.vim | 16 +- .../vim-go/autoload/go/term.vim | 17 +- .../vim-go/autoload/go/textobj.vim | 4 +- .../vim-go/autoload/go/tool.vim | 29 +- sources_non_forked/vim-go/autoload/go/ui.vim | 8 +- .../vim-go/autoload/go/util.vim | 109 ++- sources_non_forked/vim-go/doc/vim-go.txt | 99 ++- sources_non_forked/vim-go/ftplugin/go.vim | 70 +- .../vim-go/ftplugin/go/commands.vim | 6 +- .../vim-go/ftplugin/go/mappings.vim | 7 +- .../vim-go/indent/gohtmltmpl.vim | 4 +- sources_non_forked/vim-go/plugin/go.vim | 10 +- sources_non_forked/vim-go/syntax/go.vim | 7 +- .../vim-snipmate/autoload/snipMate.vim | 66 +- sources_non_forked/vim-snippets/AUTHORS | 383 +++++++++++ .../vim-snippets/UltiSnips/cuda.snippets | 5 + .../vim-snippets/UltiSnips/python.snippets | 5 + .../vim-snippets/UltiSnips/tex.snippets | 4 +- .../vim-snippets/snippets/_.snippets | 8 + .../vim-snippets/snippets/cuda.snippets | 1 + .../vim-snippets/snippets/fortran.snippets | 21 +- .../vim-snippets/snippets/handlebars.snippets | 14 + .../javascript/javascript.es6.snippets | 13 +- .../javascript/javascript.node.snippets | 2 +- .../vim-snippets/snippets/mustache.snippets | 9 +- .../vim-snippets/snippets/purescript.snippets | 52 ++ .../vim-snippets/snippets/rails.snippets | 2 +- .../vim-snippets/snippets/tex.snippets | 318 ++++----- 67 files changed, 2836 insertions(+), 1097 deletions(-) create mode 100644 sources_non_forked/lightline.vim/autoload/lightline/colorscheme/molokai.vim create mode 100644 sources_non_forked/vim-go/autoload/go/job.vim create mode 100644 sources_non_forked/vim-go/autoload/go/statusline.vim create mode 100644 sources_non_forked/vim-snippets/AUTHORS create mode 100644 sources_non_forked/vim-snippets/UltiSnips/cuda.snippets create mode 100644 sources_non_forked/vim-snippets/snippets/cuda.snippets create mode 100644 sources_non_forked/vim-snippets/snippets/handlebars.snippets create mode 100644 sources_non_forked/vim-snippets/snippets/purescript.snippets diff --git a/sources_non_forked/ctrlp.vim/autoload/ctrlp.vim b/sources_non_forked/ctrlp.vim/autoload/ctrlp.vim index b6cd9a62..fc8b8830 100644 --- a/sources_non_forked/ctrlp.vim/autoload/ctrlp.vim +++ b/sources_non_forked/ctrlp.vim/autoload/ctrlp.vim @@ -1,8 +1,9 @@ " ============================================================================= " File: autoload/ctrlp.vim " Description: Fuzzy file, buffer, mru, tag, etc finder. -" Author: Kien Nguyen -" Version: 1.79 +" Author: CtrlP Dev Team +" Original: Kien Nguyen +" Version: 1.80 " ============================================================================= " ** Static variables {{{1 @@ -1583,7 +1584,7 @@ fu! s:formatline(str) let str .= printf(' %s', ''.parts[3].'') en el - let str .= printf(' %-5s %-30s %s', + let str .= printf(' %-5s %-30s', \ parts[0], \ parts[2]) if (!empty(s:bufpath_mod)) diff --git a/sources_non_forked/ctrlp.vim/doc/ctrlp.txt b/sources_non_forked/ctrlp.vim/doc/ctrlp.txt index 012e7beb..1107497b 100644 --- a/sources_non_forked/ctrlp.vim/doc/ctrlp.txt +++ b/sources_non_forked/ctrlp.vim/doc/ctrlp.txt @@ -1497,6 +1497,28 @@ Special thanks:~ =============================================================================== CHANGELOG *ctrlp-changelog* +Before 2016/11/28~ + + + New command: |YankLine()| to yank current line. + + New option: |g:ctrlp_types| to select builtin modes. + + New feature: asynchronized spawn of |g:ctrlp_user_command|. This enable + with set |g:user_command_async| to 1. + + Support buffertag for delphi, rust and golang. + + New option: |g:ctrlp_brief_prompt|, + |g:match_current_file|, + |g:ctrlp_compare_lim|. + + New feature: Auto-ignore extension. + + Support buffertag for ant, tex, dosbatch, matlab and vhdl. + + New option |g:ctrlp_line_prefix| for integrating third party plugins. + + New option |g:open_single_match| to open single file in matches. + + Add (ctrlp) for launch CtrlP. + + Accept bang for CtrlPBookmarkDirAdd to avoid confirm. + + Handle variable like "g:ctrlp_TYPE_MODE". + ex: let g:ctrlp_path_sort + + New option: |g:ctrlp_custom_ancestors| + +Before 2014/08/08~ + + New buffer explorer mode with highlighting (|+conceal| recommended) + New options: |g:ctrlp_bufname_mod|, |g:ctrlp_bufpath_mod| diff --git a/sources_non_forked/lightline.vim/autoload/lightline.vim b/sources_non_forked/lightline.vim/autoload/lightline.vim index 2bb89b8c..6bcc09b4 100644 --- a/sources_non_forked/lightline.vim/autoload/lightline.vim +++ b/sources_non_forked/lightline.vim/autoload/lightline.vim @@ -2,7 +2,7 @@ " Filename: autoload/lightline.vim " Author: itchyny " License: MIT License -" Last Change: 2016/10/05 08:00:00. +" Last Change: 2016/12/03 12:08:08. " ============================================================================= let s:save_cpo = &cpo @@ -156,7 +156,7 @@ function! lightline#init() abort endfor call extend(s:lightline.tabline_separator, s:lightline.separator, 'keep') call extend(s:lightline.tabline_subseparator, s:lightline.subseparator, 'keep') - let s:lightline.tabline_configured = 0 + let s:lightline.tabline_configured = has_key(get(get(g:, 'lightline', {}), 'component_expand', {}), 'tabs') for components in deepcopy(s:lightline.tabline.left + s:lightline.tabline.right) if len(filter(components, 'v:val !=# "tabs" && v:val !=# "close"')) > 0 let s:lightline.tabline_configured = 1 @@ -229,16 +229,16 @@ function! lightline#link(...) abort for [p, l] in [['Left', len(s:lightline.active.left)], ['Right', len(s:lightline.active.right)]] for [i, t] in map(range(0, l), '[v:val, 0]') + types if i != l - exec printf('hi link LightLine%s_active_%s LightLine%s_%s_%s', p, i, p, mode, i) + exec printf('hi link Lightline%s_active_%s Lightline%s_%s_%s', p, i, p, mode, i) endif for [j, s] in map(range(0, l), '[v:val, 0]') + types if i + 1 == j || t || s && i != l - exec printf('hi link LightLine%s_active_%s_%s LightLine%s_%s_%s_%s', p, i, j, p, mode, i, j) + exec printf('hi link Lightline%s_active_%s_%s Lightline%s_%s_%s_%s', p, i, j, p, mode, i, j) endif endfor endfor endfor - exec printf('hi link LightLineMiddle_active LightLineMiddle_%s', mode) + exec printf('hi link LightlineMiddle_active LightlineMiddle_%s', mode) return '' endfunction @@ -279,17 +279,17 @@ function! lightline#highlight(...) abort for [i, t] in map(range(0, l), '[v:val, 0]') + types if i < l || i < 1 let r = t ? (has_key(get(c, d, []), i) ? c[d][i][0] : has_key(get(c, 'tabline', {}), i) ? c.tabline[i][0] : get(c.normal, i, zs)[0]) : get(zs, i, ms) - exec printf('hi LightLine%s_%s_%s guifg=%s guibg=%s ctermfg=%s ctermbg=%s %s', p, mode, i, r[0], r[1], r[2], r[3], s:term(r)) + exec printf('hi Lightline%s_%s_%s guifg=%s guibg=%s ctermfg=%s ctermbg=%s %s', p, mode, i, r[0], r[1], r[2], r[3], s:term(r)) endif for [j, s] in map(range(0, l), '[v:val, 0]') + types if i + 1 == j || t || s && i != l let q = s ? (has_key(get(c, d, []), j) ? c[d][j][0] : has_key(get(c, 'tabline', {}), j) ? c.tabline[j][0] : get(c.normal, j, zs)[0]) : (j != l ? get(zs, j, ms) :ms) - exec printf('hi LightLine%s_%s_%s_%s guifg=%s guibg=%s ctermfg=%s ctermbg=%s', p, mode, i, j, r[1], q[1], r[3], q[3]) + exec printf('hi Lightline%s_%s_%s_%s guifg=%s guibg=%s ctermfg=%s ctermbg=%s', p, mode, i, j, r[1], q[1], r[3], q[3]) endif endfor endfor endfor - exec printf('hi LightLineMiddle_%s guifg=%s guibg=%s ctermfg=%s ctermbg=%s %s', mode, ms[0], ms[1], ms[2], ms[3], s:term(ms)) + exec printf('hi LightlineMiddle_%s guifg=%s guibg=%s ctermfg=%s ctermbg=%s %s', mode, ms[0], ms[1], ms[2], ms[3], s:term(ms)) endfor endfunction @@ -400,7 +400,7 @@ function! s:line(tabline, inactive) abort let r_ = has_key(s:lightline, mode) ? s:lightline[mode].right : s:lightline.active.right let [rt, rc, rl] = s:expand(copy(r_)) for i in range(len(lt)) - let _ .= '%#LightLineLeft_' . mode . '_' . ll[i] . '#' + let _ .= '%#LightlineLeft_' . mode . '_' . ll[i] . '#' for j in range(len(lt[i])) let x = lc[i][j] ? lt[i][j] : has_key(f, lt[i][j]) ? (exists('*' . f[lt[i][j]]) ? '%{' . f[lt[i][j]] . '()}' : '%{exists("*' . f[lt[i][j]] . '")?' . f[lt[i][j]] . '():""}') : get(c, lt[i][j], '') let _ .= has_key(t, lt[i][j]) && t[lt[i][j]] ==# 'raw' || x ==# '' ? x : '%( ' . x . ' %)' @@ -408,14 +408,14 @@ function! s:line(tabline, inactive) abort let _ .= s:subseparator(lt[i][(j):], s.left, lc[i][(j):]) endif endfor - let _ .= '%#LightLineLeft_' . mode . '_' . ll[i] . '_' . ll[i + 1] . '#' + let _ .= '%#LightlineLeft_' . mode . '_' . ll[i] . '_' . ll[i + 1] . '#' let _ .= i < l + len(lt) - len(l_) && ll[i] < l || ll[i] != ll[i + 1] ? p.left : len(lt[i]) ? s.left : '' endfor - let _ .= '%#LightLineMiddle_' . mode . '#%=' + let _ .= '%#LightlineMiddle_' . mode . '#%=' for i in reverse(range(len(rt))) - let _ .= '%#LightLineRight_' . mode . '_' . rl[i] . '_' . rl[i + 1] . '#' + let _ .= '%#LightlineRight_' . mode . '_' . rl[i] . '_' . rl[i + 1] . '#' let _ .= i < r + len(rt) - len(r_) && rl[i] < r || rl[i] != rl[i + 1] ? p.right : len(rt[i]) ? s.right : '' - let _ .= '%#LightLineRight_' . mode . '_' . rl[i] . '#' + let _ .= '%#LightlineRight_' . mode . '_' . rl[i] . '#' for j in range(len(rt[i])) let x = rc[i][j] ? rt[i][j] : has_key(f, rt[i][j]) ? (exists('*' . f[rt[i][j]]) ? '%{' . f[rt[i][j]] . '()}' : '%{exists("*' . f[rt[i][j]] . '")?' . f[rt[i][j]] . '():""}') : get(c, rt[i][j], '') let _ .= has_key(t, rt[i][j]) && t[rt[i][j]] ==# 'raw' || x ==# '' ? x : '%( ' . x . ' %)' diff --git a/sources_non_forked/lightline.vim/autoload/lightline/colorscheme/molokai.vim b/sources_non_forked/lightline.vim/autoload/lightline/colorscheme/molokai.vim new file mode 100644 index 00000000..9d066a1b --- /dev/null +++ b/sources_non_forked/lightline.vim/autoload/lightline/colorscheme/molokai.vim @@ -0,0 +1,36 @@ +" ============================================================================= +" Filename: autoload/lightline/colorscheme/molokai.vim +" Author: challsted +" License: MIT License +" Last Change: 2016/11/17 00:27:58. +" ============================================================================= +" +let s:black = [ '#232526', 233 ] +let s:gray = [ '#808080', 244 ] +let s:white = [ '#f8f8f2', 234 ] +let s:cyan = [ '#66d9ef', 81 ] +let s:green = [ '#a6e22e', 118 ] +let s:orange = [ '#ef5939', 166 ] +let s:pink = [ '#f92672', 161 ] +let s:red = [ '#ff0000', 160 ] +let s:yellow = [ '#e6db74', 229 ] + +let s:p = {'normal': {}, 'inactive': {}, 'insert': {}, 'replace': {}, 'visual': {}, 'tabline': {}} + +let s:p.normal.left = [ [ s:black, s:cyan ], [ s:orange, s:black ] ] +let s:p.normal.middle = [ [ s:orange, s:black ] ] +let s:p.normal.right = [ [ s:pink, s:black ], [ s:black, s:pink ] ] +let s:p.normal.error = [ [ s:pink, s:black ] ] +let s:p.normal.warning = [ [ s:yellow, s:black ] ] +let s:p.insert.left = [ [ s:black, s:green ], [ s:green, s:black ] ] +let s:p.visual.left = [ [ s:black, s:yellow ], [ s:yellow, s:black ] ] +let s:p.replace.left = [ [ s:black, s:red ], [ s:red, s:black ] ] +let s:p.inactive.left = [ [ s:pink, s:black ], [ s:white, s:black ] ] +let s:p.inactive.middle = [ [ s:gray, s:black ] ] +let s:p.inactive.right = [ [ s:white, s:pink ], [ s:pink, s:black ] ] +let s:p.tabline.left = [ [ s:pink, s:black ] ] +let s:p.tabline.middle = [ [ s:pink, s:black] ] +let s:p.tabline.right = copy(s:p.normal.right) +let s:p.tabline.tabsel = [ [ s:black, s:pink ] ] + +let g:lightline#colorscheme#molokai#palette = lightline#colorscheme#flatten(s:p) diff --git a/sources_non_forked/lightline.vim/doc/lightline.txt b/sources_non_forked/lightline.vim/doc/lightline.txt index b86be500..8b0a580d 100644 --- a/sources_non_forked/lightline.vim/doc/lightline.txt +++ b/sources_non_forked/lightline.vim/doc/lightline.txt @@ -223,7 +223,7 @@ OPTIONS *lightline-option* The colorscheme for lightline.vim. Currently, wombat, solarized, powerline, jellybeans, Tomorrow, Tomorrow_Night, Tomorrow_Night_Blue, Tomorrow_Night_Eighties, - PaperColor, seoul256, landscape, one, Dracula, and 16color are available. + PaperColor, seoul256, landscape, one, Dracula, Molokai and 16color are available. The default value is: > let g:lightline.colorscheme = 'default' @@ -636,6 +636,16 @@ compiled version of your colorscheme. < Then copy and paste the result to the colorscheme file. +If you want to contribute a new colorscheme that is not currently available +please follow the following rules: + *) All hex codes should be lowercase only + *) Use 2 space soft tabs + *) If your colorscheme has both light and dark variants, use a single file + *) Normal Mode should default to Cyan + *) Insert Mode should default to Green + *) Visual Mode should default to Yellow + *) Replace Mode should default to Red + ============================================================================== EXAMPLES *lightline-examples* You can configure the appearance of statusline. diff --git a/sources_non_forked/lightline.vim/test/highlight.vim b/sources_non_forked/lightline.vim/test/highlight.vim index fe5182a3..0e9e6566 100644 --- a/sources_non_forked/lightline.vim/test/highlight.vim +++ b/sources_non_forked/lightline.vim/test/highlight.vim @@ -23,14 +23,14 @@ function! s:suite.highlight() call lightline#init() call lightline#colorscheme() let palette = lightline#palette() - call s:assert.match(s:hi('LightLineLeft_normal_0'), s:pattern(palette.normal.left[0])) - call s:assert.match(s:hi('LightLineLeft_normal_1'), s:pattern(palette.normal.left[1])) - call s:assert.match(s:hi('LightLineLeft_normal_2'), 'E411: highlight group not found\|cleared') - call s:assert.match(s:hi('LightLineRight_normal_0'), s:pattern(palette.normal.right[0])) - call s:assert.match(s:hi('LightLineRight_normal_1'), s:pattern(palette.normal.right[1])) - call s:assert.match(s:hi('LightLineRight_normal_2'), s:pattern(palette.normal.right[2])) - call s:assert.match(s:hi('LightLineRight_normal_3'), 'E411: highlight group not found\|cleared') - call s:assert.match(s:hi('LightLineMiddle_normal'), s:pattern(palette.normal.middle[0])) + call s:assert.match(s:hi('LightlineLeft_normal_0'), s:pattern(palette.normal.left[0])) + call s:assert.match(s:hi('LightlineLeft_normal_1'), s:pattern(palette.normal.left[1])) + call s:assert.match(s:hi('LightlineLeft_normal_2'), 'E411: highlight group not found\|cleared') + call s:assert.match(s:hi('LightlineRight_normal_0'), s:pattern(palette.normal.right[0])) + call s:assert.match(s:hi('LightlineRight_normal_1'), s:pattern(palette.normal.right[1])) + call s:assert.match(s:hi('LightlineRight_normal_2'), s:pattern(palette.normal.right[2])) + call s:assert.match(s:hi('LightlineRight_normal_3'), 'E411: highlight group not found\|cleared') + call s:assert.match(s:hi('LightlineMiddle_normal'), s:pattern(palette.normal.middle[0])) endfunction function! s:suite.insert() @@ -39,14 +39,14 @@ function! s:suite.insert() call lightline#colorscheme() call lightline#highlight('insert') let palette = lightline#palette() - call s:assert.match(s:hi('LightLineLeft_insert_0'), s:pattern(palette.insert.left[0])) - call s:assert.match(s:hi('LightLineLeft_insert_1'), s:pattern(palette.insert.left[1])) - call s:assert.match(s:hi('LightLineLeft_insert_2'), 'E411: highlight group not found\|cleared') - call s:assert.match(s:hi('LightLineRight_insert_0'), s:pattern(palette.insert.right[0])) - call s:assert.match(s:hi('LightLineRight_insert_1'), s:pattern(palette.insert.right[1])) - call s:assert.match(s:hi('LightLineRight_insert_2'), s:pattern(palette.insert.right[2])) - call s:assert.match(s:hi('LightLineRight_insert_3'), 'E411: highlight group not found\|cleared') - call s:assert.match(s:hi('LightLineMiddle_insert'), s:pattern(palette.insert.middle[0])) + call s:assert.match(s:hi('LightlineLeft_insert_0'), s:pattern(palette.insert.left[0])) + call s:assert.match(s:hi('LightlineLeft_insert_1'), s:pattern(palette.insert.left[1])) + call s:assert.match(s:hi('LightlineLeft_insert_2'), 'E411: highlight group not found\|cleared') + call s:assert.match(s:hi('LightlineRight_insert_0'), s:pattern(palette.insert.right[0])) + call s:assert.match(s:hi('LightlineRight_insert_1'), s:pattern(palette.insert.right[1])) + call s:assert.match(s:hi('LightlineRight_insert_2'), s:pattern(palette.insert.right[2])) + call s:assert.match(s:hi('LightlineRight_insert_3'), 'E411: highlight group not found\|cleared') + call s:assert.match(s:hi('LightlineMiddle_insert'), s:pattern(palette.insert.middle[0])) endfunction @@ -56,14 +56,14 @@ function! s:suite.visual() call lightline#colorscheme() call lightline#highlight('visual') let palette = lightline#palette() - call s:assert.match(s:hi('LightLineLeft_visual_0'), s:pattern(palette.visual.left[0])) - call s:assert.match(s:hi('LightLineLeft_visual_1'), s:pattern(palette.visual.left[1])) - call s:assert.match(s:hi('LightLineLeft_visual_2'), 'E411: highlight group not found\|cleared') - call s:assert.match(s:hi('LightLineRight_visual_0'), s:pattern(palette.normal.right[0])) - call s:assert.match(s:hi('LightLineRight_visual_1'), s:pattern(palette.normal.right[1])) - call s:assert.match(s:hi('LightLineRight_visual_2'), s:pattern(palette.normal.right[2])) - call s:assert.match(s:hi('LightLineRight_visual_3'), 'E411: highlight group not found\|cleared') - call s:assert.match(s:hi('LightLineMiddle_normal'), s:pattern(palette.normal.middle[0])) + call s:assert.match(s:hi('LightlineLeft_visual_0'), s:pattern(palette.visual.left[0])) + call s:assert.match(s:hi('LightlineLeft_visual_1'), s:pattern(palette.visual.left[1])) + call s:assert.match(s:hi('LightlineLeft_visual_2'), 'E411: highlight group not found\|cleared') + call s:assert.match(s:hi('LightlineRight_visual_0'), s:pattern(palette.normal.right[0])) + call s:assert.match(s:hi('LightlineRight_visual_1'), s:pattern(palette.normal.right[1])) + call s:assert.match(s:hi('LightlineRight_visual_2'), s:pattern(palette.normal.right[2])) + call s:assert.match(s:hi('LightlineRight_visual_3'), 'E411: highlight group not found\|cleared') + call s:assert.match(s:hi('LightlineMiddle_normal'), s:pattern(palette.normal.middle[0])) endfunction function! s:suite.replace() @@ -72,14 +72,14 @@ function! s:suite.replace() call lightline#colorscheme() call lightline#highlight('replace') let palette = lightline#palette() - call s:assert.match(s:hi('LightLineLeft_replace_0'), s:pattern(palette.replace.left[0])) - call s:assert.match(s:hi('LightLineLeft_replace_1'), s:pattern(palette.replace.left[1])) - call s:assert.match(s:hi('LightLineLeft_replace_2'), 'E411: highlight group not found\|cleared') - call s:assert.match(s:hi('LightLineRight_replace_0'), s:pattern(palette.replace.right[0])) - call s:assert.match(s:hi('LightLineRight_replace_1'), s:pattern(palette.replace.right[1])) - call s:assert.match(s:hi('LightLineRight_replace_2'), s:pattern(palette.replace.right[2])) - call s:assert.match(s:hi('LightLineRight_replace_3'), 'E411: highlight group not found\|cleared') - call s:assert.match(s:hi('LightLineMiddle_replace'), s:pattern(palette.replace.middle[0])) + call s:assert.match(s:hi('LightlineLeft_replace_0'), s:pattern(palette.replace.left[0])) + call s:assert.match(s:hi('LightlineLeft_replace_1'), s:pattern(palette.replace.left[1])) + call s:assert.match(s:hi('LightlineLeft_replace_2'), 'E411: highlight group not found\|cleared') + call s:assert.match(s:hi('LightlineRight_replace_0'), s:pattern(palette.replace.right[0])) + call s:assert.match(s:hi('LightlineRight_replace_1'), s:pattern(palette.replace.right[1])) + call s:assert.match(s:hi('LightlineRight_replace_2'), s:pattern(palette.replace.right[2])) + call s:assert.match(s:hi('LightlineRight_replace_3'), 'E411: highlight group not found\|cleared') + call s:assert.match(s:hi('LightlineMiddle_replace'), s:pattern(palette.replace.middle[0])) endfunction function! s:suite.left_right() @@ -92,18 +92,18 @@ function! s:suite.left_right() call lightline#init() call lightline#colorscheme() let palette = lightline#palette() - call s:assert.match(s:hi('LightLineLeft_normal_0'), s:pattern(palette.normal.left[0])) - call s:assert.match(s:hi('LightLineLeft_normal_1'), s:pattern(palette.normal.left[1])) - call s:assert.match(s:hi('LightLineLeft_normal_2'), s:pattern(palette.normal.middle[0])) - call s:assert.match(s:hi('LightLineLeft_normal_3'), s:pattern(palette.normal.middle[0])) - call s:assert.match(s:hi('LightLineLeft_normal_4'), 'E411: highlight group not found\|cleared') - call s:assert.match(s:hi('LightLineRight_normal_0'), s:pattern(palette.normal.right[0])) - call s:assert.match(s:hi('LightLineRight_normal_1'), s:pattern(palette.normal.right[1])) - call s:assert.match(s:hi('LightLineRight_normal_2'), s:pattern(palette.normal.right[2])) - call s:assert.match(s:hi('LightLineRight_normal_3'), s:pattern(palette.normal.middle[0])) - call s:assert.match(s:hi('LightLineRight_normal_4'), s:pattern(palette.normal.middle[0])) - call s:assert.match(s:hi('LightLineRight_normal_5'), 'E411: highlight group not found\|cleared') - call s:assert.match(s:hi('LightLineMiddle_normal'), s:pattern(palette.normal.middle[0])) + call s:assert.match(s:hi('LightlineLeft_normal_0'), s:pattern(palette.normal.left[0])) + call s:assert.match(s:hi('LightlineLeft_normal_1'), s:pattern(palette.normal.left[1])) + call s:assert.match(s:hi('LightlineLeft_normal_2'), s:pattern(palette.normal.middle[0])) + call s:assert.match(s:hi('LightlineLeft_normal_3'), s:pattern(palette.normal.middle[0])) + call s:assert.match(s:hi('LightlineLeft_normal_4'), 'E411: highlight group not found\|cleared') + call s:assert.match(s:hi('LightlineRight_normal_0'), s:pattern(palette.normal.right[0])) + call s:assert.match(s:hi('LightlineRight_normal_1'), s:pattern(palette.normal.right[1])) + call s:assert.match(s:hi('LightlineRight_normal_2'), s:pattern(palette.normal.right[2])) + call s:assert.match(s:hi('LightlineRight_normal_3'), s:pattern(palette.normal.middle[0])) + call s:assert.match(s:hi('LightlineRight_normal_4'), s:pattern(palette.normal.middle[0])) + call s:assert.match(s:hi('LightlineRight_normal_5'), 'E411: highlight group not found\|cleared') + call s:assert.match(s:hi('LightlineMiddle_normal'), s:pattern(palette.normal.middle[0])) endfunction function! s:suite.no_components() @@ -120,11 +120,11 @@ function! s:suite.no_components() call lightline#init() call lightline#colorscheme() let palette = lightline#palette() - call s:assert.match(s:hi('LightLineLeft_normal_0'), s:pattern(palette.normal.left[0])) - call s:assert.match(s:hi('LightLineLeft_normal_1'), 'E411: highlight group not found\|cleared') - call s:assert.match(s:hi('LightLineRight_normal_0'), s:pattern(palette.normal.right[0])) - call s:assert.match(s:hi('LightLineRight_normal_1'), 'E411: highlight group not found\|cleared') - call s:assert.match(s:hi('LightLineMiddle_normal'), s:pattern(palette.normal.middle[0])) + call s:assert.match(s:hi('LightlineLeft_normal_0'), s:pattern(palette.normal.left[0])) + call s:assert.match(s:hi('LightlineLeft_normal_1'), 'E411: highlight group not found\|cleared') + call s:assert.match(s:hi('LightlineRight_normal_0'), s:pattern(palette.normal.right[0])) + call s:assert.match(s:hi('LightlineRight_normal_1'), 'E411: highlight group not found\|cleared') + call s:assert.match(s:hi('LightlineMiddle_normal'), s:pattern(palette.normal.middle[0])) endfunction function! s:suite.subseparator() @@ -140,9 +140,9 @@ function! s:suite.subseparator() for i in range(4) for j in range(5) if i + 1 == j - call s:assert.match(s:hi(printf('LightLineLeft_normal_%s_%s', i, j)), s:pattern(get(palette.normal.left, i, palette.normal.middle[0]), get(palette.normal.left, j, palette.normal.middle[0]))) + call s:assert.match(s:hi(printf('LightlineLeft_normal_%s_%s', i, j)), s:pattern(get(palette.normal.left, i, palette.normal.middle[0]), get(palette.normal.left, j, palette.normal.middle[0]))) else - call s:assert.match(s:hi(printf('LightLineLeft_normal_%s_%s', i, j)), 'E411: highlight group not found\|cleared') + call s:assert.match(s:hi(printf('LightlineLeft_normal_%s_%s', i, j)), 'E411: highlight group not found\|cleared') endif endfor endfor @@ -154,18 +154,18 @@ function! s:suite.component_type() call lightline#colorscheme() let palette = lightline#palette() for type in ['error', 'warning'] - call s:assert.match(s:hi(printf('LightLineLeft_normal_%s', type)), s:pattern(palette.normal[type][0])) - call s:assert.match(s:hi(printf('LightLineLeft_normal_0_%s', type)), s:pattern(palette.normal.left[0], palette.normal[type][0])) - call s:assert.match(s:hi(printf('LightLineLeft_normal_1_%s', type)), s:pattern(palette.normal.left[1], palette.normal[type][0])) - call s:assert.match(s:hi(printf('LightLineLeft_normal_2_%s', type)), 'E411: highlight group not found\|cleared') - call s:assert.match(s:hi(printf('LightLineLeft_normal_%s_0', type)), s:pattern(palette.normal[type][0], palette.normal.left[0])) - call s:assert.match(s:hi(printf('LightLineLeft_normal_%s_1', type)), s:pattern(palette.normal[type][0], palette.normal.left[1])) - call s:assert.match(s:hi(printf('LightLineLeft_normal_%s_2', type)), s:pattern(palette.normal[type][0], palette.normal.middle[0])) - call s:assert.match(s:hi(printf('LightLineLeft_normal_%s_3', type)), 'E411: highlight group not found\|cleared') + call s:assert.match(s:hi(printf('LightlineLeft_normal_%s', type)), s:pattern(palette.normal[type][0])) + call s:assert.match(s:hi(printf('LightlineLeft_normal_0_%s', type)), s:pattern(palette.normal.left[0], palette.normal[type][0])) + call s:assert.match(s:hi(printf('LightlineLeft_normal_1_%s', type)), s:pattern(palette.normal.left[1], palette.normal[type][0])) + call s:assert.match(s:hi(printf('LightlineLeft_normal_2_%s', type)), 'E411: highlight group not found\|cleared') + call s:assert.match(s:hi(printf('LightlineLeft_normal_%s_0', type)), s:pattern(palette.normal[type][0], palette.normal.left[0])) + call s:assert.match(s:hi(printf('LightlineLeft_normal_%s_1', type)), s:pattern(palette.normal[type][0], palette.normal.left[1])) + call s:assert.match(s:hi(printf('LightlineLeft_normal_%s_2', type)), s:pattern(palette.normal[type][0], palette.normal.middle[0])) + call s:assert.match(s:hi(printf('LightlineLeft_normal_%s_3', type)), 'E411: highlight group not found\|cleared') endfor for type1 in ['error', 'warning'] for type2 in ['error', 'warning'] - call s:assert.match(s:hi(printf('LightLineLeft_normal_%s_%s', type1, type2)), s:pattern(palette.normal[type1][0], palette.normal[type2][0])) + call s:assert.match(s:hi(printf('LightlineLeft_normal_%s_%s', type1, type2)), s:pattern(palette.normal[type1][0], palette.normal[type2][0])) endfor endfor endfunction diff --git a/sources_non_forked/lightline.vim/test/link.vim b/sources_non_forked/lightline.vim/test/link.vim index ca867536..c0811c42 100644 --- a/sources_non_forked/lightline.vim/test/link.vim +++ b/sources_non_forked/lightline.vim/test/link.vim @@ -17,50 +17,50 @@ endfunction function! s:suite.link() call lightline#link() - call s:assert.match(s:hi('LightLineLeft_active_0'), 'LightLineLeft_normal_0') - call s:assert.match(s:hi('LightLineLeft_active_1'), 'LightLineLeft_normal_1') - call s:assert.match(s:hi('LightLineLeft_active_2'), 'E411: highlight group not found') - call s:assert.match(s:hi('LightLineRight_active_0'), 'LightLineRight_normal_0') - call s:assert.match(s:hi('LightLineRight_active_1'), 'LightLineRight_normal_1') - call s:assert.match(s:hi('LightLineRight_active_2'), 'LightLineRight_normal_2') - call s:assert.match(s:hi('LightLineRight_active_3'), 'E411: highlight group not found') - call s:assert.match(s:hi('LightLineMiddle_active'), 'LightLineMiddle_normal') + call s:assert.match(s:hi('LightlineLeft_active_0'), 'LightlineLeft_normal_0') + call s:assert.match(s:hi('LightlineLeft_active_1'), 'LightlineLeft_normal_1') + call s:assert.match(s:hi('LightlineLeft_active_2'), 'E411: highlight group not found') + call s:assert.match(s:hi('LightlineRight_active_0'), 'LightlineRight_normal_0') + call s:assert.match(s:hi('LightlineRight_active_1'), 'LightlineRight_normal_1') + call s:assert.match(s:hi('LightlineRight_active_2'), 'LightlineRight_normal_2') + call s:assert.match(s:hi('LightlineRight_active_3'), 'E411: highlight group not found') + call s:assert.match(s:hi('LightlineMiddle_active'), 'LightlineMiddle_normal') endfunction function! s:suite.insert() call lightline#link('i') - call s:assert.match(s:hi('LightLineLeft_active_0'), 'LightLineLeft_insert_0') - call s:assert.match(s:hi('LightLineLeft_active_1'), 'LightLineLeft_insert_1') - call s:assert.match(s:hi('LightLineLeft_active_2'), 'E411: highlight group not found') - call s:assert.match(s:hi('LightLineRight_active_0'), 'LightLineRight_insert_0') - call s:assert.match(s:hi('LightLineRight_active_1'), 'LightLineRight_insert_1') - call s:assert.match(s:hi('LightLineRight_active_2'), 'LightLineRight_insert_2') - call s:assert.match(s:hi('LightLineRight_active_3'), 'E411: highlight group not found') - call s:assert.match(s:hi('LightLineMiddle_active'), 'LightLineMiddle_insert') + call s:assert.match(s:hi('LightlineLeft_active_0'), 'LightlineLeft_insert_0') + call s:assert.match(s:hi('LightlineLeft_active_1'), 'LightlineLeft_insert_1') + call s:assert.match(s:hi('LightlineLeft_active_2'), 'E411: highlight group not found') + call s:assert.match(s:hi('LightlineRight_active_0'), 'LightlineRight_insert_0') + call s:assert.match(s:hi('LightlineRight_active_1'), 'LightlineRight_insert_1') + call s:assert.match(s:hi('LightlineRight_active_2'), 'LightlineRight_insert_2') + call s:assert.match(s:hi('LightlineRight_active_3'), 'E411: highlight group not found') + call s:assert.match(s:hi('LightlineMiddle_active'), 'LightlineMiddle_insert') endfunction function! s:suite.visual() call lightline#link('v') - call s:assert.match(s:hi('LightLineLeft_active_0'), 'LightLineLeft_visual_0') - call s:assert.match(s:hi('LightLineLeft_active_1'), 'LightLineLeft_visual_1') - call s:assert.match(s:hi('LightLineLeft_active_2'), 'E411: highlight group not found') - call s:assert.match(s:hi('LightLineRight_active_0'), 'LightLineRight_visual_0') - call s:assert.match(s:hi('LightLineRight_active_1'), 'LightLineRight_visual_1') - call s:assert.match(s:hi('LightLineRight_active_2'), 'LightLineRight_visual_2') - call s:assert.match(s:hi('LightLineRight_active_3'), 'E411: highlight group not found') - call s:assert.match(s:hi('LightLineMiddle_active'), 'LightLineMiddle_visual') + call s:assert.match(s:hi('LightlineLeft_active_0'), 'LightlineLeft_visual_0') + call s:assert.match(s:hi('LightlineLeft_active_1'), 'LightlineLeft_visual_1') + call s:assert.match(s:hi('LightlineLeft_active_2'), 'E411: highlight group not found') + call s:assert.match(s:hi('LightlineRight_active_0'), 'LightlineRight_visual_0') + call s:assert.match(s:hi('LightlineRight_active_1'), 'LightlineRight_visual_1') + call s:assert.match(s:hi('LightlineRight_active_2'), 'LightlineRight_visual_2') + call s:assert.match(s:hi('LightlineRight_active_3'), 'E411: highlight group not found') + call s:assert.match(s:hi('LightlineMiddle_active'), 'LightlineMiddle_visual') endfunction function! s:suite.replace() call lightline#link('R') - call s:assert.match(s:hi('LightLineLeft_active_0'), 'LightLineLeft_replace_0') - call s:assert.match(s:hi('LightLineLeft_active_1'), 'LightLineLeft_replace_1') - call s:assert.match(s:hi('LightLineLeft_active_2'), 'E411: highlight group not found') - call s:assert.match(s:hi('LightLineRight_active_0'), 'LightLineRight_replace_0') - call s:assert.match(s:hi('LightLineRight_active_1'), 'LightLineRight_replace_1') - call s:assert.match(s:hi('LightLineRight_active_2'), 'LightLineRight_replace_2') - call s:assert.match(s:hi('LightLineRight_active_3'), 'E411: highlight group not found') - call s:assert.match(s:hi('LightLineMiddle_active'), 'LightLineMiddle_replace') + call s:assert.match(s:hi('LightlineLeft_active_0'), 'LightlineLeft_replace_0') + call s:assert.match(s:hi('LightlineLeft_active_1'), 'LightlineLeft_replace_1') + call s:assert.match(s:hi('LightlineLeft_active_2'), 'E411: highlight group not found') + call s:assert.match(s:hi('LightlineRight_active_0'), 'LightlineRight_replace_0') + call s:assert.match(s:hi('LightlineRight_active_1'), 'LightlineRight_replace_1') + call s:assert.match(s:hi('LightlineRight_active_2'), 'LightlineRight_replace_2') + call s:assert.match(s:hi('LightlineRight_active_3'), 'E411: highlight group not found') + call s:assert.match(s:hi('LightlineMiddle_active'), 'LightlineMiddle_replace') endfunction function! s:suite.left_right() @@ -73,18 +73,18 @@ function! s:suite.left_right() call lightline#init() call lightline#colorscheme() call lightline#link() - call s:assert.match(s:hi('LightLineLeft_active_0'), 'LightLineLeft_normal_0') - call s:assert.match(s:hi('LightLineLeft_active_1'), 'LightLineLeft_normal_1') - call s:assert.match(s:hi('LightLineLeft_active_2'), 'LightLineLeft_normal_2') - call s:assert.match(s:hi('LightLineLeft_active_3'), 'LightLineLeft_normal_3') - call s:assert.match(s:hi('LightLineLeft_active_4'), 'E411: highlight group not found') - call s:assert.match(s:hi('LightLineRight_active_0'), 'LightLineRight_normal_0') - call s:assert.match(s:hi('LightLineRight_active_1'), 'LightLineRight_normal_1') - call s:assert.match(s:hi('LightLineRight_active_2'), 'LightLineRight_normal_2') - call s:assert.match(s:hi('LightLineRight_active_3'), 'LightLineRight_normal_3') - call s:assert.match(s:hi('LightLineRight_active_4'), 'LightLineRight_normal_4') - call s:assert.match(s:hi('LightLineRight_active_5'), 'E411: highlight group not found') - call s:assert.match(s:hi('LightLineMiddle_active'), 'LightLineMiddle_normal') + call s:assert.match(s:hi('LightlineLeft_active_0'), 'LightlineLeft_normal_0') + call s:assert.match(s:hi('LightlineLeft_active_1'), 'LightlineLeft_normal_1') + call s:assert.match(s:hi('LightlineLeft_active_2'), 'LightlineLeft_normal_2') + call s:assert.match(s:hi('LightlineLeft_active_3'), 'LightlineLeft_normal_3') + call s:assert.match(s:hi('LightlineLeft_active_4'), 'E411: highlight group not found') + call s:assert.match(s:hi('LightlineRight_active_0'), 'LightlineRight_normal_0') + call s:assert.match(s:hi('LightlineRight_active_1'), 'LightlineRight_normal_1') + call s:assert.match(s:hi('LightlineRight_active_2'), 'LightlineRight_normal_2') + call s:assert.match(s:hi('LightlineRight_active_3'), 'LightlineRight_normal_3') + call s:assert.match(s:hi('LightlineRight_active_4'), 'LightlineRight_normal_4') + call s:assert.match(s:hi('LightlineRight_active_5'), 'E411: highlight group not found') + call s:assert.match(s:hi('LightlineMiddle_active'), 'LightlineMiddle_normal') endfunction function! s:suite.subseparator() @@ -100,9 +100,9 @@ function! s:suite.subseparator() for i in range(4) for j in range(5) if i + 1 == j - call s:assert.match(s:hi(printf('LightLineLeft_active_%s_%s', i, j)), printf('LightLineLeft_normal_%s_%s', i, j)) + call s:assert.match(s:hi(printf('LightlineLeft_active_%s_%s', i, j)), printf('LightlineLeft_normal_%s_%s', i, j)) else - call s:assert.match(s:hi(printf('LightLineLeft_active_%s_%s', i, j)), 'E411: highlight group not found') + call s:assert.match(s:hi(printf('LightlineLeft_active_%s_%s', i, j)), 'E411: highlight group not found') endif endfor endfor @@ -114,18 +114,18 @@ function! s:suite.component_type() call lightline#colorscheme() call lightline#link() for type in ['error', 'warning'] - call s:assert.match(s:hi(printf('LightLineLeft_active_%s', type)), printf('LightLineLeft_normal_%s', type)) - call s:assert.match(s:hi(printf('LightLineLeft_active_0_%s', type)), printf('LightLineLeft_normal_0_%s', type)) - call s:assert.match(s:hi(printf('LightLineLeft_active_1_%s', type)), printf('LightLineLeft_normal_1_%s', type)) - call s:assert.match(s:hi(printf('LightLineLeft_active_2_%s', type)), 'E411: highlight group not found') - call s:assert.match(s:hi(printf('LightLineLeft_active_%s_0', type)), printf('LightLineLeft_normal_%s_0', type)) - call s:assert.match(s:hi(printf('LightLineLeft_active_%s_1', type)), printf('LightLineLeft_normal_%s_1', type)) - call s:assert.match(s:hi(printf('LightLineLeft_active_%s_2', type)), printf('LightLineLeft_normal_%s_2', type)) - call s:assert.match(s:hi(printf('LightLineLeft_active_%s_3', type)), 'E411: highlight group not found') + call s:assert.match(s:hi(printf('LightlineLeft_active_%s', type)), printf('LightlineLeft_normal_%s', type)) + call s:assert.match(s:hi(printf('LightlineLeft_active_0_%s', type)), printf('LightlineLeft_normal_0_%s', type)) + call s:assert.match(s:hi(printf('LightlineLeft_active_1_%s', type)), printf('LightlineLeft_normal_1_%s', type)) + call s:assert.match(s:hi(printf('LightlineLeft_active_2_%s', type)), 'E411: highlight group not found') + call s:assert.match(s:hi(printf('LightlineLeft_active_%s_0', type)), printf('LightlineLeft_normal_%s_0', type)) + call s:assert.match(s:hi(printf('LightlineLeft_active_%s_1', type)), printf('LightlineLeft_normal_%s_1', type)) + call s:assert.match(s:hi(printf('LightlineLeft_active_%s_2', type)), printf('LightlineLeft_normal_%s_2', type)) + call s:assert.match(s:hi(printf('LightlineLeft_active_%s_3', type)), 'E411: highlight group not found') endfor for type1 in ['error', 'warning'] for type2 in ['error', 'warning'] - call s:assert.match(s:hi(printf('LightLineLeft_active_%s_%s', type1, type2)), printf('LightLineLeft_normal_%s_%s', type1, type2)) + call s:assert.match(s:hi(printf('LightlineLeft_active_%s_%s', type1, type2)), printf('LightlineLeft_normal_%s_%s', type1, type2)) endfor endfor endfunction diff --git a/sources_non_forked/syntastic/CONTRIBUTING.md b/sources_non_forked/syntastic/CONTRIBUTING.md index 1949415e..44eb13f8 100644 --- a/sources_non_forked/syntastic/CONTRIBUTING.md +++ b/sources_non_forked/syntastic/CONTRIBUTING.md @@ -97,9 +97,9 @@ let errorformat = \ '%-G%.%#' ``` -[bug_tracker]: https://github.com/scrooloose/syntastic/issues -[manual]: https://github.com/scrooloose/syntastic/blob/master/doc/syntastic.txt -[github]: https://github.com/scrooloose/syntastic +[bug_tracker]: https://github.com/vim-syntastic/syntastic/issues +[manual]: https://github.com/vim-syntastic/syntastic/blob/master/doc/syntastic.txt +[github]: https://github.com/vim-syntastic/syntastic [branches]: https://github.com/dchelimsky/rspec/wiki/Topic-Branches#using-topic-branches-when-contributing-patches [variables]: http://www.refactoring.com/catalog/extractVariable.html -[guide]: https://github.com/scrooloose/syntastic/wiki/Syntax-Checker-Guide +[guide]: https://github.com/vim-syntastic/syntastic/wiki/Syntax-Checker-Guide diff --git a/sources_non_forked/syntastic/README.markdown b/sources_non_forked/syntastic/README.markdown index e5c8396a..7ed8cc87 100644 --- a/sources_non_forked/syntastic/README.markdown +++ b/sources_non_forked/syntastic/README.markdown @@ -49,11 +49,12 @@ ## 1\. Introduction -Syntastic is a syntax checking plugin for [Vim][vim] that runs files through -external syntax checkers and displays any resulting errors to the user. This -can be done on demand, or automatically as files are saved. If syntax errors -are detected, the user is notified and is happy because they didn't have to -compile their code or execute their script to find them. +Syntastic is a syntax checking plugin for [Vim][vim] created by +[Martin Grenfell][scrooloose]. It runs files through external syntax checkers +and displays any resulting errors to the user. This can be done on demand, or +automatically as files are saved. If syntax errors are detected, the user is +notified and is happy because they didn't have to compile their code or execute +their script to find them. At the time of this writing, syntastic has checking plugins for ACPI Source Language, ActionScript, Ada, Ansible configurations, API Blueprint, @@ -153,7 +154,7 @@ You now have pathogen installed and can put syntastic into `~/.vim/bundle` like this: ```sh cd ~/.vim/bundle && \ -git clone --depth=1 https://github.com/scrooloose/syntastic.git +git clone --depth=1 https://github.com/vim-syntastic/syntastic.git ``` Quit vim and start it back up to reload it, then type: ```vim @@ -501,15 +502,16 @@ plugins that provide more functionality than syntastic. You might want to take a look at [ghcmod-vim][ghcmod], [jedi-vim][jedi], [python-mode][python_mode], [vim-go][vimgo], or [YouCompleteMe][ycm]. -[screenshot]: https://github.com/scrooloose/syntastic/raw/master/_assets/screenshot_1.png +[scrooloose]: https://github.com/scrooloose +[screenshot]: https://github.com/vim-syntastic/syntastic/raw/master/_assets/screenshot_1.png -[bug_tracker]: https://github.com/scrooloose/syntastic/issues -[checkers]: https://github.com/scrooloose/syntastic/blob/master/doc/syntastic-checkers.txt +[bug_tracker]: https://github.com/vim-syntastic/syntastic/issues +[checkers]: https://github.com/vim-syntastic/syntastic/blob/master/doc/syntastic-checkers.txt [crystal]: https://github.com/rhysd/vim-crystal [eastwood]: https://github.com/venantius/vim-eastwood [ghcmod]: https://github.com/eagletmt/ghcmod-vim [google_group]: https://groups.google.com/group/vim-syntastic -[guide]: https://github.com/scrooloose/syntastic/wiki/Syntax-Checker-Guide +[guide]: https://github.com/vim-syntastic/syntastic/wiki/Syntax-Checker-Guide [jedi]: https://github.com/davidhalter/jedi-vim [merlin]: https://github.com/the-lambda-church/merlin [myint]: https://github.com/myint/syntastic-extras diff --git a/sources_non_forked/syntastic/autoload/syntastic/util.vim b/sources_non_forked/syntastic/autoload/syntastic/util.vim index 90216946..deeb0f1f 100644 --- a/sources_non_forked/syntastic/autoload/syntastic/util.vim +++ b/sources_non_forked/syntastic/autoload/syntastic/util.vim @@ -37,8 +37,24 @@ function! syntastic#util#system(command) abort " {{{2 let $LC_MESSAGES = 'C' let $LC_ALL = '' + let crashed = 0 let cmd_start = reltime() - let out = system(a:command) + try + let out = system(a:command) + catch + let crashed = 1 + call syntastic#log#error('exception running system(' . string(a:command) . '): ' . v:exception) + if syntastic#util#isRunningWindows() + call syntastic#log#debug(g:_SYNTASTIC_DEBUG_CHECKERS, '$TMP = ' . string($TMP) . ', $TEMP = ' . string($TEMP)) + else + call syntastic#log#debug(g:_SYNTASTIC_DEBUG_CHECKERS, '$TERM = ' . string($TERM)) + call syntastic#log#debug(g:_SYNTASTIC_DEBUG_CHECKERS, '$TMPDIR = ' . string($TMPDIR)) + endif + call syntastic#log#debug(g:_SYNTASTIC_DEBUG_TRACE, '$PATH = ' . string($PATH)) + call syntastic#log#debug(g:_SYNTASTIC_DEBUG_TRACE, 'getcwd() = ' . string(getcwd())) + call syntastic#log#debugShowOptions(g:_SYNTASTIC_DEBUG_TRACE, g:_SYNTASTIC_SHELL_OPTIONS) + let out = '' + endtry let cmd_time = split(reltimestr(reltime(cmd_start)))[0] let $LC_ALL = old_lc_all @@ -46,7 +62,7 @@ function! syntastic#util#system(command) abort " {{{2 let &shell = old_shell - if exists('g:_SYNTASTIC_DEBUG_TRACE') + if !crashed && exists('g:_SYNTASTIC_DEBUG_TRACE') call syntastic#log#debug(g:_SYNTASTIC_DEBUG_TRACE, 'system: command run in ' . cmd_time . 's') endif diff --git a/sources_non_forked/syntastic/doc/syntastic-checkers.txt b/sources_non_forked/syntastic/doc/syntastic-checkers.txt index 1dff751e..d8fb584d 100644 --- a/sources_non_forked/syntastic/doc/syntastic-checkers.txt +++ b/sources_non_forked/syntastic/doc/syntastic-checkers.txt @@ -2009,7 +2009,7 @@ Security~ This checker executes the code in the files it checks: - https://github.com/scrooloose/syntastic/issues/1141 + https://github.com/vim-syntastic/syntastic/issues/1141 This is probably fine if you wrote the files yourself, but it can be a problem if you're trying to check third party files. If you are 100% willing to let @@ -2277,6 +2277,13 @@ Type: string Default: unset Additional arguments to pass to "cgc". +Note~ + +You probably also need a plugin to set |filetype| for OpenGL files, such as +"vim-glsl": + + https://github.com/tikhomirov/vim-glsl + ============================================================================== SYNTAX CHECKERS FOR GO *syntastic-checkers-go* @@ -2385,7 +2392,7 @@ Maintainer: Kamil Kisiel See the tool's documentation for details: - https://godoc.org/golang.org/x/tools/cmd/vet + https://godoc.org/cmd/vet Note~ @@ -5123,7 +5130,7 @@ Security~ This checker executes the code in the files it checks: - https://github.com/scrooloose/syntastic/issues/1773 + https://github.com/vim-syntastic/syntastic/issues/1773 This is probably fine if you wrote the files yourself, but it can be a problem if you're trying to check third party files. If you are 100% willing to let @@ -6010,7 +6017,7 @@ Maintainer: LCD 47 "Stylint" is a linter for Stylus (http://learnboost.github.io/stylus). See the project's page at GitHub for details: - https://github.com/rossPatton/stylint + https://github.com/SimenB/stylint Checker options~ diff --git a/sources_non_forked/syntastic/doc/syntastic.txt b/sources_non_forked/syntastic/doc/syntastic.txt index ed47fb0b..db3e99e4 100644 --- a/sources_non_forked/syntastic/doc/syntastic.txt +++ b/sources_non_forked/syntastic/doc/syntastic.txt @@ -85,7 +85,7 @@ Take a look at the list of supported filetypes and checkers: |syntastic-checkers Note: This doc only deals with using syntastic. To learn how to write syntax checker integrations, see the guide on the GitHub wiki: - https://github.com/scrooloose/syntastic/wiki/Syntax-Checker-Guide + https://github.com/vim-syntastic/syntastic/wiki/Syntax-Checker-Guide ------------------------------------------------------------------------------ 1.1. Quick start *syntastic-quickstart* @@ -1196,7 +1196,7 @@ The core maintainers of syntastic are: Find the latest version of syntastic at: - http://github.com/scrooloose/syntastic + http://github.com/vim-syntastic/syntastic ============================================================================== 9. License *syntastic-license* diff --git a/sources_non_forked/syntastic/plugin/syntastic.vim b/sources_non_forked/syntastic/plugin/syntastic.vim index 73563a67..2c8bdbad 100644 --- a/sources_non_forked/syntastic/plugin/syntastic.vim +++ b/sources_non_forked/syntastic/plugin/syntastic.vim @@ -19,7 +19,7 @@ if has('reltime') lockvar! g:_SYNTASTIC_START endif -let g:_SYNTASTIC_VERSION = '3.8.0-3' +let g:_SYNTASTIC_VERSION = '3.8.0-10' lockvar g:_SYNTASTIC_VERSION " Sanity checks {{{1 @@ -126,7 +126,7 @@ endif " Debug {{{1 -let s:_DEBUG_DUMP_OPTIONS = [ +let g:_SYNTASTIC_SHELL_OPTIONS = [ \ 'shell', \ 'shellcmdflag', \ 'shellpipe', @@ -142,10 +142,10 @@ for s:feature in [ \ ] if exists('+' . s:feature) - call add(s:_DEBUG_DUMP_OPTIONS, s:feature) + call add(g:_SYNTASTIC_SHELL_OPTIONS, s:feature) endif endfor -lockvar! s:_DEBUG_DUMP_OPTIONS +lockvar! g:_SYNTASTIC_SHELL_OPTIONS " debug constants let g:_SYNTASTIC_DEBUG_TRACE = 1 @@ -231,7 +231,7 @@ function! SyntasticInfo(...) abort " {{{2 call s:modemap.modeInfo(a:000) call s:registry.echoInfoFor(a:000) call s:_explain_skip(a:000) - call syntastic#log#debugShowOptions(g:_SYNTASTIC_DEBUG_TRACE, s:_DEBUG_DUMP_OPTIONS) + call syntastic#log#debugShowOptions(g:_SYNTASTIC_DEBUG_TRACE, g:_SYNTASTIC_SHELL_OPTIONS) call syntastic#log#debugDump(g:_SYNTASTIC_DEBUG_VARIABLES) endfunction " }}}2 @@ -382,7 +382,7 @@ endfunction " }}}2 "refresh and redraw all the error info for this buf when saving or reading function! s:UpdateErrors(buf, auto_invoked, checker_names) abort " {{{2 call syntastic#log#debugShowVariables(g:_SYNTASTIC_DEBUG_TRACE, 'version') - call syntastic#log#debugShowOptions(g:_SYNTASTIC_DEBUG_TRACE, s:_DEBUG_DUMP_OPTIONS) + call syntastic#log#debugShowOptions(g:_SYNTASTIC_DEBUG_TRACE, g:_SYNTASTIC_SHELL_OPTIONS) call syntastic#log#debugDump(g:_SYNTASTIC_DEBUG_VARIABLES) call syntastic#log#debug(g:_SYNTASTIC_DEBUG_TRACE, 'UpdateErrors' . (a:auto_invoked ? ' (auto)' : '') . \ ': ' . (len(a:checker_names) ? join(a:checker_names) : 'default checkers')) @@ -455,7 +455,12 @@ function! s:CacheErrors(buf, checker_names) abort " {{{2 if !s:_skip_file(a:buf) " debug logging {{{3 call syntastic#log#debugShowVariables(g:_SYNTASTIC_DEBUG_TRACE, 'aggregate_errors') - call syntastic#log#debug(g:_SYNTASTIC_DEBUG_CHECKERS, '$TERM = ' . string($TERM)) + if syntastic#util#isRunningWindows() + call syntastic#log#debug(g:_SYNTASTIC_DEBUG_CHECKERS, '$TMP = ' . string($TMP) . ', $TEMP = ' . string($TEMP)) + else + call syntastic#log#debug(g:_SYNTASTIC_DEBUG_CHECKERS, '$TERM = ' . string($TERM)) + call syntastic#log#debug(g:_SYNTASTIC_DEBUG_CHECKERS, '$TMPDIR = ' . string($TMPDIR)) + endif call syntastic#log#debug(g:_SYNTASTIC_DEBUG_CHECKERS, '$PATH = ' . string($PATH)) call syntastic#log#debug(g:_SYNTASTIC_DEBUG_TRACE, 'getcwd() = ' . string(getcwd())) " }}}3 diff --git a/sources_non_forked/syntastic/syntax_checkers/stylus/stylint.vim b/sources_non_forked/syntastic/syntax_checkers/stylus/stylint.vim index f489910e..b32b745e 100644 --- a/sources_non_forked/syntastic/syntax_checkers/stylus/stylint.vim +++ b/sources_non_forked/syntastic/syntax_checkers/stylus/stylint.vim @@ -19,13 +19,25 @@ let s:save_cpo = &cpo set cpo&vim function! SyntaxCheckers_stylus_stylint_GetLocList() dict + if !exists('s:stylint_new') + let s:stylint_new = syntastic#util#versionIsAtLeast(self.getVersion(), [1, 5, 7]) + endif + let makeprg = self.makeprgBuild({}) - let errorformat = - \ '%WWarning: %m,' . - \ '%EError: %m,' . - \ '%CFile: %f,' . - \ '%CLine: %l:%.%#' + if s:stylint_new + let errorformat = + \ '%P%f,' . + \ '%-Q,' . + \ '%\m%l:%c%\s%\+%t%\%%(rror%\|arning%\)%\s%\+%m%\s%\+%\S%\+%\s%#,' . + \ '%\m%l%\s%\+%t%\%%(rror%\|arning%\)%\s%\+%m%\s%\+%\S%\+%\s%#' + else + let errorformat = + \ '%WWarning: %m,' . + \ '%EError: %m,' . + \ '%CFile: %f,' . + \ '%CLine: %l:%.%#' + endif return SyntasticMake({ \ 'makeprg': makeprg, diff --git a/sources_non_forked/vim-fugitive/plugin/fugitive.vim b/sources_non_forked/vim-fugitive/plugin/fugitive.vim index 1f26ec3f..576dda19 100644 --- a/sources_non_forked/vim-fugitive/plugin/fugitive.vim +++ b/sources_non_forked/vim-fugitive/plugin/fugitive.vim @@ -2321,7 +2321,7 @@ function! s:Browse(bang,line1,count,...) abort if empty(url) && raw ==# '.' call s:throw("Instaweb failed to start") elseif empty(url) - call s:throw('"'.remote."' is not a supported remote") + call s:throw("'".remote."' is not a supported remote") endif let url = s:gsub(url, '[ <>]', '\="%".printf("%02X",char2nr(submatch(0)))') diff --git a/sources_non_forked/vim-go/.github/ISSUE_TEMPLATE.md b/sources_non_forked/vim-go/.github/ISSUE_TEMPLATE.md index 0adaff3c..467b1287 100644 --- a/sources_non_forked/vim-go/.github/ISSUE_TEMPLATE.md +++ b/sources_non_forked/vim-go/.github/ISSUE_TEMPLATE.md @@ -1,16 +1,14 @@ -### Actual behavior +### Behavior -Write here what's happening ... - -### Expected behavior - -Write here what you're expecting ... +Write here what's happening and what you're expecting instead of... ### Steps to reproduce: -Please create a reproducible case of your problem. Re produce it -with a minimal `vimrc` with all plugins disabled and only `vim-go` -enabled: +Please create a reproducible case of your problem. If this step is +not provided, the issue will be **closed** + +Re produce it with a minimal `vimrc` with all plugins disabled and +only `vim-go` enabled: 1. 2. @@ -22,7 +20,7 @@ Add here your current configuration and additional information that might be useful, such as: * `vimrc` you used to reproduce -* vim version: -* vim-go version -* go version +* vim version: +* vim-go version: +* go version: diff --git a/sources_non_forked/vim-go/CHANGELOG.md b/sources_non_forked/vim-go/CHANGELOG.md index 3285648e..0a6be1cf 100644 --- a/sources_non_forked/vim-go/CHANGELOG.md +++ b/sources_non_forked/vim-go/CHANGELOG.md @@ -1,12 +1,123 @@ -## Unplanned +## 1.11 - Unplanned -* We have now a [logo for vim-go](https://github.com/fatih/vim-go/blob/master/assets/vim-go.png)! Thanks to @egonelbre for his work on this. +FEATURES: + +* Add new `g:go_updatetime` setting to change the default updatetime (which was hardcoded previously) [gh-1055] +* Add new `g:go_template_use_pkg` setting to enable to use cwd as package name instead of basic template file [gh-1124] IMPROVEMENTS: -* Function calls are now highligted as wel when `g:go_highlight_functions` is enabled [gh-1048] -* Add completion support for uninported packages. This allows to complete even if the package is not improted [gh-1084] -* Tools that embeds GOROOT into their binaries do not work when people update their Go version and the GOROOT contains the vesion as part of their path (i.e: `/usr/local/Cellar/go/1.7.2/libexec`, [more info](https://blog.filippo.io/stale-goroot-and-gorebuild/)) . This is now fixed by introducing automatic GOROOT set/unset before each tool invoke. [gh-954] +* Add `statusline` support for `:GoMetaLinter` [gh-1120] +* Quickfix and Location lists contain now a descriptive title (requires at least Vim `7.4.2200`)[gh-1004] + +BUG FIXES: + +* Always use full path to detect packages to be shown in statusline [gh-1121] +* Use `echom` to persist errors in case of multiple echos [gh-1122] +* Fix a race condition where a quickfix window was not closed if a job has succeeded [gh-1123] +* Do not expand coverage arguments for non job execution of `:GoCoverage` [gh-1127] +* `:GoCoverage` doesn't mess up custom syntax anymore [gh-1128] +* Disable autoformat for `asm` files as they might be non Go ASM format [gh-1141] +* Fix indentation broken when using a action with a minus sign like `{{-` [gh-1143] +* Fix breaking Neovim change of passing less arguments to callbacks [gh-1145] +* Fix `guru` commands if custom build tags were set [gh-1136] +* Fix referencing a non defined variable for async commands when bang (!) was used +* Fix `:GoDef` failing for a modified buffer if `hidden` was not set [gh-1132] +* Fix `:GoDefStack` to allow popping from jump list when buffer is modified [gh-1133] + + +## 1.10 (November 24, 2016) + +FEATURES: + +* **Vim 8.0 support!** This is the initial version to add Vim 8.0 based support to + all basic commands (check out below for more information). With time we'll + going to extend it to other commands. All the features are only enabled if + you have at least Vim 8.0.0087. Backwards compatible with Vim 7.4.x. + If you see any problems, please open an issue. + +* We have now a [logo for vim-go](https://github.com/fatih/vim-go/blob/master/assets/vim-go.png)! Thanks to @egonelbre for his work on this. +* `:GoBuild`, `:GoTest`, `:GoTestCompile`, `:GoInstall` commands are now fully + async. Async means it doesn't block your UI anymore. If the command finished + it echoes the status. For a better experience use the statusline information + (more info below) + +* `:GoCoverage` and `:GoCoverageBrowser` commands are fully async. +* `:GoDef` is fully async if `guru` is used as command. +* `:GoRename` is fully async . + +* `:GoMetaLinter` is fully asnyc. Also works with the current autosave linting + feature. As a reminder, to enable auto linting on save either call + `:GoMetaLinterAutoSaveToggle` (temporary) or add `let + g:go_metalinter_autosave = 1` (persistent) to your virmc). + +* All `guru` commands run asynchronously if Vim 8.0 is being used. Current + Commands: + * GoImplements + * GoWhicherrs + * GoCallees + * GoDescribe + * GoCallers + * GoCallstack + * GoFreevars + * GoChannelPeers + * GoReferrers + +* `:GoSameIds` also runs asynchronously. This makes it useful especially for + auto sameids mode. In this mode it constantly evaluates the identifier under the + cursor whenever it's in hold position and then calls :GoSameIds. As a + reminder, to enable auto info either call `:GoSameIdsAutoToggle`(temporary) + or add `let g:go_auto_sameids = 1` (persistent) to your vimrc. + +* `:GoInfo` is now non blocking and works in async mode if `guru` is used in + `g:go_info_mode`. This makes it useful especially for autoinfo mode. In this + mode it constantly evaluates the identifier under the cursor whenever it's in + hold position and then calls :GoInfo. As a reminder, to enable auto info + either call `:GoAutoTypeInfoToggle`(temporary) or add `let + g:go_auto_type_info = 1` (persistent) to your vimrc. To use `guru` instead of + `gocode` add following to your vimrc: `let g:go_info_mode = 'guru'` + + The `guru` is more accurate and reliabed due the usage of `guru` describe. It + doesn't rely on `pkg/` folder like `gocode` does. However it's slower than + `gocode` as there is no caching mechanism in `guru` yet. + +* **New**: Statusline function: `go#statusline#Show()` which can be plugged into + the statusline bar. Works only with vim 8.0. It shows all asynchronously + called functions status real time. Checkout it in action: + https://twitter.com/fatih/status/800473735467847680. To enable it add the + following to your `vimrc`. If you use lightline, airline, .. check out their + respective documentation on how to add a custom function: + +```viml +" go command status (requires vim-go) +set statusline+=%#goStatuslineColor# +set statusline+=%{go#statusline#Show()} +set statusline+=%* +``` + +IMPROVEMENTS: + +* **:GoDocBrowser** is now capable to to understand the identifier under the cursor (just like :GoDoc) +* Function calls are now highlighted as well when `g:go_highlight_functions` is enabled [gh-1048] +* Add completion support for un-imported packages. This allows to complete even + if the package is not imported. By default it's disabled, enable by adding + `let g:go_gocode_unimported_packages = 1` [gh-1084] +* Tools that embeds GOROOT into their binaries do not work when people update + their Go version and the GOROOT contains the vesion as part of their path + (i.e: `/usr/local/Cellar/go/1.7.2/libexec`, [more + info](https://blog.filippo.io/stale-goroot-and-gorebuild/)) . This is now + fixed by introducing automatic GOROOT set/unset before each tool invoke. + [gh-954] +* Added new setting `g:go_echo_go_info` to enable/disable printing identifier + information when completion is done [gh-1101] +* Added new `go_echo_command_info` setting is added, which is enabled by + default. It's just a switch for disabling messages of commands, such as + `:GoBuild`, `:GoTest`, etc.. Useful to *disable* if `go#statusline#Show()` is + being used in Statusline, to prevent to see duplicates notifications. +* goSameId highlighting is now linked to `Search`, which is much more clear as + it changes according to the users colorscheme +* Add plug mapping `(go-lint)` for :GoLint [gh-1089] + BUG FIXES: @@ -16,6 +127,17 @@ BUG FIXES: * Highlight nested structs correctly [gh-1075] * Highlight builtin functions correctly if `g:go_highlight_functions` is enabled [gh-1070] * Fix `:GoSameIds` highlighting if a new buffer is opened in the same window [gh-1067] +* Internal: add `abort` to all vim function to return in case of errors [gh-1100] +* Fix `:GoCoverage` to be executed if working dir is not inside the test dir [gh-1033] + +BACKWARDS INCOMPATIBILITIES: + +* remove vim-dispatch and vimproc.vim support. vim 8.0 has now the necessary + API to invoke async jobs and timers. Going forward we should use those. Also + this will remove the burden to maintain compatibility with those plugins. + +* `go#jobcontrol#Statusline()` is removed in favor of the new, global and + extensible `go#statusline#Show()` ## 1.9 (September 13, 2016) diff --git a/sources_non_forked/vim-go/README.md b/sources_non_forked/vim-go/README.md index 1d886e90..504149b2 100644 --- a/sources_non_forked/vim-go/README.md +++ b/sources_non_forked/vim-go/README.md @@ -46,10 +46,8 @@ disabled/enabled easily. * Custom vim text objects such as `a function` or `inner function` list. * Jump to function or type declarations with `:GoDecls` or `:GoDeclsDir` -* A async launcher for the go command is implemented for Neovim, fully async - building and testing (beta). -* Integrated with the Neovim terminal, launch `:GoRun` and other go commands - in their own new terminal. (beta) +* Vim 8.0 support. Async execution for most commands, various underlying improvements. +* NeoVim support (beta). Async execution for some commands. * Alternate between implementation and test code with `:GoAlternate` Checkout the official [tutorial](https://github.com/fatih/vim-go-tutorial) @@ -237,9 +235,10 @@ let g:go_get_update = 0 ### Using with Neovim (beta) Note: Neovim currently is not a first class citizen for vim-go. You are free -to open bugs but I'm not going to look at them. Even though I'm using Neovim -myself, Neovim itself is still alpha. So vim-go might not work well as good as -in Vim. I'm happy to accept pull requests or very detailed bug reports. +to open bug, however I'm not using Neovim so it's hard for me to test it. +vim-go might not work well as good as in Vim. I'm happy to accept pull requests +or very detailed bug reports. If you're interested to improve the state of +Neovim in vim-go you're always welcome! Run `:GoRun` in a new tab, horizontal split or vertical split terminal diff --git a/sources_non_forked/vim-go/autoload/ctrlp/decls.vim b/sources_non_forked/vim-go/autoload/ctrlp/decls.vim index 7af2cda7..e1465adb 100644 --- a/sources_non_forked/vim-go/autoload/ctrlp/decls.vim +++ b/sources_non_forked/vim-go/autoload/ctrlp/decls.vim @@ -14,12 +14,12 @@ else let g:ctrlp_ext_vars = [s:go_decls_var] endif -function! ctrlp#decls#init() +function! ctrlp#decls#init() abort cal s:enable_syntax() return s:decls endfunction -function! ctrlp#decls#exit() +function! ctrlp#decls#exit() abort unlet! s:decls s:current_dir s:target endfunction @@ -28,7 +28,7 @@ endfunction " a:mode the mode that has been chosen by pressing or " the values are 'e', 'v', 't' and 'h', respectively " a:str the selected string -function! ctrlp#decls#accept(mode, str) +function! ctrlp#decls#accept(mode, str) abort let cd = exists('*haslocaldir') && haslocaldir() ? 'lcd ' : 'cd ' let dir = getcwd() try @@ -56,7 +56,7 @@ function! ctrlp#decls#accept(mode, str) endtry endfunction -function! ctrlp#decls#enter() +function! ctrlp#decls#enter() abort let s:current_dir = fnameescape(expand('%:p:h')) let s:decls = [] @@ -130,7 +130,7 @@ function! ctrlp#decls#enter() endfor endfunc -function! s:enable_syntax() +function! s:enable_syntax() abort if !(has('syntax') && exists('g:syntax_on')) return endif @@ -148,7 +148,7 @@ endfunction let s:id = g:ctrlp_builtins + len(g:ctrlp_ext_vars) -function! ctrlp#decls#cmd(mode, ...) +function! ctrlp#decls#cmd(mode, ...) abort let s:mode = a:mode if a:0 && !empty(a:1) let s:target = a:1 diff --git a/sources_non_forked/vim-go/autoload/go/alternate.vim b/sources_non_forked/vim-go/autoload/go/alternate.vim index dc5643dc..f2cb210f 100644 --- a/sources_non_forked/vim-go/autoload/go/alternate.vim +++ b/sources_non_forked/vim-go/autoload/go/alternate.vim @@ -4,7 +4,7 @@ if !exists("g:go_alternate_mode") endif " Test alternates between the implementation of code and the test code. -function! go#alternate#Switch(bang, cmd) +function! go#alternate#Switch(bang, cmd) abort let file = expand('%') if empty(file) call go#util#EchoError("no buffer name") diff --git a/sources_non_forked/vim-go/autoload/go/asmfmt.vim b/sources_non_forked/vim-go/autoload/go/asmfmt.vim index b47651da..07779b57 100644 --- a/sources_non_forked/vim-go/autoload/go/asmfmt.vim +++ b/sources_non_forked/vim-go/autoload/go/asmfmt.vim @@ -11,7 +11,7 @@ " " Options: " -" g:go_asmfmt_autosave [default=1] +" g:go_asmfmt_autosave [default=0] " " Flag to automatically call :Fmt when file is saved. @@ -19,7 +19,7 @@ let s:got_fmt_error = 0 " This is a trimmed-down version of the logic in fmt.vim. -function! go#asmfmt#Format() +function! go#asmfmt#Format() abort " Save state. let l:curw = winsaveview() @@ -55,15 +55,15 @@ function! go#asmfmt#Format() call winrestview(l:curw) endfunction -function! go#asmfmt#ToggleAsmFmtAutoSave() - if get(g:, "go_asmfmt_autosave", 1) - let g:go_asmfmt_autosave = 0 - call go#util#EchoProgress("auto asmfmt disabled") +function! go#asmfmt#ToggleAsmFmtAutoSave() abort + if get(g:, "go_asmfmt_autosave", 0) + let g:go_asmfmt_autosave = 1 + call go#util#EchoProgress("auto asmfmt enabled") return end - let g:go_asmfmt_autosave = 1 - call go#util#EchoProgress("auto asmfmt enabled") + let g:go_asmfmt_autosave = 0 + call go#util#EchoProgress("auto asmfmt disabled") endfunction " vim: sw=2 ts=2 et diff --git a/sources_non_forked/vim-go/autoload/go/cmd.vim b/sources_non_forked/vim-go/autoload/go/cmd.vim index 126ac807..e7a5daf7 100644 --- a/sources_non_forked/vim-go/autoload/go/cmd.vim +++ b/sources_non_forked/vim-go/autoload/go/cmd.vim @@ -1,19 +1,14 @@ -if !exists("g:go_dispatch_enabled") - let g:go_dispatch_enabled = 0 -endif - -function! go#cmd#autowrite() +function! go#cmd#autowrite() abort if &autowrite == 1 - silent wall + silent! wall endif endfunction - " Build builds the source code without producting any output binary. We live in " an editor so the best is to build it to catch errors and fix them. By " default it tries to call simply 'go build', but it first tries to get all " dependent files for the current folder and passes it to go build. -function! go#cmd#Build(bang, ...) +function! go#cmd#Build(bang, ...) abort " expand all wildcards(i.e: '%' to the current file name) let goargs = map(copy(a:000), "expand(v:val)") @@ -26,8 +21,18 @@ function! go#cmd#Build(bang, ...) " placeholder with the current folder (indicated with '.') let args = ["build"] + goargs + [".", "errors"] - " if we have nvim, call it asynchronously and return early ;) - if has('nvim') + if go#util#has_job() + if get(g:, 'go_echo_command_info', 1) + call go#util#EchoProgress("building dispatched ...") + endif + + call s:cmd_job({ + \ 'cmd': ['go'] + args, + \ 'bang': a:bang, + \}) + return + elseif has('nvim') + " if we have nvim, call it asynchronously and return early ;) call go#util#EchoProgress("building dispatched ...") call go#jobcontrol#Spawn(a:bang, "build", args) return @@ -45,10 +50,7 @@ function! go#cmd#Build(bang, ...) let dir = getcwd() try execute cd . fnameescape(expand("%:p:h")) - if g:go_dispatch_enabled && exists(':Make') == 2 - call go#util#EchoProgress("building dispatched ...") - silent! exe 'Make' - elseif l:listtype == "locationlist" + if l:listtype == "locationlist" silent! exe 'lmake!' else silent! exe 'make!' @@ -60,11 +62,8 @@ function! go#cmd#Build(bang, ...) let errors = go#list#Get(l:listtype) call go#list#Window(l:listtype, len(errors)) - - if !empty(errors) - if !a:bang - call go#list#JumpToFirst(l:listtype) - endif + if !empty(errors) && !a:bang + call go#list#JumpToFirst(l:listtype) else call go#util#EchoSuccess("[build] SUCCESS") endif @@ -75,7 +74,7 @@ endfunction " Run runs the current file (and their dependencies if any) in a new terminal. -function! go#cmd#RunTerm(bang, mode, files) +function! go#cmd#RunTerm(bang, mode, files) abort if empty(a:files) let cmd = "go run ". go#util#Shelljoin(go#tool#Files()) else @@ -88,12 +87,18 @@ endfunction " This is intented to test small programs and play with them. It's not " suitable for long running apps, because vim is blocking by default and " calling long running apps will block the whole UI. -function! go#cmd#Run(bang, ...) +function! go#cmd#Run(bang, ...) abort if has('nvim') call go#cmd#RunTerm(a:bang, '', a:000) return endif + if go#util#has_job() + " NOTE(arslan): 'term': 'open' case is not implement for +jobs. This means + " executions waiting for stdin will not work. That's why we don't do + " anything. Once this is implemented we're going to make :GoRun async + endif + let old_gopath = $GOPATH let $GOPATH = go#path#Detect() @@ -119,9 +124,7 @@ function! go#cmd#Run(bang, ...) let l:listtype = go#list#Type("quickfix") - if g:go_dispatch_enabled && exists(':Make') == 2 - silent! exe 'Make' - elseif l:listtype == "locationlist" + if l:listtype == "locationlist" exe 'lmake!' else exe 'make!' @@ -130,7 +133,7 @@ function! go#cmd#Run(bang, ...) let items = go#list#Get(l:listtype) let errors = go#tool#FilterValids(items) - call go#list#Populate(l:listtype, errors) + call go#list#Populate(l:listtype, errors, &makeprg) call go#list#Window(l:listtype, len(errors)) if !empty(errors) && !a:bang call go#list#JumpToFirst(l:listtype) @@ -141,9 +144,28 @@ function! go#cmd#Run(bang, ...) endfunction " Install installs the package by simple calling 'go install'. If any argument -" is given(which are passed directly to 'go install') it tries to install those -" packages. Errors are populated in the location window. -function! go#cmd#Install(bang, ...) +" is given(which are passed directly to 'go install') it tries to install +" those packages. Errors are populated in the location window. +function! go#cmd#Install(bang, ...) abort + " use vim's job functionality to call it asynchronously + if go#util#has_job() + " expand all wildcards(i.e: '%' to the current file name) + let goargs = map(copy(a:000), "expand(v:val)") + + " escape all shell arguments before we pass it to make + let goargs = go#util#Shelllist(goargs, 1) + + if get(g:, 'go_echo_command_info', 1) + call go#util#EchoProgress("installing dispatched ...") + endif + + call s:cmd_job({ + \ 'cmd': ['go', 'install'] + goargs, + \ 'bang': a:bang, + \}) + return + endif + let old_gopath = $GOPATH let $GOPATH = go#path#Detect() let default_makeprg = &makeprg @@ -159,10 +181,7 @@ function! go#cmd#Install(bang, ...) let dir = getcwd() try execute cd . fnameescape(expand("%:p:h")) - if g:go_dispatch_enabled && exists(':Make') == 2 - call go#util#EchoProgress("building dispatched ...") - silent! exe 'Make' - elseif l:listtype == "locationlist" + if l:listtype == "locationlist" silent! exe 'lmake!' else silent! exe 'make!' @@ -174,12 +193,10 @@ function! go#cmd#Install(bang, ...) let errors = go#list#Get(l:listtype) call go#list#Window(l:listtype, len(errors)) - if !empty(errors) - if !a:bang - call go#list#JumpToFirst(l:listtype) - endif + if !empty(errors) && !a:bang + call go#list#JumpToFirst(l:listtype) else - redraws! | echon "vim-go: " | echohl Function | echon "installed to ". $GOPATH | echohl None + call go#util#EchoSuccess("installed to ". $GOPATH) endif let $GOPATH = old_gopath @@ -189,7 +206,7 @@ endfunction " Test runs `go test` in the current directory. If compile is true, it'll " compile the tests instead of running them (useful to catch errors in the " test files). Any other argument is appendend to the final `go test` command -function! go#cmd#Test(bang, compile, ...) +function! go#cmd#Test(bang, compile, ...) abort let args = ["test"] " don't run the test, only compile it. Useful to capture and fix errors. @@ -199,9 +216,15 @@ function! go#cmd#Test(bang, compile, ...) endif if a:0 - " expand all wildcards(i.e: '%' to the current file name) - let goargs = map(copy(a:000), "expand(v:val)") - if !has('nvim') + let goargs = a:000 + + " do not expand for coverage mode as we're passing the arg ourself + if a:1 != '-coverprofile' + " expand all wildcards(i.e: '%' to the current file name) + let goargs = map(copy(a:000), "expand(v:val)") + endif + + if !(has('nvim') || go#util#has_job()) let goargs = go#util#Shelllist(goargs, 1) endif @@ -212,13 +235,29 @@ function! go#cmd#Test(bang, compile, ...) call add(args, printf("-timeout=%s", timeout)) endif - if a:compile - echon "vim-go: " | echohl Identifier | echon "compiling tests ..." | echohl None - else - echon "vim-go: " | echohl Identifier | echon "testing ..." | echohl None + if get(g:, 'go_echo_command_info', 1) + if a:compile + echon "vim-go: " | echohl Identifier | echon "compiling tests ..." | echohl None + else + echon "vim-go: " | echohl Identifier | echon "testing ..." | echohl None + endif endif - if has('nvim') + if go#util#has_job() + " use vim's job functionality to call it asynchronously + let job_args = { + \ 'cmd': ['go'] + args, + \ 'bang': a:bang, + \ } + + if a:compile + let job_args['custom_cb'] = function('s:test_compile', [compile_file]) + endif + + call s:cmd_job(job_args) + return + elseif has('nvim') + " use nvims's job functionality if get(g:, 'go_term_enabled', 0) let id = go#term#new(a:bang, ["go"] + args) else @@ -252,7 +291,7 @@ function! go#cmd#Test(bang, compile, ...) let errors = go#tool#ParseErrors(split(out, '\n')) let errors = go#tool#FilterValids(errors) - call go#list#Populate(l:listtype, errors) + call go#list#Populate(l:listtype, errors, command) call go#list#Window(l:listtype, len(errors)) if !empty(errors) && !a:bang call go#list#JumpToFirst(l:listtype) @@ -276,7 +315,7 @@ endfunction " Testfunc runs a single test that surrounds the current cursor position. " Arguments are passed to the `go test` command. -function! go#cmd#TestFunc(bang, ...) +function! go#cmd#TestFunc(bang, ...) abort " search flags legend (used only) " 'b' search backward instead of forward " 'c' accept a match at the cursor position @@ -304,7 +343,7 @@ function! go#cmd#TestFunc(bang, ...) endfunction " Generate runs 'go generate' in similar fashion to go#cmd#Build() -function! go#cmd#Generate(bang, ...) +function! go#cmd#Generate(bang, ...) abort let default_makeprg = &makeprg let old_gopath = $GOPATH @@ -322,9 +361,7 @@ function! go#cmd#Generate(bang, ...) let l:listtype = go#list#Type("quickfix") echon "vim-go: " | echohl Identifier | echon "generating ..."| echohl None - if g:go_dispatch_enabled && exists(':Make') == 2 - silent! exe 'Make' - elseif l:listtype == "locationlist" + if l:listtype == "locationlist" silent! exe 'lmake!' else silent! exe 'make!' @@ -346,12 +383,79 @@ function! go#cmd#Generate(bang, ...) endfunction +" --------------------- +" | Vim job callbacks | +" --------------------- + +function s:cmd_job(args) abort + let status_dir = expand('%:p:h') + let started_at = reltime() + + call go#statusline#Update(status_dir, { + \ 'desc': "current status", + \ 'type': a:args.cmd[1], + \ 'state': "started", + \}) + + " autowrite is not enabled for jobs + call go#cmd#autowrite() + + function! s:error_info_cb(job, exit_status, data) closure abort + let status = { + \ 'desc': 'last status', + \ 'type': a:args.cmd[1], + \ 'state': "success", + \ } + + if a:exit_status + let status.state = "failed" + endif + + let elapsed_time = reltimestr(reltime(started_at)) + " strip whitespace + let elapsed_time = substitute(elapsed_time, '^\s*\(.\{-}\)\s*$', '\1', '') + let status.state .= printf(" (%ss)", elapsed_time) + + call go#statusline#Update(status_dir, status) + endfunction + + let a:args.error_info_cb = function('s:error_info_cb') + let callbacks = go#job#Spawn(a:args) + + let start_options = { + \ 'callback': callbacks.callback, + \ 'close_cb': callbacks.close_cb, + \ } + + " modify GOPATH if needed + let old_gopath = $GOPATH + let $GOPATH = go#path#Detect() + + " pre start + let dir = getcwd() + let cd = exists('*haslocaldir') && haslocaldir() ? 'lcd ' : 'cd ' + let jobdir = fnameescape(expand("%:p:h")) + execute cd . jobdir + + call job_start(a:args.cmd, start_options) + + " post start + execute cd . fnameescape(dir) + let $GOPATH = old_gopath +endfunction + + +" test_compile is called when a GoTestCompile call is finished +function! s:test_compile(test_file, job, exit_status, data) abort + call delete(a:test_file) +endfunction + " ----------------------- " | Neovim job handlers | " ----------------------- let s:test_compile_handlers = {} -function! s:test_compile_handler(job, exit_status, data) +function! s:test_compile_handler(job, exit_status, data) abort if !has_key(s:test_compile_handlers, a:job.id) return endif diff --git a/sources_non_forked/vim-go/autoload/go/complete.vim b/sources_non_forked/vim-go/autoload/go/complete.vim index e65b008a..2663afbd 100644 --- a/sources_non_forked/vim-go/autoload/go/complete.vim +++ b/sources_non_forked/vim-go/autoload/go/complete.vim @@ -1,6 +1,6 @@ let s:sock_type = (has('win32') || has('win64')) ? 'tcp' : 'unix' -function! s:gocodeCurrentBuffer() +function! s:gocodeCurrentBuffer() abort let buf = getline(1, '$') if &encoding != 'utf-8' let buf = map(buf, 'iconv(v:val, &encoding, "utf-8")') @@ -16,7 +16,7 @@ function! s:gocodeCurrentBuffer() return file endfunction -function! s:gocodeCommand(cmd, preargs, args) +function! s:gocodeCommand(cmd, preargs, args) abort for i in range(0, len(a:args) - 1) let a:args[i] = go#util#Shellescape(a:args[i]) endfor @@ -59,12 +59,12 @@ function! s:gocodeCommand(cmd, preargs, args) endif endfunction -function! s:gocodeCurrentBufferOpt(filename) +function! s:gocodeCurrentBufferOpt(filename) abort return '-in=' . a:filename endfunction let s:optionsEnabled = 0 -function! s:gocodeEnableOptions() +function! s:gocodeEnableOptions() abort if s:optionsEnabled return endif @@ -78,14 +78,14 @@ function! s:gocodeEnableOptions() call go#util#System(printf('%s set propose-builtins %s', go#util#Shellescape(bin_path), s:toBool(get(g:, 'go_gocode_propose_builtins', 1)))) call go#util#System(printf('%s set autobuild %s', go#util#Shellescape(bin_path), s:toBool(get(g:, 'go_gocode_autobuild', 1)))) - call go#util#System(printf('%s set unimported-packages %s', go#util#Shellescape(bin_path), s:toBool(get(g:, 'go_gocode_unimported_packages', 1)))) + call go#util#System(printf('%s set unimported-packages %s', go#util#Shellescape(bin_path), s:toBool(get(g:, 'go_gocode_unimported_packages', 0)))) endfunction -function! s:toBool(val) +function! s:toBool(val) abort if a:val | return 'true ' | else | return 'false' | endif endfunction -function! s:gocodeAutocomplete() +function! s:gocodeAutocomplete() abort call s:gocodeEnableOptions() let filename = s:gocodeCurrentBuffer() @@ -96,7 +96,7 @@ function! s:gocodeAutocomplete() return result endfunction -function! go#complete#GetInfo() +function! go#complete#GetInfo() abort let offset = go#util#OffsetCursor()+1 let filename = s:gocodeCurrentBuffer() let result = s:gocodeCommand('autocomplete', @@ -137,7 +137,7 @@ function! go#complete#GetInfo() return "" endfunction -function! go#complete#Info(auto) +function! go#complete#Info(auto) abort " auto is true if we were called by g:go_auto_type_info's autocmd let result = go#complete#GetInfo() if !empty(result) @@ -147,12 +147,12 @@ function! go#complete#Info(auto) endif endfunction -function! s:trim_bracket(val) +function! s:trim_bracket(val) abort let a:val.word = substitute(a:val.word, '[(){}\[\]]\+$', '', '') return a:val endfunction -function! go#complete#Complete(findstart, base) +function! go#complete#Complete(findstart, base) abort "findstart = 1 when we need to get the text length if a:findstart == 1 execute "silent let g:gocomplete_completions = " . s:gocodeAutocomplete() @@ -167,7 +167,7 @@ function! go#complete#Complete(findstart, base) endif endf -function! go#complete#ToggleAutoTypeInfo() +function! go#complete#ToggleAutoTypeInfo() abort if get(g:, "go_auto_type_info", 0) let g:go_auto_type_info = 0 call go#util#EchoProgress("auto type info disabled") diff --git a/sources_non_forked/vim-go/autoload/go/coverage.vim b/sources_non_forked/vim-go/autoload/go/coverage.vim index f3d36c43..9b027861 100644 --- a/sources_non_forked/vim-go/autoload/go/coverage.vim +++ b/sources_non_forked/vim-go/autoload/go/coverage.vim @@ -3,7 +3,7 @@ let s:toggle = 0 " Buffer creates a new cover profile with 'go test -coverprofile' and changes " the current buffers highlighting to show covered and uncovered sections of " the code. If run again it clears the annotation. -function! go#coverage#BufferToggle(bang, ...) +function! go#coverage#BufferToggle(bang, ...) abort if s:toggle call go#coverage#Clear() return @@ -20,7 +20,7 @@ endfunction " teh current buffers highlighting to show covered and uncovered sections of " the code. Calling it again reruns the tests and shows the last updated " coverage. -function! go#coverage#Buffer(bang, ...) +function! go#coverage#Buffer(bang, ...) abort " we use matchaddpos() which was introduce with 7.4.330, be sure we have " it: http://ftp.vim.org/vim/patches/7.4/7.4.330 if !exists("*matchaddpos") @@ -43,8 +43,17 @@ function! go#coverage#Buffer(bang, ...) let s:toggle = 1 let l:tmpname = tempname() - let args = [a:bang, 0, "-coverprofile", l:tmpname] + if go#util#has_job() + call s:coverage_job({ + \ 'cmd': ['go', 'test', '-coverprofile', l:tmpname], + \ 'custom_cb': function('s:coverage_callback', [l:tmpname]), + \ 'bang': a:bang, + \ }) + return + endif + + let args = [a:bang, 0, "-coverprofile", l:tmpname] if a:0 call extend(args, a:000) endif @@ -75,11 +84,8 @@ function! go#coverage#Buffer(bang, ...) endfunction " Clear clears and resets the buffer annotation matches -function! go#coverage#Clear() - " only reset the syntax if the user has syntax enabled - if !empty(&syntax) - if exists("g:syntax_on") | syntax enable | endif - endif +function! go#coverage#Clear() abort + call clearmatches() if exists("s:toggle") | let s:toggle = 0 | endif @@ -87,25 +93,34 @@ function! go#coverage#Clear() if exists("#BufWinLeave#") autocmd! BufWinLeave endif - - call clearmatches() endfunction " Browser creates a new cover profile with 'go test -coverprofile' and opens " a new HTML coverage page from that profile in a new browser -function! go#coverage#Browser(bang, ...) +function! go#coverage#Browser(bang, ...) abort let l:tmpname = tempname() - let args = [a:bang, 0, "-coverprofile", l:tmpname] + if go#util#has_job() + call s:coverage_job({ + \ 'cmd': ['go', 'test', '-coverprofile', l:tmpname], + \ 'custom_cb': function('s:coverage_browser_callback', [l:tmpname]), + \ 'bang': a:bang, + \ }) + return + endif + let args = [a:bang, 0, "-coverprofile", l:tmpname] if a:0 call extend(args, a:000) endif + let id = call('go#cmd#Test', args) if has('nvim') call go#jobcontrol#AddHandler(function('s:coverage_browser_handler')) let s:coverage_browser_handler_jobs[id] = l:tmpname return endif + + if go#util#ShellError() == 0 let openHTML = 'go tool cover -html='.l:tmpname call go#tool#ExecuteInDir(openHTML) @@ -116,7 +131,7 @@ endfunction " Parses a single line from the cover file generated via go test -coverprofile " and returns a single coverage profile block. -function! go#coverage#parsegocoverline(line) +function! go#coverage#parsegocoverline(line) abort " file:startline.col,endline.col numstmt count let mx = '\([^:]\+\):\(\d\+\)\.\(\d\+\),\(\d\+\)\.\(\d\+\)\s\(\d\+\)\s\(\d\+\)' let tokens = matchlist(a:line, mx) @@ -133,7 +148,7 @@ endfunction " Generates matches to be added to matchaddpos for the given coverage profile " block -function! go#coverage#genmatch(cov) +function! go#coverage#genmatch(cov) abort let color = 'goCoverageCovered' if a:cov.cnt == 0 let color = 'goCoverageUncover' @@ -183,7 +198,7 @@ function! go#coverage#genmatch(cov) endfunction " Reads the given coverprofile file and annotates the current buffer -function! go#coverage#overlay(file) +function! go#coverage#overlay(file) abort if !filereadable(a:file) return endif @@ -204,7 +219,7 @@ function! go#coverage#overlay(file) let cnt += 1 endwhile - let fname = expand('%:t') + let fname = expand('%') " when called for a _test.go file, run the coverage for the actuall file " file @@ -221,6 +236,9 @@ function! go#coverage#overlay(file) exe ":edit ". fnamemodify(fname, ":p") endif + " cov.file includes only the filename itself, without full path + let fname = fnamemodify(fname, ":t") + for line in lines[1:] let cov = go#coverage#parsegocoverline(line) @@ -233,8 +251,6 @@ function! go#coverage#overlay(file) call extend(matches, go#coverage#genmatch(cov)) endfor - syntax manual - " clear the matches if we leave the buffer autocmd BufWinLeave call go#coverage#Clear() @@ -244,6 +260,78 @@ function! go#coverage#overlay(file) endfunction +" --------------------- +" | Vim job callbacks | +" --------------------- +" +function s:coverage_job(args) + " autowrite is not enabled for jobs + call go#cmd#autowrite() + + let status_dir = expand('%:p:h') + function! s:error_info_cb(job, exit_status, data) closure + let status = { + \ 'desc': 'last status', + \ 'type': "coverage", + \ 'state': "finished", + \ } + + if a:exit_status + let status.state = "failed" + endif + + call go#statusline#Update(status_dir, status) + endfunction + + let a:args.error_info_cb = function('s:error_info_cb') + let callbacks = go#job#Spawn(a:args) + + let start_options = { + \ 'callback': callbacks.callback, + \ 'close_cb': callbacks.close_cb, + \ } + + " modify GOPATH if needed + let old_gopath = $GOPATH + let $GOPATH = go#path#Detect() + + " pre start + let dir = getcwd() + let cd = exists('*haslocaldir') && haslocaldir() ? 'lcd ' : 'cd ' + let jobdir = fnameescape(expand("%:p:h")) + execute cd . jobdir + + call go#statusline#Update(status_dir, { + \ 'desc': "current status", + \ 'type': "coverage", + \ 'state': "started", + \}) + + call job_start(a:args.cmd, start_options) + + " post start + execute cd . fnameescape(dir) + let $GOPATH = old_gopath +endfunction + +" coverage_callback is called when the coverage execution is finished +function! s:coverage_callback(coverfile, job, exit_status, data) + if a:exit_status == 0 + call go#coverage#overlay(a:coverfile) + endif + + call delete(a:coverfile) +endfunction + +function! s:coverage_browser_callback(coverfile, job, exit_status, data) + if a:exit_status == 0 + let openHTML = 'go tool cover -html='.a:coverfile + call go#tool#ExecuteInDir(openHTML) + endif + + call delete(a:coverfile) +endfunction + " ----------------------- " | Neovim job handlers | " ----------------------- @@ -251,7 +339,7 @@ endfunction let s:coverage_handler_jobs = {} let s:coverage_browser_handler_jobs = {} -function! s:coverage_handler(job, exit_status, data) +function! s:coverage_handler(job, exit_status, data) abort if !has_key(s:coverage_handler_jobs, a:job.id) return endif @@ -264,7 +352,7 @@ function! s:coverage_handler(job, exit_status, data) unlet s:coverage_handler_jobs[a:job.id] endfunction -function! s:coverage_browser_handler(job, exit_status, data) +function! s:coverage_browser_handler(job, exit_status, data) abort if !has_key(s:coverage_browser_handler_jobs, a:job.id) return endif @@ -279,4 +367,5 @@ function! s:coverage_browser_handler(job, exit_status, data) unlet s:coverage_browser_handler_jobs[a:job.id] endfunction + " vim: sw=2 ts=2 et diff --git a/sources_non_forked/vim-go/autoload/go/def.vim b/sources_non_forked/vim-go/autoload/go/def.vim index 41464fe0..d3b51c26 100644 --- a/sources_non_forked/vim-go/autoload/go/def.vim +++ b/sources_non_forked/vim-go/autoload/go/def.vim @@ -1,7 +1,7 @@ let s:go_stack = [] let s:go_stack_level = 0 -function! go#def#Jump(mode) +function! go#def#Jump(mode) abort let old_gopath = $GOPATH let $GOPATH = go#path#Detect() @@ -27,42 +27,53 @@ function! go#def#Jump(mode) endif let command = printf("%s -f=%s -o=%s -t", bin_path, fname, go#util#OffsetCursor()) let out = go#util#System(command) - - " append the type information to the same line so our - " jump_to_declaration() function can parse it. This makes it - " compatible with guru definition as well too - let out = join(split(out, '\n'), ':') if exists("l:tmpname") call delete(l:tmpname) endif - elseif bin_name == 'guru' - let flags = "" - let in = "" - - if &modified - let sep = go#util#LineEnding() - let content = join(getline(1, '$'), sep) - let in = fname . "\n" . strlen(content) . "\n" . content - let flags .= " -modified" - endif - let bin_path = go#path#CheckBinPath("guru") if empty(bin_path) let $GOPATH = old_gopath return endif - if exists('g:go_guru_tags') - let tags = get(g:, 'go_guru_tags') - let flags .= printf(" -tags %s", tags) - endif - - let fname = shellescape(fname.':#'.go#util#OffsetCursor()) - let command = printf("%s %s definition %s", bin_path, flags, fname) + let cmd = [bin_path] + let stdin_content = "" if &modified - let out = go#util#System(command, in) + let sep = go#util#LineEnding() + let content = join(getline(1, '$'), sep) + let stdin_content = fname . "\n" . strlen(content) . "\n" . content + call add(cmd, "-modified") + endif + + if exists('g:go_guru_tags') + let tags = get(g:, 'go_guru_tags') + call extend(cmd, ["-tags", tags]) + endif + + let fname = fname.':#'.go#util#OffsetCursor() + call extend(cmd, ["definition", fname]) + + if go#util#has_job() + let l:spawn_args = { + \ 'cmd': cmd, + \ 'custom_cb': function('s:jump_to_declaration_cb', [a:mode, bin_name]), + \ } + + if &modified + let l:spawn_args.input = stdin_content + endif + + call go#util#EchoProgress("searching declaration ...") + + call s:def_job(spawn_args) + return + endif + + let command = join(cmd, " ") + if &modified + let out = go#util#System(command, stdin_content) else let out = go#util#System(command) endif @@ -76,13 +87,28 @@ function! go#def#Jump(mode) return endif - call s:jump_to_declaration(out, a:mode) + call s:jump_to_declaration(out, a:mode, bin_name) let $GOPATH = old_gopath endfunction -function! s:jump_to_declaration(out, mode) +function! s:jump_to_declaration_cb(mode, bin_name, job, exit_status, data) abort + if a:exit_status != 0 + return + endif + + call s:jump_to_declaration(a:data[0], a:mode, a:bin_name) +endfunction + +function! s:jump_to_declaration(out, mode, bin_name) abort + let final_out = a:out + if a:bin_name == "godef" + " append the type information to the same line so our we can parse it. + " This makes it compatible with guru output. + let final_out = join(split(a:out, '\n'), ':') + endif + " strip line ending - let out = split(a:out, go#util#LineEnding())[0] + let out = split(final_out, go#util#LineEnding())[0] if go#util#IsWin() let parts = split(out, '\(^[a-zA-Z]\)\@ q :call go#ui#CloseWindow() endfunction -function! go#def#StackClear(...) +function! go#def#StackClear(...) abort let s:go_stack = [] let s:go_stack_level = 0 endfunction -function! go#def#StackPop(...) +function! go#def#StackPop(...) abort if len(s:go_stack) == 0 call go#util#EchoError("godef stack empty") return @@ -218,7 +252,7 @@ function! go#def#StackPop(...) call go#def#Stack(newLevel + 1) endfunction -function! go#def#Stack(...) +function! go#def#Stack(...) abort if len(s:go_stack) == 0 call go#util#EchoError("godef stack empty") return @@ -246,7 +280,13 @@ function! go#def#Stack(...) let target = s:go_stack[s:go_stack_level] " jump - exec 'edit' target["file"] + if expand('%:p') != target["file"] + if &modified + exec 'hide edit' target["file"] + else + exec 'edit' target["file"] + endif + endif call cursor(target["line"], target["col"]) normal! zz else @@ -254,4 +294,27 @@ function! go#def#Stack(...) endif endfunction +function s:def_job(args) abort + function! s:error_info_cb(job, exit_status, data) closure + " do not print anything during async definition search&jump + endfunction + + let a:args.error_info_cb = function('s:error_info_cb') + let callbacks = go#job#Spawn(a:args) + + let start_options = { + \ 'callback': callbacks.callback, + \ 'close_cb': callbacks.close_cb, + \ } + + if &modified + let l:tmpname = tempname() + call writefile(split(a:args.input, "\n"), l:tmpname, "b") + let l:start_options.in_io = "file" + let l:start_options.in_name = l:tmpname + endif + + call job_start(a:args.cmd, start_options) +endfunction + " vim: sw=2 ts=2 et diff --git a/sources_non_forked/vim-go/autoload/go/doc.vim b/sources_non_forked/vim-go/autoload/go/doc.vim index a65351f3..3756167d 100644 --- a/sources_non_forked/vim-go/autoload/go/doc.vim +++ b/sources_non_forked/vim-go/autoload/go/doc.vim @@ -12,57 +12,39 @@ if !exists("g:go_doc_options") let g:go_doc_options = "" endif -" returns the package and exported name. exported name might be empty. -" ie: fmt and Println -" ie: github.com/fatih/set and New -function! s:godocWord(args) - if !executable('godoc') - let msg = "godoc command not found." - let msg .= " install with: go get golang.org/x/tools/cmd/godoc" - call go#util#EchoWarning(msg) - return [] +function! go#doc#OpenBrowser(...) abort + " check if we have gogetdoc as it gives us more and accurate information. + " Only supported if we have json_decode as it's not worth to parse the plain + " non-json output of gogetdoc + let bin_path = go#path#CheckBinPath('gogetdoc') + if !empty(bin_path) && exists('*json_decode') + let json_out = s:gogetdoc(1) + if go#util#ShellError() != 0 + call go#util#EchoError(json_out) + return + endif + + let out = json_decode(json_out) + if type(out) != type({}) + call go#util#EchoError("gogetdoc output is malformed") + endif + + let import = out["import"] + let name = out["name"] + + " if import is empty, it means we selected a package name + if import ==# "" + let godoc_url = "https://godoc.org/" . name + else + let godoc_url = "https://godoc.org/" . import . "#" . name + endif + + echo godoc_url + + call go#tool#OpenBrowser(godoc_url) + return endif - if !len(a:args) - let oldiskeyword = &iskeyword - setlocal iskeyword+=. - let word = expand('') - let &iskeyword = oldiskeyword - let word = substitute(word, '[^a-zA-Z0-9\\/._~-]', '', 'g') - let words = split(word, '\.\ze[^./]\+$') - else - let words = a:args - endif - - if !len(words) - return [] - endif - - let pkg = words[0] - if len(words) == 1 - let exported_name = "" - else - let exported_name = words[1] - endif - - let packages = go#tool#Imports() - - if has_key(packages, pkg) - let pkg = packages[pkg] - endif - - return [pkg, exported_name] -endfunction - -function! s:godocNotFound(content) - if len(a:content) == 0 - return 1 - endif - - return a:content =~# '^.*: no such file or directory\n$' -endfunction - -function! go#doc#OpenBrowser(...) let pkgs = s:godocWord(a:000) if empty(pkgs) return @@ -76,7 +58,7 @@ function! go#doc#OpenBrowser(...) call go#tool#OpenBrowser(godoc_url) endfunction -function! go#doc#Open(newmode, mode, ...) +function! go#doc#Open(newmode, mode, ...) abort if len(a:000) " check if we have 'godoc' and use it automatically let bin_path = go#path#CheckBinPath('godoc') @@ -87,34 +69,7 @@ function! go#doc#Open(newmode, mode, ...) let command = printf("%s %s", bin_path, join(a:000, ' ')) let out = go#util#System(command) else - " check if we have 'gogetdoc' and use it automatically - let bin_path = go#path#CheckBinPath('gogetdoc') - if empty(bin_path) - return - endif - - let offset = go#util#OffsetCursor() - let fname = expand("%:p:gs!\\!/!") - let pos = shellescape(fname.':#'.offset) - let command = printf("%s -pos %s", bin_path, pos) - - if &modified - " gogetdoc supports the same archive format as guru for dealing with - " modified buffers. - " use the -modified flag - " write each archive entry on stdin as: - " filename followed by newline - " file size followed by newline - " file contents - let in = "" - let sep = go#util#LineEnding() - let content = join(getline(1, '$'), sep) - let in = fname . "\n" . strlen(content) . "\n" . content - let command .= " -modified" - let out = go#util#System(command, in) - else - let out = go#util#System(command) - endif + let out = s:gogetdoc(0) endif if go#util#ShellError() != 0 @@ -125,7 +80,7 @@ function! go#doc#Open(newmode, mode, ...) call s:GodocView(a:newmode, a:mode, out) endfunction -function! s:GodocView(newposition, position, content) +function! s:GodocView(newposition, position, content) abort " reuse existing buffer window if it exists otherwise create a new one if !bufexists(s:buf_nr) execute a:newposition @@ -169,4 +124,96 @@ function! s:GodocView(newposition, position, content) noremap :close endfunction +function! s:gogetdoc(json) abort + " check if we have 'gogetdoc' and use it automatically + let bin_path = go#path#CheckBinPath('gogetdoc') + if empty(bin_path) + return -1 + endif + + let cmd = [bin_path] + + let offset = go#util#OffsetCursor() + let fname = expand("%:p:gs!\\!/!") + let pos = shellescape(fname.':#'.offset) + + let cmd += ["-pos", pos] + if a:json + let cmd += ["-json"] + endif + + let command = join(cmd, " ") + + if &modified + " gogetdoc supports the same archive format as guru for dealing with + " modified buffers. + " use the -modified flag + " write each archive entry on stdin as: + " filename followed by newline + " file size followed by newline + " file contents + let in = "" + let sep = go#util#LineEnding() + let content = join(getline(1, '$'), sep) + let in = fname . "\n" . strlen(content) . "\n" . content + let command .= " -modified" + let out = go#util#System(command, in) + else + let out = go#util#System(command) + endif + + return out +endfunction + +" returns the package and exported name. exported name might be empty. +" ie: fmt and Println +" ie: github.com/fatih/set and New +function! s:godocWord(args) abort + if !executable('godoc') + let msg = "godoc command not found." + let msg .= " install with: go get golang.org/x/tools/cmd/godoc" + call go#util#EchoWarning(msg) + return [] + endif + + if !len(a:args) + let oldiskeyword = &iskeyword + setlocal iskeyword+=. + let word = expand('') + let &iskeyword = oldiskeyword + let word = substitute(word, '[^a-zA-Z0-9\\/._~-]', '', 'g') + let words = split(word, '\.\ze[^./]\+$') + else + let words = a:args + endif + + if !len(words) + return [] + endif + + let pkg = words[0] + if len(words) == 1 + let exported_name = "" + else + let exported_name = words[1] + endif + + let packages = go#tool#Imports() + + if has_key(packages, pkg) + let pkg = packages[pkg] + endif + + return [pkg, exported_name] +endfunction + +function! s:godocNotFound(content) abort + if len(a:content) == 0 + return 1 + endif + + return a:content =~# '^.*: no such file or directory\n$' +endfunction + + " vim: sw=2 ts=2 et diff --git a/sources_non_forked/vim-go/autoload/go/fmt.vim b/sources_non_forked/vim-go/autoload/go/fmt.vim index b55ba83d..391fca93 100644 --- a/sources_non_forked/vim-go/autoload/go/fmt.vim +++ b/sources_non_forked/vim-go/autoload/go/fmt.vim @@ -51,7 +51,7 @@ endif " it doesn't undo changes and break undo history. If you are here reading " this and have VimL experience, please look at the function for " improvements, patches are welcome :) -function! go#fmt#Format(withGoimport) +function! go#fmt#Format(withGoimport) abort if g:go_fmt_experimental == 1 " Using winsaveview to save/restore cursor state has the problem of " closing folds on save: @@ -185,7 +185,7 @@ function! go#fmt#Format(withGoimport) % | " Couldn't detect gofmt error format, output errors endif if !empty(errors) - call go#list#Populate(l:listtype, errors) + call go#list#Populate(l:listtype, errors, 'Format') echohl Error | echomsg "Gofmt returned error" | echohl None endif @@ -215,7 +215,7 @@ function! go#fmt#Format(withGoimport) endif endfunction -function! go#fmt#ToggleFmtAutoSave() +function! go#fmt#ToggleFmtAutoSave() abort if get(g:, "go_fmt_autosave", 1) let g:go_fmt_autosave = 0 call go#util#EchoProgress("auto fmt disabled") diff --git a/sources_non_forked/vim-go/autoload/go/guru.vim b/sources_non_forked/vim-go/autoload/go/guru.vim index c1f7f193..78cacc0b 100644 --- a/sources_non_forked/vim-go/autoload/go/guru.vim +++ b/sources_non_forked/vim-go/autoload/go/guru.vim @@ -1,47 +1,63 @@ " guru.vim -- Vim integration for the Go guru. -func! s:RunGuru(mode, format, selected, needs_scope) range abort +" guru_cmd returns a dict that contains the command to execute guru. option +" is dict with following options: +" mode : guru mode, such as 'implements' +" format : output format, either 'plain' or 'json' +" needs_scope : if 1, adds the current package to the scope +" selected : if 1, means it's a range of selection, otherwise it picks up the +" offset under the cursor +" example output: +" {'cmd' : ['guru', '-json', 'implements', 'demo/demo.go:#66']} +function! s:guru_cmd(args) range abort + let mode = a:args.mode + let format = a:args.format + let needs_scope = a:args.needs_scope + let selected = a:args.selected + + let result = {} + let dirname = expand('%:p:h') + let pkg = go#package#ImportPath(dirname) + + " this is important, check it! + if pkg == -1 && needs_scope + return {'err': "current directory is not inside of a valid GOPATH"} + endif + "return with a warning if the binary doesn't exist let bin_path = go#path#CheckBinPath("guru") if empty(bin_path) return {'err': "bin path not found"} endif - let dirname = expand('%:p:h') - let pkg = go#package#ImportPath(dirname) - - " this is important, check it! - if pkg == -1 && a:needs_scope - return {'err': "current directory is not inside of a valid GOPATH"} - endif - - " start constructing the 'command' variable - let command = bin_path + " start constructing the command + let cmd = [bin_path] let filename = fnamemodify(expand("%"), ':p:gs?\\?/?') - let in = "" + let stdin_content = "" if &modified let sep = go#util#LineEnding() let content = join(getline(1, '$'), sep ) - let in = filename . "\n" . strlen(content) . "\n" . content - let command .= " -modified" + let result.stdin_content = filename . "\n" . strlen(content) . "\n" . content + call add(cmd, "-modified") endif " enable outputting in json format - if a:format == "json" - let command .= " -json" + if format == "json" + call add(cmd, "-json") endif " check for any tags if exists('g:go_guru_tags') let tags = get(g:, 'go_guru_tags') - let command .= printf(" -tags %s", tags) + call extend(cmd, ["-tags", tags]) + let result.tags = tags endif " some modes require scope to be defined (such as callers). For these we " choose a sensible setting, which is using the current file's package let scopes = [] - if a:needs_scope + if needs_scope let scopes = [pkg] endif @@ -66,274 +82,421 @@ func! s:RunGuru(mode, format, selected, needs_scope) range abort let scopes = go#util#StripTrailingSlash(scopes) " create shell-safe entries of the list - let scopes = go#util#Shelllist(scopes) + if !go#util#has_job() | let scopes = go#util#Shelllist(scopes) | endif " guru expect a comma-separated list of patterns, construct it let l:scope = join(scopes, ",") - let command .= printf(" -scope %s", l:scope) + let result.scope = l:scope + call extend(cmd, ["-scope", l:scope]) endif let pos = printf("#%s", go#util#OffsetCursor()) - if a:selected != -1 + if selected != -1 " means we have a range, get it let pos1 = go#util#Offset(line("'<"), col("'<")) let pos2 = go#util#Offset(line("'>"), col("'>")) let pos = printf("#%s,#%s", pos1, pos2) endif - " this is our final command let filename .= ':'.pos - let command .= printf(' %s %s', a:mode, shellescape(filename)) + call extend(cmd, [mode, filename]) + + let result.cmd = cmd + return result +endfunction + +" sync_guru runs guru in sync mode with the given arguments +function! s:sync_guru(args) abort + let result = s:guru_cmd(a:args) + if has_key(result, 'err') + call go#util#EchoError(result.err) + return -1 + endif + + if !has_key(a:args, 'disable_progress') + if a:args.needs_scope + call go#util#EchoProgress("analysing with scope ". result.scope . " ...") + elseif a:args.mode !=# 'what' + " the query might take time, let us give some feedback + call go#util#EchoProgress("analysing ...") + endif + endif let old_gopath = $GOPATH let $GOPATH = go#path#Detect() - if a:needs_scope - call go#util#EchoProgress("analysing with scope ". l:scope . " ...") - elseif a:mode !=# 'what' - " the query might take time, let us give some feedback - call go#util#EchoProgress("analysing ...") - endif - " run, forrest run!!! + let command = join(result.cmd, " ") if &modified - let out = go#util#System(command, in) + let out = go#util#System(command, result.stdin_content) else let out = go#util#System(command) endif let $GOPATH = old_gopath - if go#util#ShellError() != 0 - " the output contains the error message - return {'err' : out} + + if has_key(a:args, 'custom_parse') + call a:args.custom_parse(go#util#ShellError(), out) + else + call s:parse_guru_output(go#util#ShellError(), out, a:args.mode) endif - return {'out': out} + return out endfunc -" This uses Vim's errorformat to parse the output from Guru's 'plain output -" and put it into location list. I believe using errorformat is much more -" easier to use. If we need more power we can always switch back to parse it -" via regex. -func! s:loclistSecond(output) - " backup users errorformat, will be restored once we are finished - let old_errorformat = &errorformat - - " match two possible styles of errorformats: - " - " 'file:line.col-line2.col2: message' - " 'file:line:col: message' - " - " We discard line2 and col2 for the first errorformat, because it's not - " useful and location only has the ability to show one line and column - " number - let errformat = "%f:%l.%c-%[%^:]%#:\ %m,%f:%l:%c:\ %m" - call go#list#ParseFormat("locationlist", errformat, split(a:output, "\n")) - - let errors = go#list#Get("locationlist") - call go#list#Window("locationlist", len(errors)) -endfun - - -function! go#guru#Scope(...) - if a:0 - if a:0 == 1 && a:1 == '""' - unlet g:go_guru_scope - call go#util#EchoSuccess("guru scope is cleared") - else - let g:go_guru_scope = a:000 - call go#util#EchoSuccess("guru scope changed to: ". join(a:000, ",")) - endif - +" async_guru runs guru in async mode with the given arguments +function! s:async_guru(args) abort + let result = s:guru_cmd(a:args) + if has_key(result, 'err') + call go#util#EchoError(result.err) return endif - if !exists('g:go_guru_scope') - call go#util#EchoError("guru scope is not set") - else - call go#util#EchoSuccess("current guru scope: ". join(g:go_guru_scope, ",")) + let status_dir = expand('%:p:h') + let statusline_type = printf("%s", a:args.mode) + + if !has_key(a:args, 'disable_progress') + if a:args.needs_scope + call go#util#EchoProgress("analysing with scope ". result.scope . " ...") + endif endif + + function! s:close_cb(chan) closure + let messages = [] + while ch_status(a:chan, {'part': 'out'}) == 'buffered' + let msg = ch_read(a:chan, {'part': 'out'}) + call add(messages, msg) + endwhile + + while ch_status(a:chan, {'part': 'err'}) == 'buffered' + let msg = ch_read(a:chan, {'part': 'err'}) + call add(messages, msg) + endwhile + + let l:job = ch_getjob(a:chan) + let l:info = job_info(l:job) + + let out = join(messages, "\n") + + let status = { + \ 'desc': 'last status', + \ 'type': statusline_type, + \ 'state': "finished", + \ } + + if l:info.exitval + let status.state = "failed" + endif + + call go#statusline#Update(status_dir, status) + + if has_key(a:args, 'custom_parse') + call a:args.custom_parse(l:info.exitval, out) + else + call s:parse_guru_output(l:info.exitval, out, a:args.mode) + endif + endfunction + + let start_options = { + \ 'close_cb': function("s:close_cb"), + \ } + + if &modified + let l:tmpname = tempname() + call writefile(split(result.stdin_content, "\n"), l:tmpname, "b") + let l:start_options.in_io = "file" + let l:start_options.in_name = l:tmpname + endif + + call go#statusline#Update(status_dir, { + \ 'desc': "current status", + \ 'type': statusline_type, + \ 'state': "analysing", + \}) + + return job_start(result.cmd, start_options) +endfunc + +" run_guru runs the given guru argument +function! s:run_guru(args) abort + if go#util#has_job() + return s:async_guru(a:args) + endif + + return s:sync_guru(a:args) endfunction -function! go#guru#Tags(...) - if a:0 - if a:0 == 1 && a:1 == '""' - unlet g:go_guru_tags - call go#util#EchoSuccess("guru tags is cleared") - else - let g:go_guru_tags = a:1 - call go#util#EchoSuccess("guru tags changed to: ". a:1) - endif +" Show 'implements' relation for selected package +function! go#guru#Implements(selected) abort + let args = { + \ 'mode': 'implements', + \ 'format': 'plain', + \ 'selected': a:selected, + \ 'needs_scope': 1, + \ } - return - endif - - if !exists('g:go_guru_tags') - call go#util#EchoSuccess("guru tags is not set") - else - call go#util#EchoSuccess("current guru tags: ". a:1) - endif + call s:run_guru(args) endfunction " Report the possible constants, global variables, and concrete types that may " appear in a value of type error -function! go#guru#Whicherrs(selected) - let out = s:RunGuru('whicherrs', 'plain', a:selected, 1) - if has_key(out, 'err') - call go#util#EchoError(out.err) - return - endif +function! go#guru#Whicherrs(selected) abort + let args = { + \ 'mode': 'whicherrs', + \ 'format': 'plain', + \ 'selected': a:selected, + \ 'needs_scope': 1, + \ } - if empty(out.out) - call go#util#EchoSuccess("no error variables found. Try to change the scope with :GoGuruScope") - return - endif - call s:loclistSecond(out.out) -endfunction - -" Show 'implements' relation for selected package -function! go#guru#Implements(selected) - let out = s:RunGuru('implements', 'plain', a:selected, 1) - if has_key(out, 'err') - call go#util#EchoError(out.err) - return - endif - - call s:loclistSecond(out.out) + " TODO(arslan): handle empty case for both sync/async + " if empty(out.out) + " call go#util#EchoSuccess("no error variables found. Try to change the scope with :GoGuruScope") + " return + " endif + call s:run_guru(args) endfunction " Describe selected syntax: definition, methods, etc -function! go#guru#Describe(selected) - let out = s:RunGuru('describe', 'plain', a:selected, 0) - if has_key(out, 'err') - call go#util#EchoError(out.err) +function! go#guru#Describe(selected) abort + let args = { + \ 'mode': 'describe', + \ 'format': 'plain', + \ 'selected': a:selected, + \ 'needs_scope': 1, + \ } + + call s:run_guru(args) +endfunction + +function! go#guru#DescribeInfo() abort + " json_encode() and friends are introduced with this patch (7.4.1304) + " vim: https://groups.google.com/d/msg/vim_dev/vLupTNhQhZ8/cDGIk0JEDgAJ + " nvim: https://github.com/neovim/neovim/pull/4131 + if !exists("*json_decode") + call go#util#EchoError("requires 'json_decode'. Update your Vim/Neovim version.") return endif - call s:loclistSecond(out.out) + function! s:info(exit_val, output) + if a:exit_val != 0 + return + endif + + if a:output[0] !=# '{' + return + endif + + if empty(a:output) || type(a:output) != type("") + return + endif + + let result = json_decode(a:output) + if type(result) != type({}) + call go#util#EchoError(printf("malformed output from guru: %s", a:output)) + return + endif + + if !has_key(result, 'detail') + " if there is no detail check if there is a description and print it + if has_key(result, "desc") + call go#util#EchoInfo(result["desc"]) + return + endif + + call go#util#EchoError("detail key is missing. Please open a bug report on vim-go repo.") + return + endif + + let detail = result['detail'] + let info = "" + + " guru gives different information based on the detail mode. Let try to + " extract the most useful information + + if detail == "value" + if !has_key(result, 'value') + call go#util#EchoError("value key is missing. Please open a bug report on vim-go repo.") + return + endif + + let val = result["value"] + if !has_key(val, 'type') + call go#util#EchoError("type key is missing (value.type). Please open a bug report on vim-go repo.") + return + endif + + let info = val["type"] + elseif detail == "type" + if !has_key(result, 'type') + call go#util#EchoError("type key is missing. Please open a bug report on vim-go repo.") + return + endif + + let type = result["type"] + if !has_key(type, 'type') + call go#util#EchoError("type key is missing (type.type). Please open a bug report on vim-go repo.") + return + endif + + let info = type["type"] + elseif detail == "package" + if !has_key(result, 'package') + call go#util#EchoError("package key is missing. Please open a bug report on vim-go repo.") + return + endif + + let package = result["package"] + if !has_key(package, 'path') + call go#util#EchoError("path key is missing (package.path). Please open a bug report on vim-go repo.") + return + endif + + let info = printf("package %s", package["path"]) + elseif detail == "unknown" + let info = result["desc"] + else + call go#util#EchoError(printf("unknown detail mode found '%s'. Please open a bug report on vim-go repo", detail)) + return + endif + + call go#util#EchoInfo(info) + endfunction + + let args = { + \ 'mode': 'describe', + \ 'format': 'json', + \ 'selected': -1, + \ 'needs_scope': 1, + \ 'custom_parse': function('s:info'), + \ 'disable_progress': 1, + \ } + + call s:run_guru(args) endfunction " Show possible targets of selected function call -function! go#guru#Callees(selected) - let out = s:RunGuru('callees', 'plain', a:selected, 1) - if has_key(out, 'err') - call go#util#EchoError(out.err) - return - endif +function! go#guru#Callees(selected) abort + let args = { + \ 'mode': 'callees', + \ 'format': 'plain', + \ 'selected': a:selected, + \ 'needs_scope': 1, + \ } - call s:loclistSecond(out.out) + call s:run_guru(args) endfunction " Show possible callers of selected function -function! go#guru#Callers(selected) - let out = s:RunGuru('callers', 'plain', a:selected, 1) - if has_key(out, 'err') - call go#util#EchoError(out.err) - return - endif +function! go#guru#Callers(selected) abort + let args = { + \ 'mode': 'callers', + \ 'format': 'plain', + \ 'selected': a:selected, + \ 'needs_scope': 1, + \ } - call s:loclistSecond(out.out) + call s:run_guru(args) endfunction " Show path from callgraph root to selected function -function! go#guru#Callstack(selected) - let out = s:RunGuru('callstack', 'plain', a:selected, 1) - if has_key(out, 'err') - call go#util#EchoError(out.err) - return - endif +function! go#guru#Callstack(selected) abort + let args = { + \ 'mode': 'callstack', + \ 'format': 'plain', + \ 'selected': a:selected, + \ 'needs_scope': 1, + \ } - call s:loclistSecond(out.out) + call s:run_guru(args) endfunction " Show free variables of selection -function! go#guru#Freevars(selected) +function! go#guru#Freevars(selected) abort " Freevars requires a selection if a:selected == -1 call go#util#EchoError("GoFreevars requires a selection (range) of code") return endif - let out = s:RunGuru('freevars', 'plain', a:selected, 0) - if has_key(out, 'err') - call go#util#EchoError(out.err) - return - endif + let args = { + \ 'mode': 'freevars', + \ 'format': 'plain', + \ 'selected': 1, + \ 'needs_scope': 0, + \ } - call s:loclistSecond(out.out) + call s:run_guru(args) endfunction " Show send/receive corresponding to selected channel op -function! go#guru#ChannelPeers(selected) - let out = s:RunGuru('peers', 'plain', a:selected, 1) - if has_key(out, 'err') - call go#util#EchoError(out.err) - return - endif +function! go#guru#ChannelPeers(selected) abort + let args = { + \ 'mode': 'peers', + \ 'format': 'plain', + \ 'selected': a:selected, + \ 'needs_scope': 1, + \ } - call s:loclistSecond(out.out) + call s:run_guru(args) endfunction " Show all refs to entity denoted by selected identifier -function! go#guru#Referrers(selected) - let out = s:RunGuru('referrers', 'plain', a:selected, 0) - if has_key(out, 'err') - call go#util#EchoError(out.err) +function! go#guru#Referrers(selected) abort + let args = { + \ 'mode': 'referrers', + \ 'format': 'plain', + \ 'selected': a:selected, + \ 'needs_scope': 0, + \ } + + call s:run_guru(args) +endfunction + +function! go#guru#SameIdsTimer() abort + call timer_start(200, function('go#guru#SameIds'), {'repeat': -1}) +endfunction + +function! go#guru#SameIds() abort + " we use matchaddpos() which was introduce with 7.4.330, be sure we have + " it: http://ftp.vim.org/vim/patches/7.4/7.4.330 + if !exists("*matchaddpos") + call go#util#EchoError("GoSameIds requires 'matchaddpos'. Update your Vim/Neovim version.") return endif - call s:loclistSecond(out.out) -endfunction - -function! go#guru#What(selected) " json_encode() and friends are introduced with this patch (7.4.1304) " vim: https://groups.google.com/d/msg/vim_dev/vLupTNhQhZ8/cDGIk0JEDgAJ " nvim: https://github.com/neovim/neovim/pull/4131 if !exists("*json_decode") - return {'err': "GoWhat is not supported due old version of Vim/Neovim"} - endif - - let out = s:RunGuru('what', 'json', a:selected, 0) - if has_key(out, 'err') - return {'err': out.err} - endif - - let result = json_decode(out.out) - - if type(result) != type({}) - return {'err': "malformed output from guru"} - endif - - return result -endfunction - -function! go#guru#AutoToogleSameIds() - if get(g:, "go_auto_sameids", 0) - call go#util#EchoProgress("sameids auto highlighting disabled") - call go#guru#ClearSameIds() - let g:go_auto_sameids = 0 + call go#util#EchoError("GoSameIds requires 'json_decode'. Update your Vim/Neovim version.") return endif - call go#util#EchoSuccess("sameids auto highlighting enabled") - let g:go_auto_sameids = 1 + let args = { + \ 'mode': 'what', + \ 'format': 'json', + \ 'selected': -1, + \ 'needs_scope': 0, + \ 'custom_parse': function('s:same_ids_highlight'), + \ } + + call s:run_guru(args) endfunction -function! go#guru#SameIds(selected) - " we use matchaddpos() which was introduce with 7.4.330, be sure we have - " it: http://ftp.vim.org/vim/patches/7.4/7.4.330 - if !exists("*matchaddpos") - call go#util#EchoError("GoSameIds is supported with Vim version 7.4-330 or later") - return - endif - - let result = go#guru#What(a:selected) - +function! s:same_ids_highlight(exit_val, output) abort call go#guru#ClearSameIds() " run after calling guru to reduce flicker. - if has_key(result, 'err') && !get(g:, 'go_auto_sameids', 0) - " only echo if it's called via `:GoSameIds, but not if it's in automode - call go#util#EchoError(result.err) + + if a:output[0] !=# '{' + if !get(g:, 'go_auto_sameids', 0) + call go#util#EchoError(a:output) + endif + return + endif + + let result = json_decode(a:output) + if type(result) != type({}) && !get(g:, 'go_auto_sameids', 0) + call go#util#EchoError("malformed output from guru") return endif @@ -367,11 +530,11 @@ function! go#guru#SameIds(selected) if get(g:, "go_auto_sameids", 0) " re-apply SameIds at the current cursor position at the time the buffer " is redisplayed: e.g. :edit, :GoRename, etc. - autocmd BufWinEnter nested call go#guru#SameIds(-1) + autocmd BufWinEnter nested call go#guru#SameIds() endif endfunction -function! go#guru#ClearSameIds() +function! go#guru#ClearSameIds() abort let m = getmatches() for item in m if item['group'] == 'goSameId' @@ -385,11 +548,94 @@ function! go#guru#ClearSameIds() endif endfunction -function! go#guru#ToggleSameIds(selected) +function! go#guru#ToggleSameIds() abort if len(getmatches()) != 0 call go#guru#ClearSameIds() else - call go#guru#SameIds(a:selected) + call go#guru#SameIds() + endif +endfunction + +function! go#guru#AutoToogleSameIds() abort + if get(g:, "go_auto_sameids", 0) + call go#util#EchoProgress("sameids auto highlighting disabled") + call go#guru#ClearSameIds() + let g:go_auto_sameids = 0 + return + endif + + call go#util#EchoSuccess("sameids auto highlighting enabled") + let g:go_auto_sameids = 1 +endfunction + + +"""""""""""""""""""""""""""""""""""""""" +"" HELPER FUNCTIONS +"""""""""""""""""""""""""""""""""""""""" + +" This uses Vim's errorformat to parse the output from Guru's 'plain output +" and put it into location list. I believe using errorformat is much more +" easier to use. If we need more power we can always switch back to parse it +" via regex. Match two possible styles of errorformats: +" +" 'file:line.col-line2.col2: message' +" 'file:line:col: message' +" +" We discard line2 and col2 for the first errorformat, because it's not +" useful and location only has the ability to show one line and column +" number +function! s:parse_guru_output(exit_val, output, title) abort + if a:exit_val + call go#util#EchoError(a:output) + return + endif + + let old_errorformat = &errorformat + let errformat = "%f:%l.%c-%[%^:]%#:\ %m,%f:%l:%c:\ %m" + call go#list#ParseFormat("locationlist", errformat, a:output, a:title) + let &errorformat = old_errorformat + + let errors = go#list#Get("locationlist") + call go#list#Window("locationlist", len(errors)) +endfun + +function! go#guru#Scope(...) abort + if a:0 + if a:0 == 1 && a:1 == '""' + unlet g:go_guru_scope + call go#util#EchoSuccess("guru scope is cleared") + else + let g:go_guru_scope = a:000 + call go#util#EchoSuccess("guru scope changed to: ". join(a:000, ",")) + endif + + return + endif + + if !exists('g:go_guru_scope') + call go#util#EchoError("guru scope is not set") + else + call go#util#EchoSuccess("current guru scope: ". join(g:go_guru_scope, ",")) + endif +endfunction + +function! go#guru#Tags(...) abort + if a:0 + if a:0 == 1 && a:1 == '""' + unlet g:go_guru_tags + call go#util#EchoSuccess("guru tags is cleared") + else + let g:go_guru_tags = a:1 + call go#util#EchoSuccess("guru tags changed to: ". a:1) + endif + + return + endif + + if !exists('g:go_guru_tags') + call go#util#EchoSuccess("guru tags is not set") + else + call go#util#EchoSuccess("current guru tags: ". a:1) endif endfunction diff --git a/sources_non_forked/vim-go/autoload/go/impl.vim b/sources_non_forked/vim-go/autoload/go/impl.vim index fce4a29b..139dba75 100644 --- a/sources_non_forked/vim-go/autoload/go/impl.vim +++ b/sources_non_forked/vim-go/autoload/go/impl.vim @@ -1,4 +1,4 @@ -function! go#impl#Impl(...) +function! go#impl#Impl(...) abort let binpath = go#path#CheckBinPath('impl') if empty(binpath) return @@ -69,7 +69,7 @@ else endfunction endif -function! s:root_dirs() +function! s:root_dirs() abort let dirs = [] let root = go#util#goroot() if root !=# '' && isdirectory(root) @@ -88,7 +88,7 @@ function! s:root_dirs() return dirs endfunction -function! s:go_packages(dirs) +function! s:go_packages(dirs) abort let pkgs = [] for d in a:dirs let pkg_root = expand(d . '/pkg/' . go#util#osarch()) @@ -97,7 +97,7 @@ function! s:go_packages(dirs) return map(pkgs, "fnamemodify(v:val, ':t:r')") endfunction -function! s:interface_list(pkg) +function! s:interface_list(pkg) abort let contents = split(go#util#System('go doc ' . a:pkg), "\n") if go#util#ShellError() return [] @@ -108,7 +108,7 @@ function! s:interface_list(pkg) endfunction " Complete package and interface for {interface} -function! go#impl#Complete(arglead, cmdline, cursorpos) +function! go#impl#Complete(arglead, cmdline, cursorpos) abort let words = split(a:cmdline, '\s\+', 1) if words[-1] ==# '' return s:uniq(sort(s:go_packages(s:root_dirs()))) diff --git a/sources_non_forked/vim-go/autoload/go/import.vim b/sources_non_forked/vim-go/autoload/go/import.vim index 69658916..8d9e8d4c 100644 --- a/sources_non_forked/vim-go/autoload/go/import.vim +++ b/sources_non_forked/vim-go/autoload/go/import.vim @@ -4,7 +4,7 @@ " " Check out the docs for more information at /doc/vim-go.txt " -function! go#import#SwitchImport(enabled, localname, path, bang) +function! go#import#SwitchImport(enabled, localname, path, bang) abort let view = winsaveview() let path = substitute(a:path, '^\s*\(.\{-}\)\s*$', '\1', '') @@ -205,7 +205,7 @@ function! go#import#SwitchImport(enabled, localname, path, bang) endfunction -function! s:Error(s) +function! s:Error(s) abort echohl Error | echo a:s | echohl None endfunction diff --git a/sources_non_forked/vim-go/autoload/go/job.vim b/sources_non_forked/vim-go/autoload/go/job.vim new file mode 100644 index 00000000..e60b2b45 --- /dev/null +++ b/sources_non_forked/vim-go/autoload/go/job.vim @@ -0,0 +1,109 @@ +" Spawn returns callbacks to be used with job_start. It's abstracted to be +" used with various go command, such as build, test, install, etc.. This avoid +" us to write the same callback over and over for some commands. It's fully +" customizable so each command can change it to it's own logic. +function go#job#Spawn(args) + let cbs = { + \ 'winnr': winnr(), + \ 'dir': getcwd(), + \ 'jobdir': fnameescape(expand("%:p:h")), + \ 'messages': [], + \ 'args': a:args.cmd, + \ 'bang': 0, + \ } + + if has_key(a:args, 'bang') + let cbs.bang = a:args.bang + endif + + " add final callback to be called if async job is finished + " The signature should be in form: func(job, exit_status, messages) + if has_key(a:args, 'custom_cb') + let cbs.custom_cb = a:args.custom_cb + endif + + if has_key(a:args, 'error_info_cb') + let cbs.error_info_cb = a:args.error_info_cb + endif + + function cbs.callback(chan, msg) dict + call add(self.messages, a:msg) + endfunction + + function cbs.close_cb(chan) dict + let l:job = ch_getjob(a:chan) + let l:status = job_status(l:job) + + " the job might be in fail status, we assume by default it's failed. + " However if it's dead, we can use the real exitval + let exitval = 1 + if l:status == "dead" + let l:info = job_info(l:job) + let exitval = l:info.exitval + endif + + if has_key(self, 'custom_cb') + call self.custom_cb(l:job, exitval, self.messages) + endif + + if has_key(self, 'error_info_cb') + call self.error_info_cb(l:job, exitval, self.messages) + endif + + if get(g:, 'go_echo_command_info', 1) + if exitval == 0 + call go#util#EchoSuccess("SUCCESS") + else + call go#util#EchoError("FAILED") + endif + endif + + let l:listtype = go#list#Type("quickfix") + if exitval == 0 + call go#list#Clean(l:listtype) + call go#list#Window(l:listtype) + return + endif + + call self.show_errors(l:listtype) + endfunction + + function cbs.show_errors(listtype) dict + let cd = exists('*haslocaldir') && haslocaldir() ? 'lcd ' : 'cd ' + try + execute cd self.jobdir + let errors = go#tool#ParseErrors(self.messages) + let errors = go#tool#FilterValids(errors) + finally + execute cd . fnameescape(self.dir) + endtry + + if !len(errors) + " failed to parse errors, output the original content + call go#util#EchoError(join(self.messages, " ")) + call go#util#EchoError(self.dir) + return + endif + + if self.winnr == winnr() + call go#list#Populate(a:listtype, errors, join(self.args)) + call go#list#Window(a:listtype, len(errors)) + if !empty(errors) && !self.bang + call go#list#JumpToFirst(a:listtype) + endif + endif + endfunction + + " override callback handler if user provided it + if has_key(a:args, 'callback') + let cbs.callback = a:args.callback + endif + + " override close callback handler if user provided it + if has_key(a:args, 'close_cb') + let cbs.close_cb = a:args.close_cb + endif + + return cbs +endfunction +" vim: sw=2 ts=2 et diff --git a/sources_non_forked/vim-go/autoload/go/jobcontrol.vim b/sources_non_forked/vim-go/autoload/go/jobcontrol.vim index e03c75d6..189ed5f4 100644 --- a/sources_non_forked/vim-go/autoload/go/jobcontrol.vim +++ b/sources_non_forked/vim-go/autoload/go/jobcontrol.vim @@ -9,7 +9,7 @@ let s:handlers = {} " Spawn is a wrapper around s:spawn. It can be executed by other files and " scripts if needed. Desc defines the description for printing the status " during the job execution (useful for statusline integration). -function! go#jobcontrol#Spawn(bang, desc, args) +function! go#jobcontrol#Spawn(bang, desc, args) abort " autowrite is not enabled for jobs call go#cmd#autowrite() @@ -17,31 +17,8 @@ function! go#jobcontrol#Spawn(bang, desc, args) return job.id endfunction -" Statusline returns the current status of the job -function! go#jobcontrol#Statusline() abort - if empty(s:jobs) - return '' - endif - - let import_path = go#package#ImportPath(expand('%:p:h')) - - for job in values(s:jobs) - if job.importpath != import_path - continue - endif - - if job.state == "SUCCESS" - return '' - endif - - return printf("%s ... [%s]", job.desc, job.state) - endfor - - return '' -endfunction - " AddHandler adds a on_exit callback handler and returns the id. -function! go#jobcontrol#AddHandler(handler) +function! go#jobcontrol#AddHandler(handler) abort let i = len(s:handlers) while has_key(s:handlers, string(i)) let i += 1 @@ -52,7 +29,7 @@ function! go#jobcontrol#AddHandler(handler) endfunction " RemoveHandler removes a callback handler by id. -function! go#jobcontrol#RemoveHandler(id) +function! go#jobcontrol#RemoveHandler(id) abort unlet s:handlers[a:id] endfunction @@ -60,10 +37,10 @@ endfunction " a job is started a reference will be stored inside s:jobs. spawn changes the " GOPATH when g:go_autodetect_gopath is enabled. The job is started inside the " current files folder. -function! s:spawn(bang, desc, args) - let job = { - \ 'desc': a:desc, - \ 'bang': a:bang, +function! s:spawn(bang, desc, args) abort + let job = { + \ 'desc': a:desc, + \ 'bang': a:bang, \ 'winnr': winnr(), \ 'importpath': go#package#ImportPath(expand('%:p:h')), \ 'state': "RUNNING", @@ -113,7 +90,7 @@ endfunction " references and also displaying errors in the quickfix window collected by " on_stderr handler. If there are no errors and a quickfix window is open, " it'll be closed. -function! s:on_exit(job_id, exit_status) +function! s:on_exit(job_id, exit_status, event) dict abort let std_combined = self.stderr + self.stdout let cd = exists('*haslocaldir') && haslocaldir() ? 'lcd ' : 'cd ' @@ -122,9 +99,10 @@ function! s:on_exit(job_id, exit_status) call s:callback_handlers_on_exit(s:jobs[a:job_id], a:exit_status, std_combined) + let l:listtype = go#list#Type("quickfix") if a:exit_status == 0 - call go#list#Clean(0) - call go#list#Window(0) + call go#list#Clean(l:listtype) + call go#list#Window(l:listtype) let self.state = "SUCCESS" call go#util#EchoSuccess("SUCCESS") @@ -149,8 +127,7 @@ function! s:on_exit(job_id, exit_status) " if we are still in the same windows show the list if self.winnr == winnr() - let l:listtype = "locationlist" - call go#list#Populate(l:listtype, errors) + call go#list#Populate(l:listtype, errors, self.desc) call go#list#Window(l:listtype, len(errors)) if !empty(errors) && !self.bang call go#list#JumpToFirst(l:listtype) @@ -159,7 +136,7 @@ function! s:on_exit(job_id, exit_status) endfunction " callback_handlers_on_exit runs all handlers for job on exit event. -function! s:callback_handlers_on_exit(job, exit_status, data) +function! s:callback_handlers_on_exit(job, exit_status, data) abort if empty(s:handlers) return endif @@ -170,45 +147,15 @@ function! s:callback_handlers_on_exit(job, exit_status, data) endfunction " on_stdout is the stdout handler for jobstart(). It collects the output of -" stderr and stores them to the jobs internal stdout list. -function! s:on_stdout(job_id, data) +" stderr and stores them to the jobs internal stdout list. +function! s:on_stdout(job_id, data) dict abort call extend(self.stdout, a:data) endfunction " on_stderr is the stderr handler for jobstart(). It collects the output of " stderr and stores them to the jobs internal stderr list. -function! s:on_stderr(job_id, data) +function! s:on_stderr(job_id, data) dict abort call extend(self.stderr, a:data) endfunction -" abort_all aborts all current jobs created with s:spawn() -function! s:abort_all() - if empty(s:jobs) - return - endif - - for id in keys(s:jobs) - if id > 0 - silent! call jobstop(id) - endif - endfor - - let s:jobs = {} -endfunction - -" abort aborts the job with the given name, where name is the first argument -" passed to s:spawn() -function! s:abort(path) - if empty(s:jobs) - return - endif - - for job in values(s:jobs) - if job.importpath == path && job.id > 0 - silent! call jobstop(job.id) - unlet s:jobs['job.id'] - endif - endfor -endfunction - " vim: sw=2 ts=2 et diff --git a/sources_non_forked/vim-go/autoload/go/lint.vim b/sources_non_forked/vim-go/autoload/go/lint.vim index 9b2a543a..d81072a1 100644 --- a/sources_non_forked/vim-go/autoload/go/lint.vim +++ b/sources_non_forked/vim-go/autoload/go/lint.vim @@ -29,37 +29,42 @@ function! go#lint#Gometa(autosave, ...) abort let goargs = go#util#Shelljoin(a:000) endif - let meta_command = "gometalinter --disable-all" + let bin_path = go#path#CheckBinPath("gometalinter") + if empty(bin_path) + return + endif + + let cmd = [bin_path] + let cmd += ["--disable-all"] + if a:autosave || empty(g:go_metalinter_command) - let bin_path = go#path#CheckBinPath("gometalinter") - if empty(bin_path) - return - endif - - if a:autosave - " include only messages for the active buffer - let meta_command .= " --include='^" . expand('%:p') . ".*$'" - endif - " linters let linters = a:autosave ? g:go_metalinter_autosave_enabled : g:go_metalinter_enabled for linter in linters - let meta_command .= " --enable=".linter + let cmd += ["--enable=".linter] endfor - " deadline - let meta_command .= " --deadline=" . g:go_metalinter_deadline - " path - let meta_command .= " " . goargs + let cmd += [expand('%:p:h')] else " the user wants something else, let us use it. - let meta_command = g:go_metalinter_command + let cmd += [split(g:go_metalinter_command, " ")] endif - " comment out the following two lines for debugging - " echo meta_command - " return + if go#util#has_job() && has('lambda') + call s:lint_job({'cmd': cmd}) + return + endif + + " we add deadline only for sync mode + let cmd += ["--deadline=" . g:go_metalinter_deadline] + if a:autosave + " include only messages for the active buffer + let cmd += ["--include='^" . expand('%:p') . ".*$'"] + endif + + + let meta_command = join(cmd, " ") let out = go#tool#ExecuteInDir(meta_command) @@ -77,7 +82,7 @@ function! go#lint#Gometa(autosave, ...) abort let errformat = "%f:%l:%c:%t%*[^:]:\ %m,%f:%l::%t%*[^:]:\ %m" " Parse and populate our location list - call go#list#ParseFormat(l:listtype, errformat, split(out, "\n")) + call go#list#ParseFormat(l:listtype, errformat, split(out, "\n"), 'GoMetaLinter') let errors = go#list#Get(l:listtype) call go#list#Window(l:listtype, len(errors)) @@ -117,7 +122,7 @@ endfunction " Vet calls 'go vet' on the current directory. Any warnings are populated in " the location list -function! go#lint#Vet(bang, ...) +function! go#lint#Vet(bang, ...) abort call go#cmd#autowrite() echon "vim-go: " | echohl Identifier | echon "calling vet..." | echohl None if a:0 == 0 @@ -129,7 +134,7 @@ function! go#lint#Vet(bang, ...) let l:listtype = "quickfix" if go#util#ShellError() != 0 let errors = go#tool#ParseErrors(split(out, '\n')) - call go#list#Populate(l:listtype, errors) + call go#list#Populate(l:listtype, errors, 'Vet') call go#list#Window(l:listtype, len(errors)) if !empty(errors) && !a:bang call go#list#JumpToFirst(l:listtype) @@ -171,7 +176,7 @@ function! go#lint#Errcheck(...) abort let errformat = "%f:%l:%c:\ %m, %f:%l:%c\ %#%m" " Parse and populate our location list - call go#list#ParseFormat(l:listtype, errformat, split(out, "\n")) + call go#list#ParseFormat(l:listtype, errformat, split(out, "\n"), 'Errcheck') let errors = go#list#Get(l:listtype) @@ -182,7 +187,7 @@ function! go#lint#Errcheck(...) abort endif if !empty(errors) - call go#list#Populate(l:listtype, errors) + call go#list#Populate(l:listtype, errors, 'Errcheck') call go#list#Window(l:listtype, len(errors)) if !empty(errors) call go#list#JumpToFirst(l:listtype) @@ -196,7 +201,7 @@ function! go#lint#Errcheck(...) abort endfunction -function! go#lint#ToggleMetaLinterAutoSave() +function! go#lint#ToggleMetaLinterAutoSave() abort if get(g:, "go_metalinter_autosave", 0) let g:go_metalinter_autosave = 0 call go#util#EchoProgress("auto metalinter disabled") @@ -207,4 +212,88 @@ function! go#lint#ToggleMetaLinterAutoSave() call go#util#EchoProgress("auto metalinter enabled") endfunction +function s:lint_job(args) + let status_dir = expand('%:p:h') + let started_at = reltime() + + call go#statusline#Update(status_dir, { + \ 'desc': "current status", + \ 'type': "gometalinter", + \ 'state': "analysing", + \}) + + " autowrite is not enabled for jobs + call go#cmd#autowrite() + + let l:listtype = go#list#Type("quickfix") + let l:errformat = '%f:%l:%c:%t%*[^:]:\ %m,%f:%l::%t%*[^:]:\ %m' + + function! s:callback(chan, msg) closure + let old_errorformat = &errorformat + let &errorformat = l:errformat + caddexpr a:msg + let &errorformat = old_errorformat + + " TODO(arslan): cursor still jumps to first error even If I don't want + " it. Seems like there is a regression somewhere, but not sure where. + copen + endfunction + + function! s:close_cb(chan) closure + let l:job = ch_getjob(a:chan) + let l:status = job_status(l:job) + + let exitval = 1 + if l:status == "dead" + let l:info = job_info(l:job) + let exitval = l:info.exitval + endif + + let status = { + \ 'desc': 'last status', + \ 'type': "gometaliner", + \ 'state': "finished", + \ } + + if exitval + let status.state = "failed" + endif + + let elapsed_time = reltimestr(reltime(started_at)) + " strip whitespace + let elapsed_time = substitute(elapsed_time, '^\s*\(.\{-}\)\s*$', '\1', '') + let status.state .= printf(" (%ss)", elapsed_time) + + call go#statusline#Update(status_dir, status) + + let errors = go#list#Get(l:listtype) + if empty(errors) + call go#list#Window(l:listtype, len(errors)) + elseif has("patch-7.4.2200") + if l:listtype == 'quickfix' + call setqflist([], 'a', {'title': 'GoMetaLinter'}) + else + call setloclist(0, [], 'a', {'title': 'GoMetaLinter'}) + endif + endif + + if get(g:, 'go_echo_command_info', 1) + call go#util#EchoSuccess("linting finished") + endif + endfunction + + let start_options = { + \ 'callback': function("s:callback"), + \ 'close_cb': function("s:close_cb"), + \ } + + call job_start(a:args.cmd, start_options) + + call go#list#Clean(l:listtype) + + if get(g:, 'go_echo_command_info', 1) + call go#util#EchoProgress("linting started ...") + endif +endfunction + " vim: sw=2 ts=2 et diff --git a/sources_non_forked/vim-go/autoload/go/list.vim b/sources_non_forked/vim-go/autoload/go/list.vim index 6859a9f3..56d6115d 100644 --- a/sources_non_forked/vim-go/autoload/go/list.vim +++ b/sources_non_forked/vim-go/autoload/go/list.vim @@ -5,7 +5,7 @@ endif " Window opens the list with the given height up to 10 lines maximum. " Otherwise g:go_loclist_height is used. If no or zero height is given it " closes the window -function! go#list#Window(listtype, ...) +function! go#list#Window(listtype, ...) abort let l:listtype = go#list#Type(a:listtype) " we don't use lwindow to close the location list as we need also the " ability to resize the window. So, we are going to use lopen and lclose @@ -40,7 +40,7 @@ endfunction " Get returns the current list of items from the location list -function! go#list#Get(listtype) +function! go#list#Get(listtype) abort let l:listtype = go#list#Type(a:listtype) if l:listtype == "locationlist" return getloclist(0) @@ -50,22 +50,27 @@ function! go#list#Get(listtype) endfunction " Populate populate the location list with the given items -function! go#list#Populate(listtype, items) +function! go#list#Populate(listtype, items, title) abort let l:listtype = go#list#Type(a:listtype) if l:listtype == "locationlist" call setloclist(0, a:items, 'r') + + " The last argument ({what}) is introduced with 7.4.2200: + " https://github.com/vim/vim/commit/d823fa910cca43fec3c31c030ee908a14c272640 + if has("patch-7.4.2200") | call setloclist(0, [], 'a', {'title': a:title}) | endif else call setqflist(a:items, 'r') + if has("patch-7.4.2200") | call setqflist([], 'a', {'title': a:title}) | endif endif endfunction -function! go#list#PopulateWin(winnr, items) +function! go#list#PopulateWin(winnr, items) abort call setloclist(a:winnr, a:items, 'r') endfunction " Parse parses the given items based on the specified errorformat nad " populates the location list. -function! go#list#ParseFormat(listtype, errformat, items) +function! go#list#ParseFormat(listtype, errformat, items, title) abort let l:listtype = go#list#Type(a:listtype) " backup users errorformat, will be restored once we are finished let old_errorformat = &errorformat @@ -74,8 +79,10 @@ function! go#list#ParseFormat(listtype, errformat, items) let &errorformat = a:errformat if l:listtype == "locationlist" lgetexpr a:items + if has("patch-7.4.2200") | call setloclist(0, [], 'a', {'title': a:title}) | endif else cgetexpr a:items + if has("patch-7.4.2200") | call setqflist([], 'a', {'title': a:title}) | endif endif "restore back @@ -84,7 +91,7 @@ endfunction " Parse parses the given items based on the global errorformat and " populates the location list. -function! go#list#Parse(listtype, items) +function! go#list#Parse(listtype, items) abort let l:listtype = go#list#Type(a:listtype) if l:listtype == "locationlist" lgetexpr a:items @@ -94,7 +101,7 @@ function! go#list#Parse(listtype, items) endfunction " JumpToFirst jumps to the first item in the location list -function! go#list#JumpToFirst(listtype) +function! go#list#JumpToFirst(listtype) abort let l:listtype = go#list#Type(a:listtype) if l:listtype == "locationlist" ll 1 @@ -104,7 +111,7 @@ function! go#list#JumpToFirst(listtype) endfunction " Clean cleans the location list -function! go#list#Clean(listtype) +function! go#list#Clean(listtype) abort let l:listtype = go#list#Type(a:listtype) if l:listtype == "locationlist" lex [] @@ -113,7 +120,7 @@ function! go#list#Clean(listtype) endif endfunction -function! go#list#Type(listtype) +function! go#list#Type(listtype) abort if g:go_list_type == "locationlist" return "locationlist" elseif g:go_list_type == "quickfix" diff --git a/sources_non_forked/vim-go/autoload/go/package.vim b/sources_non_forked/vim-go/autoload/go/package.vim index e6f194ae..b12c7b71 100644 --- a/sources_non_forked/vim-go/autoload/go/package.vim +++ b/sources_non_forked/vim-go/autoload/go/package.vim @@ -28,7 +28,7 @@ if len(s:goarch) == 0 endif endif -function! go#package#Paths() +function! go#package#Paths() abort let dirs = [] if !exists("s:goroot") @@ -54,7 +54,7 @@ function! go#package#Paths() return dirs endfunction -function! go#package#ImportPath(arg) +function! go#package#ImportPath(arg) abort let path = fnamemodify(resolve(a:arg), ':p') let dirs = go#package#Paths() @@ -77,7 +77,7 @@ function! go#package#ImportPath(arg) endif endfunction -function! go#package#FromPath(arg) +function! go#package#FromPath(arg) abort let path = fnamemodify(resolve(a:arg), ':p') let dirs = go#package#Paths() @@ -99,7 +99,7 @@ function! go#package#FromPath(arg) endif endfunction -function! go#package#CompleteMembers(package, member) +function! go#package#CompleteMembers(package, member) abort silent! let content = go#util#System('godoc ' . a:package) if go#util#ShellError() || !len(content) return [] @@ -118,7 +118,7 @@ function! go#package#CompleteMembers(package, member) endtry endfunction -function! go#package#Complete(ArgLead, CmdLine, CursorPos) +function! go#package#Complete(ArgLead, CmdLine, CursorPos) abort let words = split(a:CmdLine, '\s\+', 1) " do not complete package members for these commands diff --git a/sources_non_forked/vim-go/autoload/go/path.vim b/sources_non_forked/vim-go/autoload/go/path.vim index 75c46616..a9b74e97 100644 --- a/sources_non_forked/vim-go/autoload/go/path.vim +++ b/sources_non_forked/vim-go/autoload/go/path.vim @@ -8,7 +8,7 @@ let s:initial_go_path = "" " echoes the current GOPATH, if an argument is passed it replaces the current " GOPATH with it. If two double quotes are passed (the empty string in go), " it'll clear the GOPATH and will restore to the initial GOPATH. -function! go#path#GoPath(...) +function! go#path#GoPath(...) abort " we have an argument, replace GOPATH if len(a:000) " clears the current manually set GOPATH and restores it to the @@ -35,7 +35,7 @@ endfunction " Default returns the default GOPATH. If there is a single GOPATH it returns " it. For multiple GOPATHS separated with a the OS specific separator, only " the first one is returned -function! go#path#Default() +function! go#path#Default() abort let go_paths = split($GOPATH, go#util#PathListSep()) if len(go_paths) == 1 @@ -47,7 +47,7 @@ endfunction " HasPath checks whether the given path exists in GOPATH environment variable " or not -function! go#path#HasPath(path) +function! go#path#HasPath(path) abort let go_paths = split($GOPATH, go#util#PathListSep()) let last_char = strlen(a:path) - 1 @@ -69,7 +69,7 @@ endfunction " Godeps, GB, it will modify the GOPATH so those directories take precedence " over the current GOPATH. It also detects diretories whose are outside " GOPATH. -function! go#path#Detect() +function! go#path#Detect() abort let gopath = $GOPATH " don't lookup for godeps if autodetect is disabled. @@ -115,7 +115,7 @@ endfunction " BinPath returns the binary path of installed go tools. -function! go#path#BinPath() +function! go#path#BinPath() abort let bin_path = "" " check if our global custom path is set, if not check if $GOBIN is set so @@ -135,7 +135,7 @@ endfunction " CheckBinPath checks whether the given binary exists or not and returns the " path of the binary. It returns an empty string doesn't exists. -function! go#path#CheckBinPath(binpath) +function! go#path#CheckBinPath(binpath) abort " remove whitespaces if user applied something like 'goimports ' let binpath = substitute(a:binpath, '^\s*\(.\{-}\)\s*$', '\1', '') " save off original path @@ -161,7 +161,7 @@ function! go#path#CheckBinPath(binpath) " just get the basename let basename = fnamemodify(binpath, ":t") if !executable(basename) - echo "vim-go: could not find '" . basename . "'. Run :GoInstallBinaries to fix it." + echom "vim-go: could not find '" . basename . "'. Run :GoInstallBinaries to fix it." " restore back! let $PATH = old_path return "" diff --git a/sources_non_forked/vim-go/autoload/go/play.vim b/sources_non_forked/vim-go/autoload/go/play.vim index 44cf3eca..ac5bba42 100644 --- a/sources_non_forked/vim-go/autoload/go/play.vim +++ b/sources_non_forked/vim-go/autoload/go/play.vim @@ -3,7 +3,7 @@ if !exists("g:go_play_open_browser") endif -function! go#play#Share(count, line1, line2) +function! go#play#Share(count, line1, line2) abort if !executable('curl') echohl ErrorMsg | echomsg "vim-go: require 'curl' command" | echohl None return @@ -42,7 +42,7 @@ function! go#play#Share(count, line1, line2) endfunction -function! s:get_visual_content() +function! s:get_visual_content() abort let save_regcont = @" let save_regtype = getregtype('"') silent! normal! gvy @@ -55,7 +55,7 @@ endfunction " http://stackoverflow.com/questions/1533565/how-to-get-visually-selected-text-in-vimscript " another function that returns the content of visual selection, it's not used " but might be useful in the future -function! s:get_visual_selection() +function! s:get_visual_selection() abort let [lnum1, col1] = getpos("'<")[1:2] let [lnum2, col2] = getpos("'>")[1:2] @@ -72,7 +72,7 @@ endfunction " following two functions are from: https://github.com/mattn/gist-vim " thanks @mattn -function! s:get_browser_command() +function! s:get_browser_command() abort let go_play_browser_command = get(g:, 'go_play_browser_command', '') if go_play_browser_command == '' if has('win32') || has('win64') diff --git a/sources_non_forked/vim-go/autoload/go/rename.vim b/sources_non_forked/vim-go/autoload/go/rename.vim index d65256c5..df8047e1 100644 --- a/sources_non_forked/vim-go/autoload/go/rename.vim +++ b/sources_non_forked/vim-go/autoload/go/rename.vim @@ -6,22 +6,22 @@ if !exists("g:go_gorename_prefill") let g:go_gorename_prefill = 1 endif -function! go#rename#Rename(bang, ...) - let to = "" +function! go#rename#Rename(bang, ...) abort + let to_identifier = "" if a:0 == 0 let from = expand("") let ask = printf("vim-go: rename '%s' to: ", from) if g:go_gorename_prefill - let to = input(ask, from) + let to_identifier = input(ask, from) else - let to = input(ask) + let to_identifier = input(ask) endif redraw! - if empty(to) + if empty(to_identifier) return endif else - let to = a:1 + let to_identifier = a:1 endif "return with a warning if the bin doesn't exist @@ -32,10 +32,79 @@ function! go#rename#Rename(bang, ...) let fname = expand('%:p') let pos = go#util#OffsetCursor() - let cmd = printf('%s -offset %s -to %s', shellescape(bin_path), shellescape(printf('%s:#%d', fname, pos)), shellescape(to)) + let offset = printf('%s:#%d', fname, pos) - let out = go#tool#ExecuteInDir(cmd) + " no need to escape for job call + let bin_path = go#util#has_job() ? bin_path : shellescape(bin_path) + let offset = go#util#has_job() ? offset : shellescape(offset) + let to_identifier = go#util#has_job() ? to_identifier : shellescape(to_identifier) + let cmd = [bin_path, "-offset", offset, "-to", to_identifier] + + if go#util#has_job() + call go#util#EchoProgress(printf("renaming to '%s' ...", to_identifier)) + call s:rename_job({ + \ 'cmd': cmd, + \ 'bang': a:bang, + \}) + return + endif + + let command = join(cmd, " ") + let out = go#tool#ExecuteInDir(command) + + let splitted = split(out, '\n') + call s:parse_errors(go#util#ShellError(), a:bang, splitted) +endfunction + +function s:rename_job(args) + let messages = [] + function! s:callback(chan, msg) closure + call add(messages, a:msg) + endfunction + + let status_dir = expand('%:p:h') + + function! s:close_cb(chan) closure + let l:job = ch_getjob(a:chan) + let l:info = job_info(l:job) + + let status = { + \ 'desc': 'last status', + \ 'type': "gorename", + \ 'state': "finished", + \ } + + if l:info.exitval + let status.state = "failed" + endif + + call go#statusline#Update(status_dir, status) + + call s:parse_errors(l:info.exitval, a:args.bang, messages) + endfunction + + let start_options = { + \ 'callback': function("s:callback"), + \ 'close_cb': function("s:close_cb"), + \ } + + " modify GOPATH if needed + let old_gopath = $GOPATH + let $GOPATH = go#path#Detect() + + call go#statusline#Update(status_dir, { + \ 'desc': "current status", + \ 'type': "gorename", + \ 'state': "started", + \}) + + call job_start(a:args.cmd, start_options) + + let $GOPATH = old_gopath +endfunction + +function s:parse_errors(exit_val, bang, out) " reload all files to reflect the new changes. We explicitly call " checktime to trigger a reload of all files. See " http://www.mail-archive.com/vim@vim.org/msg05900.html for more info @@ -45,28 +114,28 @@ function! go#rename#Rename(bang, ...) silent! checktime let &autoread = current_autoread - " strip out newline on the end that gorename puts. If we don't remove, it - " will trigger the 'Hit ENTER to continue' prompt - let clean = split(out, '\n') - let l:listtype = "quickfix" - if go#util#ShellError() != 0 - let errors = go#tool#ParseErrors(split(out, '\n')) - call go#list#Populate(l:listtype, errors) + if a:exit_val != 0 + call go#util#EchoError("FAILED") + let errors = go#tool#ParseErrors(a:out) + call go#list#Populate(l:listtype, errors, 'Rename') call go#list#Window(l:listtype, len(errors)) if !empty(errors) && !a:bang call go#list#JumpToFirst(l:listtype) elseif empty(errors) " failed to parse errors, output the original content - call go#util#EchoError(out) + call go#util#EchoError(join(a:out, "")) endif + return - else - call go#list#Clean(l:listtype) - call go#list#Window(l:listtype) - redraw | echon "vim-go: " | echohl Function | echon clean[0] | echohl None endif + " strip out newline on the end that gorename puts. If we don't remove, it + " will trigger the 'Hit ENTER to continue' prompt + call go#list#Clean(l:listtype) + call go#list#Window(l:listtype) + call go#util#EchoSuccess(a:out[0]) + " refresh the buffer so we can see the new content " TODO(arslan): also find all other buffers and refresh them too. For this " we need a way to get the list of changes from gorename upon an success diff --git a/sources_non_forked/vim-go/autoload/go/statusline.vim b/sources_non_forked/vim-go/autoload/go/statusline.vim new file mode 100644 index 00000000..c832797c --- /dev/null +++ b/sources_non_forked/vim-go/autoload/go/statusline.vim @@ -0,0 +1,112 @@ +" Statusline +"""""""""""""""""""""""""""""""" + +" s:statuses is a global reference to all statuses. It stores the statuses per +" import paths (map[string]status), where each status is unique per its +" type. Current status dict is in form: +" { +" 'desc' : 'Job description', +" 'state' : 'Job state, such as success, failure, etc..', +" 'type' : 'Job type, such as build, test, etc..' +" 'created_at' : 'Time it was created as seconds since 1st Jan 1970' +" } +let s:statuses = {} + +" timer_id for cleaner +let s:timer_id = 0 + +" last_status stores the last generated text per status +let s:last_status = "" + +" Show returns the current status of the job for 20 seconds (configurable). It +" displays it in form of 'desc: [type|state]' if there is any state available, +" if not it returns an empty string. This function should be plugged directly +" into the statusline. +function! go#statusline#Show() abort + " lazy initialiation of the cleaner + if !s:timer_id + " clean every 60 seconds all statuses + let interval = get(g:, 'go_statusline_duration', 60000) + let s:timer_id = timer_start(interval, function('go#statusline#Clear'), {'repeat': -1}) + endif + + " nothing to show + if empty(s:statuses) + return '' + endif + + let status_dir = expand('%:p:h') + + if !has_key(s:statuses, status_dir) + return '' + endif + + let status = s:statuses[status_dir] + if !has_key(status, 'desc') || !has_key(status, 'state') || !has_key(status, 'type') + return '' + endif + + let status_text = printf("[%s|%s]", status.type, status.state) + if empty(status_text) + return '' + endif + + " only update highlight if status has changed. + if status_text != s:last_status + if status.state =~ "success" || status.state =~ "finished" + hi goStatusLineColor cterm=bold ctermbg=76 ctermfg=22 + elseif status.state =~ "started" || status.state =~ "analysing" + hi goStatusLineColor cterm=bold ctermbg=208 ctermfg=88 + elseif status.state =~ "failed" + hi goStatusLineColor cterm=bold ctermbg=196 ctermfg=52 + endif + endif + + let s:last_status = status_text + return status_text +endfunction + +" Update updates (adds) the statusline for the given status_dir with the +" given status dict. It overrides any previously set status. +function! go#statusline#Update(status_dir, status) abort + let a:status.created_at = reltime() + let s:statuses[a:status_dir] = a:status + + " force to update the statusline, otherwise the user needs to move the + " cursor + exe 'let &ro = &ro' + + " before we stop the timer, check if we have any previous jobs to be cleaned + " up. Otherwise every job will reset the timer when this function is called + " and thus old jobs will never be cleaned + call go#statusline#Clear(0) + + " also reset the timer, so the user has time to see it in the statusline. + " Setting the timer_id to 0 will trigger a new cleaner routine. + call timer_stop(s:timer_id) + let s:timer_id = 0 +endfunction + +" Clear clears all currently stored statusline data. The timer_id argument is +" just a placeholder so we can pass it to a timer_start() function if needed. +function! go#statusline#Clear(timer_id) abort + for [status_dir, status] in items(s:statuses) + let elapsed_time = reltimestr(reltime(status.created_at)) + " strip whitespace + let elapsed_time = substitute(elapsed_time, '^\s*\(.\{-}\)\s*$', '\1', '') + + if str2nr(elapsed_time) > 10 + call remove(s:statuses, status_dir) + endif + endfor + + if len(s:statuses) == 0 + let s:statuses = {} + endif + + " force to update the statusline, otherwise the user needs to move the + " cursor + exe 'let &ro = &ro' +endfunction + +" vim: sw=2 ts=2 et diff --git a/sources_non_forked/vim-go/autoload/go/template.vim b/sources_non_forked/vim-go/autoload/go/template.vim index 4b9e2713..0a92988f 100644 --- a/sources_non_forked/vim-go/autoload/go/template.vim +++ b/sources_non_forked/vim-go/autoload/go/template.vim @@ -1,6 +1,7 @@ let s:current_file = expand("") -function! go#template#create() +function! go#template#create() abort + let l:go_template_use_pkg = get(g:, 'go_template_use_pkg', 0) let l:root_dir = fnamemodify(s:current_file, ':h:h:h') let cd = exists('*haslocaldir') && haslocaldir() ? 'lcd ' : 'cd ' @@ -10,12 +11,19 @@ function! go#template#create() let l:package_name = go#tool#PackageName() " if we can't figure out any package name(no Go files or non Go package - " files) from the directory create the template - if l:package_name == -1 + " files) from the directory create the template or use the cwd + " as the name + if l:package_name == -1 && l:go_template_use_pkg != 1 let l:template_file = get(g:, 'go_template_file', "hello_world.go") let l:template_path = go#util#Join(l:root_dir, "templates", l:template_file) exe '0r ' . fnameescape(l:template_path) $delete _ + elseif l:package_name == -1 && l:go_template_use_pkg == 1 + " cwd is now the dir of the package + let l:path = fnamemodify(getcwd(), ':t') + let l:content = printf("package %s", l:path) + call append(0, l:content) + $delete _ else let l:content = printf("package %s", l:package_name) call append(0, l:content) @@ -28,7 +36,7 @@ function! go#template#create() execute cd . fnameescape(dir) endfunction -function! go#template#ToggleAutoCreate() +function! go#template#ToggleAutoCreate() abort if get(g:, "go_template_autocreate", 1) let g:go_template_autocreate = 0 call go#util#EchoProgress("auto template create disabled") diff --git a/sources_non_forked/vim-go/autoload/go/term.vim b/sources_non_forked/vim-go/autoload/go/term.vim index 08947fa9..9404ca9e 100644 --- a/sources_non_forked/vim-go/autoload/go/term.vim +++ b/sources_non_forked/vim-go/autoload/go/term.vim @@ -7,12 +7,12 @@ let s:jobs = {} " new creates a new terminal with the given command. Mode is set based on the " global variable g:go_term_mode, which is by default set to :vsplit -function! go#term#new(bang, cmd) +function! go#term#new(bang, cmd) abort return go#term#newmode(a:bang, a:cmd, g:go_term_mode) endfunction " new creates a new terminal with the given command and window mode. -function! go#term#newmode(bang, cmd, mode) +function! go#term#newmode(bang, cmd, mode) abort let mode = a:mode if empty(mode) let mode = g:go_term_mode @@ -36,7 +36,7 @@ function! go#term#newmode(bang, cmd, mode) setlocal noswapfile setlocal nobuflisted - let job = { + let job = { \ 'stderr' : [], \ 'stdout' : [], \ 'bang' : a:bang, @@ -53,6 +53,7 @@ function! go#term#newmode(bang, cmd, mode) let $GOPATH = old_gopath let job.id = id + let job.cmd = a:cmd startinsert " resize new term if needed. @@ -74,7 +75,7 @@ function! go#term#newmode(bang, cmd, mode) return id endfunction -function! s:on_stdout(job_id, data) +function! s:on_stdout(job_id, data, event) dict abort if !has_key(s:jobs, a:job_id) return endif @@ -83,7 +84,7 @@ function! s:on_stdout(job_id, data) call extend(job.stdout, a:data) endfunction -function! s:on_stderr(job_id, data) +function! s:on_stderr(job_id, data, event) dict abort if !has_key(s:jobs, a:job_id) return endif @@ -92,7 +93,7 @@ function! s:on_stderr(job_id, data) call extend(job.stderr, a:data) endfunction -function! s:on_exit(job_id, exit_status) +function! s:on_exit(job_id, exit_status, event) dict abort if !has_key(s:jobs, a:job_id) return endif @@ -113,9 +114,9 @@ function! s:on_exit(job_id, exit_status) if !empty(errors) " close terminal we don't need it anymore - close + close - call go#list#Populate(l:listtype, errors) + call go#list#Populate(l:listtype, errors, job.cmd) call go#list#Window(l:listtype, len(errors)) if !self.bang call go#list#JumpToFirst(l:listtype) diff --git a/sources_non_forked/vim-go/autoload/go/textobj.vim b/sources_non_forked/vim-go/autoload/go/textobj.vim index 53dfacd4..be0c7718 100644 --- a/sources_non_forked/vim-go/autoload/go/textobj.vim +++ b/sources_non_forked/vim-go/autoload/go/textobj.vim @@ -13,7 +13,7 @@ endif " < > " t for tag -function! go#textobj#Function(mode) +function! go#textobj#Function(mode) abort let offset = go#util#OffsetCursor() let fname = shellescape(expand("%:p")) @@ -84,7 +84,7 @@ function! go#textobj#Function(mode) call cursor(info.rbrace.line-1, 1) endfunction -function! go#textobj#FunctionJump(mode, direction) +function! go#textobj#FunctionJump(mode, direction) abort " get count of the motion. This should be done before all the normal " expressions below as those reset this value(because they have zero " count!). We abstract -1 because the index starts from 0 in motion. diff --git a/sources_non_forked/vim-go/autoload/go/tool.vim b/sources_non_forked/vim-go/autoload/go/tool.vim index fe7f2575..7b7e1af2 100644 --- a/sources_non_forked/vim-go/autoload/go/tool.vim +++ b/sources_non_forked/vim-go/autoload/go/tool.vim @@ -1,4 +1,4 @@ -function! go#tool#Files() +function! go#tool#Files() abort if go#util#IsWin() let format = '{{range $f := .GoFiles}}{{$.Dir}}\{{$f}}{{printf \"\n\"}}{{end}}{{range $f := .CgoFiles}}{{$.Dir}}\{{$f}}{{printf \"\n\"}}{{end}}' else @@ -9,7 +9,7 @@ function! go#tool#Files() return split(out, '\n') endfunction -function! go#tool#Deps() +function! go#tool#Deps() abort if go#util#IsWin() let format = '{{range $f := .Deps}}{{$f}}{{printf \"\n\"}}{{end}}' else @@ -20,7 +20,7 @@ function! go#tool#Deps() return split(out, '\n') endfunction -function! go#tool#Imports() +function! go#tool#Imports() abort let imports = {} if go#util#IsWin() let format = '{{range $f := .Imports}}{{$f}}{{printf \"\n\"}}{{end}}' @@ -43,7 +43,18 @@ function! go#tool#Imports() return imports endfunction -function! go#tool#PackageName() +function! go#tool#Info(auto) abort + let l:mode = get(g:, 'go_info_mode', 'gocode') + if l:mode == 'gocode' + call go#complete#Info(a:auto) + elseif l:mode == 'guru' + call go#guru#DescribeInfo() + else + call go#util#EchoError('go_info_mode value: '. l:mode .' is not valid. Valid values are: [gocode, guru]') + endif +endfunction + +function! go#tool#PackageName() abort let command = "go list -f \"{{.Name}}\"" let out = go#tool#ExecuteInDir(command) if go#util#ShellError() != 0 @@ -53,7 +64,7 @@ function! go#tool#PackageName() return split(out, '\n')[0] endfunction -function! go#tool#ParseErrors(lines) +function! go#tool#ParseErrors(lines) abort let errors = [] for line in a:lines @@ -85,7 +96,7 @@ endfunction "FilterValids filters the given items with only items that have a valid "filename. Any non valid filename is filtered out. -function! go#tool#FilterValids(items) +function! go#tool#FilterValids(items) abort " Remove any nonvalid filename from the location list to avoid opening an " empty buffer. See https://github.com/fatih/vim-go/issues/287 for " details. @@ -141,7 +152,7 @@ endfunction " Exists checks whether the given importpath exists or not. It returns 0 if " the importpath exists under GOPATH. -function! go#tool#Exists(importpath) +function! go#tool#Exists(importpath) abort let command = "go list ". a:importpath let out = go#tool#ExecuteInDir(command) @@ -155,7 +166,7 @@ endfunction " following two functions are from: https://github.com/mattn/gist-vim " thanks @mattn -function! s:get_browser_command() +function! s:get_browser_command() abort let go_play_browser_command = get(g:, 'go_play_browser_command', '') if go_play_browser_command == '' if go#util#IsWin() @@ -173,7 +184,7 @@ function! s:get_browser_command() return go_play_browser_command endfunction -function! go#tool#OpenBrowser(url) +function! go#tool#OpenBrowser(url) abort let cmd = s:get_browser_command() if len(cmd) == 0 redraw diff --git a/sources_non_forked/vim-go/autoload/go/ui.vim b/sources_non_forked/vim-go/autoload/go/ui.vim index ad8b517b..3f612576 100644 --- a/sources_non_forked/vim-go/autoload/go/ui.vim +++ b/sources_non_forked/vim-go/autoload/go/ui.vim @@ -1,7 +1,7 @@ let s:buf_nr = -1 "OpenWindow opens a new scratch window and put's the content into the window -function! go#ui#OpenWindow(title, content, filetype) +function! go#ui#OpenWindow(title, content, filetype) abort " Ensure there's only one return window in this session/tabpage call go#util#Windo("unlet! w:vim_go_return_window") " Mark the window we're leaving as such @@ -54,7 +54,7 @@ function! go#ui#OpenWindow(title, content, filetype) echon endfunction -function! go#ui#GetReturnWindow() +function! go#ui#GetReturnWindow() abort for l:wn in range(1, winnr("$")) if !empty(getwinvar(l:wn, "vim_go_return_window")) return l:wn @@ -63,7 +63,7 @@ function! go#ui#GetReturnWindow() endfunction " CloseWindow closes the current window -function! go#ui#CloseWindow() +function! go#ui#CloseWindow() abort " Close any window associated with the ui buffer, if it's there if bufexists(s:buf_nr) let ui_window_number = bufwinnr(s:buf_nr) @@ -82,7 +82,7 @@ endfunction " OpenDefinition parses the current line and jumps to it by openening a new " tab -function! go#ui#OpenDefinition(filter) +function! go#ui#OpenDefinition(filter) abort let curline = getline('.') " don't touch our first line or any blank line diff --git a/sources_non_forked/vim-go/autoload/go/util.vim b/sources_non_forked/vim-go/autoload/go/util.vim index 8792e230..aaf7273d 100644 --- a/sources_non_forked/vim-go/autoload/go/util.vim +++ b/sources_non_forked/vim-go/autoload/go/util.vim @@ -1,5 +1,5 @@ " PathSep returns the appropriate OS specific path separator. -function! go#util#PathSep() +function! go#util#PathSep() abort if go#util#IsWin() return '\' endif @@ -7,7 +7,7 @@ function! go#util#PathSep() endfunction " PathListSep returns the appropriate OS specific path list separator. -function! go#util#PathListSep() +function! go#util#PathListSep() abort if go#util#IsWin() return ";" endif @@ -15,7 +15,7 @@ function! go#util#PathListSep() endfunction " LineEnding returns the correct line ending, based on the current fileformat -function! go#util#LineEnding() +function! go#util#LineEnding() abort if &fileformat == 'dos' return "\r\n" elseif &fileformat == 'mac' @@ -27,12 +27,12 @@ endfunction " Join joins any number of path elements into a single path, adding a " Separator if necessary and returns the result -function! go#util#Join(...) +function! go#util#Join(...) abort return join(a:000, go#util#PathSep()) endfunction " IsWin returns 1 if current OS is Windows or 0 otherwise -function! go#util#IsWin() +function! go#util#IsWin() abort let win = ['win16', 'win32', 'win64', 'win95'] for w in win if (has(w)) @@ -43,12 +43,18 @@ function! go#util#IsWin() return 0 endfunction +function! go#util#has_job() abort + " job was introduced in 7.4.xxx however there are multiple bug fixes and one + " of the latest is 8.0.0087 which is required for a stable async API. + return has('job') && has("patch-8.0.0087") +endfunction + let s:env_cache = {} " env returns the go environment variable for the given key. Where key can be " GOARCH, GOOS, GOROOT, etc... It caches the result and returns the cached " version. -function! go#util#env(key) +function! go#util#env(key) abort let l:key = tolower(a:key) if has_key(s:env_cache, l:key) return s:env_cache[l:key] @@ -68,81 +74,49 @@ function! go#util#env(key) return l:var endfunction -function! go#util#goarch() +function! go#util#goarch() abort return substitute(go#util#System('go env GOARCH'), '\n', '', 'g') endfunction -function! go#util#goos() +function! go#util#goos() abort return substitute(go#util#System('go env GOOS'), '\n', '', 'g') endfunction -function! go#util#goroot() +function! go#util#goroot() abort return substitute(go#util#System('go env GOROOT'), '\n', '', 'g') endfunction -function! go#util#gopath() +function! go#util#gopath() abort return substitute(go#util#System('go env GOPATH'), '\n', '', 'g') endfunction -function! go#util#osarch() +function! go#util#osarch() abort return go#util#goos() . '_' . go#util#goarch() endfunction -"Check if has vimproc -function! s:has_vimproc() - if !exists('g:go#use_vimproc') - if go#util#IsWin() - try - call vimproc#version() - let exists_vimproc = 1 - catch - let exists_vimproc = 0 - endtry - else - let exists_vimproc = 0 - endif - - let g:go#use_vimproc = exists_vimproc - endif - - return g:go#use_vimproc -endfunction - -if s:has_vimproc() - let s:vim_system = get(g:, 'gocomplete#system_function', 'vimproc#system2') - let s:vim_shell_error = get(g:, 'gocomplete#shell_error_function', 'vimproc#get_last_status') -else - let s:vim_system = get(g:, 'gocomplete#system_function', 'system') - let s:vim_shell_error = '' -endif - " System runs a shell command. It will reset the shell to /bin/sh for Unix-like " systems if it is executable. -function! go#util#System(str, ...) +function! go#util#System(str, ...) abort let l:shell = &shell if !go#util#IsWin() && executable('/bin/sh') let &shell = '/bin/sh' endif try - let l:output = call(s:vim_system, [a:str] + a:000) + let l:output = call('system', [a:str] + a:000) return l:output finally let &shell = l:shell endtry endfunction -function! go#util#ShellError() - if empty(s:vim_shell_error) - return v:shell_error - endif - return call(s:vim_shell_error, []) +function! go#util#ShellError() abort + return v:shell_error endfunction - " StripPath strips the path's last character if it's a path separator. " example: '/foo/bar/' -> '/foo/bar' -function! go#util#StripPathSep(path) +function! go#util#StripPathSep(path) abort let last_char = strlen(a:path) - 1 if a:path[last_char] == go#util#PathSep() return strpart(a:path, 0, last_char) @@ -153,13 +127,13 @@ endfunction " StripTrailingSlash strips the trailing slash from the given path list. " example: ['/foo/bar/'] -> ['/foo/bar'] -function! go#util#StripTrailingSlash(paths) +function! go#util#StripTrailingSlash(paths) abort return map(copy(a:paths), 'go#util#StripPathSep(v:val)') endfunction " Shelljoin returns a shell-safe string representation of arglist. The " {special} argument of shellescape() may optionally be passed. -function! go#util#Shelljoin(arglist, ...) +function! go#util#Shelljoin(arglist, ...) abort try let ssl_save = &shellslash set noshellslash @@ -174,9 +148,6 @@ function! go#util#Shelljoin(arglist, ...) endfunction fu! go#util#Shellescape(arg) - if s:has_vimproc() - return vimproc#shellescape(a:arg) - endif try let ssl_save = &shellslash set noshellslash @@ -188,7 +159,7 @@ endf " Shelllist returns a shell-safe representation of the items in the given " arglist. The {special} argument of shellescape() may optionally be passed. -function! go#util#Shelllist(arglist, ...) +function! go#util#Shelllist(arglist, ...) abort try let ssl_save = &shellslash set noshellslash @@ -202,7 +173,7 @@ function! go#util#Shelllist(arglist, ...) endfunction " Returns the byte offset for line and column -function! go#util#Offset(line, col) +function! go#util#Offset(line, col) abort if &encoding != 'utf-8' let sep = go#util#LineEnding() let buf = a:line == 1 ? '' : (join(getline(1, a:line-1), sep) . sep) @@ -213,13 +184,13 @@ function! go#util#Offset(line, col) endfunction " " Returns the byte offset for the cursor -function! go#util#OffsetCursor() +function! go#util#OffsetCursor() abort return go#util#Offset(line('.'), col('.')) endfunction " Windo is like the built-in :windo, only it returns to the window the command " was issued from -function! go#util#Windo(command) +function! go#util#Windo(command) abort let s:currentWindow = winnr() try execute "windo " . a:command @@ -231,7 +202,7 @@ endfunction " snippetcase converts the given word to given preferred snippet setting type " case. -function! go#util#snippetcase(word) +function! go#util#snippetcase(word) abort let l:snippet_case = get(g:, 'go_snippet_case_type', "snakecase") if l:snippet_case == "snakecase" return go#util#snakecase(a:word) @@ -244,7 +215,7 @@ endfunction " snakecase converts a string to snake case. i.e: FooBar -> foo_bar " Copied from tpope/vim-abolish -function! go#util#snakecase(word) +function! go#util#snakecase(word) abort let word = substitute(a:word,'::','/','g') let word = substitute(word,'\(\u\+\)\(\u\l\)','\1_\2','g') let word = substitute(word,'\(\l\|\d\)\(\u\)','\1_\2','g') @@ -255,7 +226,7 @@ endfunction " camelcase converts a string to camel case. i.e: FooBar -> fooBar " Copied from tpope/vim-abolish -function! go#util#camelcase(word) +function! go#util#camelcase(word) abort let word = substitute(a:word, '-', '_', 'g') if word !~# '_' && word =~# '\l' return substitute(word,'^.','\l&','') @@ -264,7 +235,7 @@ function! go#util#camelcase(word) endif endfunction -function! go#util#AddTags(line1, line2, ...) +function! go#util#AddTags(line1, line2, ...) abort " default is json let l:keys = ["json"] if a:0 @@ -311,21 +282,27 @@ endfunction " TODO(arslan): I couldn't parameterize the highlight types. Check if we can " simplify the following functions - +" +" NOTE(arslan): echon doesn't work well with redraw, thus echo doesn't print +" even though we order it. However echom seems to be work fine. function! go#util#EchoSuccess(msg) - redraw | echon "vim-go: " | echohl Function | echon a:msg | echohl None + redraw | echohl Function | echom "vim-go: " . a:msg | echohl None endfunction function! go#util#EchoError(msg) - redraw | echon "vim-go: " | echohl ErrorMsg | echon a:msg | echohl None + redraw | echohl ErrorMsg | echom "vim-go: " . a:msg | echohl None endfunction function! go#util#EchoWarning(msg) - redraw | echon "vim-go: " | echohl WarningMsg | echon a:msg | echohl None + redraw | echohl WarningMsg | echom "vim-go: " . a:msg | echohl None endfunction function! go#util#EchoProgress(msg) - redraw | echon "vim-go: " | echohl Identifier | echon a:msg | echohl None + redraw | echohl Identifier | echom "vim-go: " . a:msg | echohl None +endfunction + +function! go#util#EchoInfo(msg) + redraw | echohl Debug | echom "vim-go: " . a:msg | echohl None endfunction " vim: sw=2 ts=2 et diff --git a/sources_non_forked/vim-go/doc/vim-go.txt b/sources_non_forked/vim-go/doc/vim-go.txt index 75189496..87c59118 100644 --- a/sources_non_forked/vim-go/doc/vim-go.txt +++ b/sources_non_forked/vim-go/doc/vim-go.txt @@ -327,7 +327,9 @@ CTRL-t :GoInfo Show type information about the identifier under the cursor. For example putting it above a function call is going to show the full function - signature. It uses gocode to get the type informations. + signature. By default it uses `gocode` to get the type informations. To + change the underlying tool from `gocode` to another tool, see + |g:go_info_mode|. *:GoInstall* @@ -786,6 +788,10 @@ annotation. Calls `goimports` for the current package + *(go-lint)* + +Calls `golint` for the current package + *(go-vet)* Calls `go vet` for the current package @@ -946,13 +952,17 @@ vim-go also defines the following text motion objects: ============================================================================== FUNCTIONS *go-functions* - *go#jobcontrol#Statusline()* + *go#statusline#Show()* Shows the status of a job running asynchronously. Can be used to plug into the statusline. It works to show the status per package instead of per file. Assume you have three files open, all belonging to the same package, if -the package build (`:GoBuild`) is successful, all statusline's will be empty -(means SUCCESS), if you it fails all file's statusline will show FAILED. +the package build (`:GoBuild`) is successful, all statusline's will show +`success`, if you it fails all file's statusline will show `failed`. + +To avoid always showing old status information, the status information is +cleaned for each package after `60` seconds. This can be changed with the +|g:go_statusline_duration| setting. *go#complete#GetInfo()* @@ -989,17 +999,35 @@ with |:GoPlay|. By default it's enabled. > Use this option to show the type info (|:GoInfo|) for the word under the cursor automatically. Whenever the cursor changes the type info will be -updated. By default it's disabled. +updated. By default it's disabled. The delay can be configured with the +'g:go_updatetime' setting. > let g:go_auto_type_info = 0 < + + *'g:go_info_mode'* + +Use this option to define the command to be used for |:GoInfo|. By default +`gocode` is being used as it's the fastest option. But one might also use +`guru` as it's covers more cases and is more accurate. Current valid options +are: `[gocode, guru]` > + + let g:go_info_mode = 'gocode' +< *'g:go_auto_sameids'* Use this option to highlight all uses of the identifier under the cursor (:GoSameIds) automatically. By default it's disabled. The delay can be -configured with the 'updatetime' setting. +configured with the 'g:go_updatetime' setting. > let g:go_auto_sameids = 0 +< + *'g:go_updatetime'* + +Use this option to configure the a custom 'updatetime' for Go source files. If +set to 0, no custom time will be configured. By default it's set to 800ms. +> + let g:go_updatetime = 800 < *'g:go_jump_to_error'* @@ -1078,14 +1106,6 @@ Use this option to jump to an existing buffer for the split, vsplit and tab mappings of |:GoDef|. By default it's disabled. > let g:go_def_reuse_buffer = 0 -< - *'g:go_dispatch_enabled'* - -Use this option to enable/disable the use of Dispatch to execute the `:GoRun`, -`:GoBuild` and `:GoGenerate` commands. More information about Dispatch is -available at https://github.com/tpope/vim-dispatch. Default is disabled. > - - let g:go_dispatch_enabled = 0 < *'g:go_doc_command'* @@ -1332,9 +1352,9 @@ appropriate kind of list for the command that was called. Supported values are < *'g:go_asmfmt_autosave'* -Use this option to auto |:AsmFmt| on save. By default it's enabled. > +Use this option to auto |:AsmFmt| on save. By default it's disabled. > - let g:go_asmfmt_autosave = 1 + let g:go_asmfmt_autosave = 0 < *'g:go_term_mode'* @@ -1399,9 +1419,11 @@ to an autocompletion proposals. By default it is enabled. *'g:go_gocode_unimported_packages'* Specifies whether `gocode` should include suggestions from unimported packages. -By default it is enabled +By default it is disabled. > - let g:go_gocode_unimported_packages = 1 + let g:go_gocode_unimported_packages = 0 +< + *'g:go_gocode_socket_type'* Specifies whether `gocode` should use a different socket type. By default @@ -1420,6 +1442,9 @@ If the new file is created in an already prepopulated package (with other Go files), in this case a Go code template with only the Go package declaration (which is automatically determined according to the current package) is added. +To always use the package name instead of the template, enable the +|`g:go_template_use_pkg`| setting. + By default it is enabled. > let g:go_template_autocreate = 1 @@ -1431,15 +1456,45 @@ is created. Checkout |'g:go_template_autocreate'| for more info. By default the `hello_world.go` file is used. > let g:go_template_file = "hello_world.go" +< + *'g:go_template_use_pkg'* + +Specifies that, rather than using a template, the package name is used if a new +Go file is created. Checkout |'g:go_template_autocreate'| for more info. By +default the template file specified by |'g:go_template_file'| is used. + +> + let g:go_template_use_pkg = 0 < *'g:go_decls_includes'* - Only useful if `ctrlp.vim` is installed. This sets which declarations to - show for |:GoDecls|. - It is a Comma delimited list Possible options are: {func,type}. - The default is: > +Only useful if `ctrlp.vim` is installed. This sets which declarations to show +for |:GoDecls|. It is a Comma delimited list Possible options are: +{func,type}. The default is: > let g:go_decls_includes = 'func,type' +< + *'g:go_echo_command_info'* + +Echoes information about various Go commands, such as `:GoBuild`, `:GoTest`, +`:GoCoverage`, etc... Useful to disable if you use the statusline integration, +i.e: |go#statusline#Show()|. By default it's enabled +> + let g:go_echo_command_info = 1 +< + *'g:go_echo_go_info'* + +Use this option to show the identifier information when completion is done. By +default it's enabled > + + let g:go_echo_go_info = 1 +< + *'g:go_statusline_duration'* + +Specifices the duration of statusline information being showed per package. By +default it's 60 seconds. Must be in milliseconds. +> + let g:go_statusline_duration = 60000 < ============================================================================== TROUBLESHOOTING *go-troubleshooting* diff --git a/sources_non_forked/vim-go/ftplugin/go.vim b/sources_non_forked/vim-go/ftplugin/go.vim index dfe068f4..de830f9c 100644 --- a/sources_non_forked/vim-go/ftplugin/go.vim +++ b/sources_non_forked/vim-go/ftplugin/go.vim @@ -57,7 +57,75 @@ if get(g:, "go_textobj_enabled", 1) endif if get(g:, "go_auto_type_info", 0) || get(g:, "go_auto_sameids", 0) - setlocal updatetime=800 + let &l:updatetime= get(g:, "go_updatetime", 800) endif +" NOTE(arslan): experimental, disabled by default, doesn't work well. No +" documentation as well. If anyone feels adventerous, enable the following and +" try to search for Go identifiers ;) +" +" if get(g:, "go_sameid_search_enabled", 0) +" autocmd FileType go nnoremap * :call Sameids_search(0) +" autocmd FileType go nnoremap # :call Sameids_search(1) +" autocmd FileType go nnoremap n :call Sameids_repeat(0) +" autocmd FileType go nnoremap N :call Sameids_repeat(1) +" autocmd FileType go cabbrev nohlsearch =Sameids_nohlsearch() +" endif + +" " mode 0: next 1: prev +" function! Sameids_repeat(mode) +" let matches = getmatches() +" if empty(matches) +" return +" endif +" let cur_offset = go#util#OffsetCursor() + +" " reverse list to make it easy to find the prev occurence +" if a:mode +" call reverse(matches) +" endif + +" for m in matches +" if !has_key(m, "group") +" return +" endif + +" if m.group != "goSameId" +" return +" endif + +" let offset = go#util#Offset(m.pos1[0], m.pos1[1]) + +" if a:mode && cur_offset > offset +" call cursor(m.pos1[0], m.pos1[1]) +" return +" elseif !a:mode && cur_offset < offset +" call cursor(m.pos1[0], m.pos1[1]) +" return +" endif +" endfor + +" " reached start/end, jump to the end/start +" let initial_match = matches[0] +" if !has_key(initial_match, "group") +" return +" endif + +" if initial_match.group != "goSameId" +" return +" endif + +" call cursor(initial_match.pos1[0], initial_match.pos1[1]) +" endfunction + +" function! Sameids_search(mode) +" call go#guru#SameIds() +" call Sameids_repeat(a:mode) +" endfunction + +" function! Sameids_nohlsearch() +" call go#guru#ClearSameIds() +" return "nohlsearch" +" endfunction + " vim: sw=2 ts=2 et diff --git a/sources_non_forked/vim-go/ftplugin/go/commands.vim b/sources_non_forked/vim-go/ftplugin/go/commands.vim index c54de24c..d8bff665 100644 --- a/sources_non_forked/vim-go/ftplugin/go/commands.vim +++ b/sources_non_forked/vim-go/ftplugin/go/commands.vim @@ -17,15 +17,15 @@ command! -nargs=? GoGuruTags call go#guru#Tags() command! -nargs=* -range GoAddTags call go#util#AddTags(, , ) -command! -range=% GoSameIds call go#guru#SameIds() +command! -range=0 GoSameIds call go#guru#SameIds() command! -range=0 GoSameIdsClear call go#guru#ClearSameIds() -command! -range=% GoSameIdsToggle call go#guru#ToggleSameIds() +command! -range=0 GoSameIdsToggle call go#guru#ToggleSameIds() command! -range=0 GoSameIdsAutoToggle call go#guru#AutoToogleSameIds() " -- tool command! -nargs=0 GoFiles echo go#tool#Files() command! -nargs=0 GoDeps echo go#tool#Deps() -command! -nargs=* GoInfo call go#complete#Info(0) +command! -nargs=* GoInfo call go#tool#Info(0) command! -nargs=0 GoAutoTypeInfoToggle call go#complete#ToggleAutoTypeInfo() " -- cmd diff --git a/sources_non_forked/vim-go/ftplugin/go/mappings.vim b/sources_non_forked/vim-go/ftplugin/go/mappings.vim index b798209d..e1bbe46e 100644 --- a/sources_non_forked/vim-go/ftplugin/go/mappings.vim +++ b/sources_non_forked/vim-go/ftplugin/go/mappings.vim @@ -31,7 +31,7 @@ nnoremap (go-coverage-browser) :call go#coverage#Browser(!g: nnoremap (go-files) :call go#tool#Files() nnoremap (go-deps) :call go#tool#Deps() -nnoremap (go-info) :call go#complete#Info(0) +nnoremap (go-info) :call go#tool#Info(0) nnoremap (go-import) :call go#import#SwitchImport(1, '', expand(''), '') nnoremap (go-imports) :call go#fmt#Format(1) @@ -43,9 +43,9 @@ nnoremap (go-callstack) :call go#guru#Callstack(-1) xnoremap (go-freevars) :call go#guru#Freevars(0) nnoremap (go-channelpeers) :call go#guru#ChannelPeers(-1) nnoremap (go-referrers) :call go#guru#Referrers(-1) -nnoremap (go-sameids) :call go#guru#SameIds(-1) +nnoremap (go-sameids) :call go#guru#SameIds() nnoremap (go-whicherrs) :call go#guru#Whicherrs(-1) -nnoremap (go-sameids-toggle) :call go#guru#ToggleSameIds(-1) +nnoremap (go-sameids-toggle) :call go#guru#ToggleSameIds() nnoremap (go-rename) :call go#rename#Rename(!g:go_jump_to_error) @@ -65,6 +65,7 @@ nnoremap (go-doc-split) :call go#doc#Open("new", "split") (go-doc-browser) :call go#doc#OpenBrowser() nnoremap (go-metalinter) :call go#lint#Gometa(0) +nnoremap (go-lint) :call go#lint#Golint() nnoremap (go-vet) :call go#lint#Vet(!g:go_jump_to_error) nnoremap (go-alternate-edit) :call go#alternate#Switch(0, "edit") diff --git a/sources_non_forked/vim-go/indent/gohtmltmpl.vim b/sources_non_forked/vim-go/indent/gohtmltmpl.vim index d95cbc24..864913df 100644 --- a/sources_non_forked/vim-go/indent/gohtmltmpl.vim +++ b/sources_non_forked/vim-go/indent/gohtmltmpl.vim @@ -30,13 +30,13 @@ function! GetGoHTMLTmplIndent(lnum) " If need to indent based on last line let last_line = getline(a:lnum-1) - if last_line =~ '^\s*{{\s*\%(if\|else\|range\|with\|define\|block\).*}}' + if last_line =~ '^\s*{{-\=\s*\%(if\|else\|range\|with\|define\|block\).*}}' let ind += sw endif " End of FuncMap block let current_line = getline(a:lnum) - if current_line =~ '^\s*{{\s*\%(else\|end\).*}}' + if current_line =~ '^\s*{{-\=\s*\%(else\|end\).*}}' let ind -= sw endif diff --git a/sources_non_forked/vim-go/plugin/go.vim b/sources_non_forked/vim-go/plugin/go.vim index 8a9eaf2a..3e2f6a1e 100644 --- a/sources_non_forked/vim-go/plugin/go.vim +++ b/sources_non_forked/vim-go/plugin/go.vim @@ -126,6 +126,10 @@ endfunction " ============================================================================ " function! s:echo_go_info() + if !get(g:, "go_echo_go_info", 1) + return + endif + if !exists('v:completed_item') || empty(v:completed_item) return endif @@ -145,14 +149,14 @@ endfunction function! s:auto_type_info() " GoInfo automatic update if get(g:, "go_auto_type_info", 0) - call go#complete#Info(1) + call go#tool#Info(1) endif endfunction function! s:auto_sameids() " GoSameId automatic update if get(g:, "go_auto_sameids", 0) - call go#guru#SameIds(-1) + call go#guru#SameIds() endif endfunction @@ -165,7 +169,7 @@ endfunction function! s:asmfmt_autosave() " Go asm formatting on save - if get(g:, "go_asmfmt_autosave", 1) + if get(g:, "go_asmfmt_autosave", 0) call go#asmfmt#Format() endif endfunction diff --git a/sources_non_forked/vim-go/syntax/go.vim b/sources_non_forked/vim-go/syntax/go.vim index 54afa6ac..9b23eb6c 100644 --- a/sources_non_forked/vim-go/syntax/go.vim +++ b/sources_non_forked/vim-go/syntax/go.vim @@ -374,12 +374,7 @@ endif hi def link goCoverageNormalText Comment function! s:hi() - " :GoSameIds - if &background == 'dark' - hi def goSameId term=bold cterm=bold ctermbg=white ctermfg=black guibg=white guifg=black - else - hi def goSameId term=bold cterm=bold ctermbg=14 guibg=Cyan - endif + hi def link goSameId Search " :GoCoverage commands hi def goCoverageCovered ctermfg=green guifg=#A6E22E diff --git a/sources_non_forked/vim-snipmate/autoload/snipMate.vim b/sources_non_forked/vim-snipmate/autoload/snipMate.vim index 76cc6481..e3b4ca6d 100644 --- a/sources_non_forked/vim-snipmate/autoload/snipMate.vim +++ b/sources_non_forked/vim-snipmate/autoload/snipMate.vim @@ -28,13 +28,9 @@ function! snipMate#expandSnip(snip, version, col) abort let [snippet, b:snip_state.stops] = snipmate#parse#snippet(a:snip) " Build stop/mirror info let b:snip_state.stop_count = s:build_stops(snippet, b:snip_state.stops, lnum, col, indent) - let snipLines = map(copy(snippet), - \ 'snipMate#sniplist_str(v:val, b:snip_state.stops)') else let snippet = snipmate#legacy#process_snippet(a:snip) let [b:snip_state.stops, b:snip_state.stop_count] = snipmate#legacy#build_stops(snippet, lnum, col - indent, indent) - let snipLines = split(substitute(snippet, printf('%s\d\+\|%s{\d\+.\{-}}', - \ g:snipmate#legacy#sigil, g:snipmate#legacy#sigil), '', 'g'), "\n", 1) endif " Abort if the snippet is empty @@ -42,23 +38,7 @@ function! snipMate#expandSnip(snip, version, col) abort return '' endif - " Expand snippet onto current position - let afterCursor = strpart(line, col - 1) - " Keep text after the cursor - if afterCursor != "\t" && afterCursor != ' ' - let line = strpart(line, 0, col - 1) - let snipLines[-1] .= afterCursor - else - let afterCursor = '' - " For some reason the cursor needs to move one right after this - if line != '' && col == 1 && &ve != 'all' && &ve != 'onemore' - let col += 1 - endif - endif - - " Insert snippet with proper indentation - call setline(lnum, line . snipLines[0]) - call append(lnum, map(snipLines[1:], "empty(v:val) ? v:val : '" . strpart(line, 0, indent - 1) . "' . v:val")) + let col = s:insert_snippet_text(snippet, lnum, col, indent) " Open any folds snippet expands into if &foldenable @@ -77,6 +57,50 @@ function! snipMate#expandSnip(snip, version, col) abort return b:snip_state.set_stop(0) endfunction +function! s:insert_snippet_text(snippet, lnum, col, indent) + let line = getline(a:lnum) + let col = a:col + let snippet = type(a:snippet) == type([]) ? a:snippet : split(a:snippet, "\n", 1) + let lnum = a:lnum + + " Keep text after the cursor + let afterCursor = strpart(line, col - 1) + if afterCursor != "\t" && afterCursor != ' ' + let line = strpart(line, 0, col - 1) + else + let afterCursor = '' + " For some reason the cursor needs to move one right after this + if line != '' && col == 1 && &ve != 'all' && &ve != 'onemore' + let col += 1 + endif + endif + + call setline(lnum, '') + call append(lnum, repeat([''], len(snippet) - 1)) + + for item in snippet + let add = lnum == a:lnum ? line : strpart(line, 0, a:indent - 1) + + if !(empty(item) || (type(item) == type([]) && empty(item[0]))) + if type(item) == type([]) + call setline(lnum, add . + \ snipMate#sniplist_str(item, b:snip_state.stops)) + else + call setline(lnum, add . + \ substitute(item, printf('%s\d\+\|%s{\d\+.\{-}}', + \ g:snipmate#legacy#sigil, g:snipmate#legacy#sigil), + \ '', 'g')) + endif + endif + + let lnum += 1 + endfor + + call setline(lnum - 1, getline(lnum - 1) . afterCursor) + + return col +endfunction + function! snipMate#placeholder_str(num, stops) abort return snipMate#sniplist_str(a:stops[a:num].placeholder, a:stops) endfunction diff --git a/sources_non_forked/vim-snippets/AUTHORS b/sources_non_forked/vim-snippets/AUTHORS new file mode 100644 index 00000000..907daef1 --- /dev/null +++ b/sources_non_forked/vim-snippets/AUTHORS @@ -0,0 +1,383 @@ +Authors +=============================================================================== + +Generated with "git log --oneline --pretty="%an" | sort | uniq > AUTHORS + +Aaron Broder +Adnan Zafar +afolmert +aisensiy +Alexander Ross +Alexandre de Oliveira +Alexey Shevchenko +Alex Tan +Allen.M +Alvin Chan +ALX-Liu-Xiao +Andrea Giardini +Andreas Krennmair +Andreas Steinel +Andrei Cristian Petcu +Andrej Radovic +Andre Walker +Andrey Paskal +Andy Waite +Angel Alonso +Ángel Alonso +Anne Douwe Bouma +Anthony Wilson +Arvind +ashfinal +Audrius Kažukauskas +Austin Wood +Aydar Khabibullin +babybeasimple +Benjamin Nørgaard +Bernhard Graf +Bill Casarin +binaryplease +Björn +Björn-Egil Dahlberg +BlackEagle +Boone Severson +bounceme +Bradlee Speice +Brandon Dulaney +Brandon Hilkert +Brian Hogan +Brian van Burken +Bruno Sutic +Camilo Payan +carme +Cézar Antáres +Chad Paradis +Chen Zhongzheng +Ches Martin +ChickenNuggers +Chipairon +Chris Dueck +Chris Nicola +Chris Sims +Christian +Christian Höltje +Christian Neumüller +Christopher Joslyn +chrisyue +Ciro Santilli +Ciro Santilli 六四事件 法轮功 +Claudio Maradonna +Connor Atherton +Cooper LeBrun +Corentin Peuvrel +Craig Paterson +Craig P Jolicoeur +crazymaster +daa84 +Daeyun Shin +Dale Roberts +Daniel Hahler +Dan Loewenherz +Danny Navarro +daoo +Darrell Hamilton +David Arvelo +David Barnett +David C. Bishop +David Deryl Downey - AKA Deryl R. Doucette +David Rodríguez de Dios +David Sanson +dengyaolong +Derek Morey +dhilipsiva +djdt +Dmitry Dementev +Donny Yang +DSIW +dzikie drożdże +Eduardo Gurgel +Eli Gundry +emzap79 +Enric Lluelles +Enrico Maria De Angelis +Erich Heine +Erik Westrup +Ernest +Eugene Kalinin +Eustaquio Rangel +Eustáquio Rangel +Fatih Arslan +Felix Jung +Filipe Giusti +Florent Lévigne +Florian Sattler +frans +Fuad Saud +Gabriel Chavez +Gaël Chamoulaud +Gea-Suan Lin +George Guimarães +George Lee +Georgios Samaras +Gert +gfixler +Gilad Peleg +gk +goonnow +Gueunet Charles +Gui Lin +guneysus +Gustavo Chain +Gustavo Ferreira +Hans-Guenter +Harald Wartig +Henrik Kjelsberg +HIRAKI Satoru +Holger Rapp +Honza +Honza Pokorny +hulufei +Igor Goldvekht +Ilker Cetinkaya +indi +Indra Susila +Ionică Bizău +Iuri Fernandes +Jack Stalnaker +Jacobo de Vera +Jacques Kvam +jake romer +Jakub Stasiak +James Turley +Jan Mollowitz +Jason S. Jones +Jean Jordaan +Jeffrey Tratner +Jens Hoepken +jiangyc0 +Jim Deville +Jinzhu +Joey Curtin +Johannes Wienke +jonasac +Jonas Bygdén +Jonathan Martin +Jorge García +Jorge López Pérez +Joseph Lin +Josh Bode +Josh Davis +Josh Matthews +Josh Vandergrift +Josh Wainwright +JuanPablo +Julian Bennecker +Julien Deniau +Julien Pivard +Julien Stechele +Julien STECHELE +Kalinin Eugene +kenshin54 +Kentaro Imai +Kevin Koltz +Kevin Lui +Kevin Mees +Kevin Murray +Kevin Schaul +Konstantin +Konstantin Gorodinskiy +Laas Toom +Laurent Georget +laxtiz +Leandro Moreira +Leonardo B +Leonidez Acosta +linduxed +Li Xin +Louis +Louis Pilfold +Lucas Hoffmann +Luis Carlos Cruz +Luis Carlos Cruz Carballo +Luiz Gonzaga dos Santos Filho +majjoha +mangege +Marc Camuzat +Marcelo D Montu +Marcelo Jacobus +Marcin Kulik +Marcus Kammer +Marc Weber +Mario de Frutos +Markus Benning +marocchino +Martin Atukunda +Martin Heuschober +Martxel Lasa +Matěj Cepl +Mathew Attlee +Mathieu Comandon +Matthew Barry +Matthias Viehweger +Mattia Tezzele +Matt Rasband +Matt Stevens +Mauro Porras P +Maximiliano Robaina +Mayeu (Cast) +Meng Zhuo +Michael Gehring +Michael Hinrichs +Michael Rutter +Michael Thessel +Michi Huber +Mickey +midchildan +Mike Foley +Mike Smullin +Miki Tebeka +Minjong Chung +M. Maxwell Watson +mMontu +mockturtl +m-pilia +Muhammad Hallaj Subery +mwcz +Namit +Nan Cloudio Jiang +Nan Zheng +Nate Mara +netei +Ngo The Trung +Nguyen Le +Nick Janetakis +Nicklasos +Nick Papanastasiou +Nicolas G. Querol +Nico Suhl +No Ducks +Norman Messtorff +obaoba +oddlydrawn +Oleg Voronkovich +Ole Hansen +Oliver Andrich +Ondrej Slinták +onemanstartup +opennota +Paco Esteban +Panagiotis Mavrogiorgos +Paolo Cretaro +Pascal +Paulo Romeira +Pawel Jankowski +phcerdan +Philippe Mongeau +Philipp Jovanovic +Piotr Jawniak +Piotr Yordanov +Pirogov Evgenij +Pompeu +Povilas Balzaravicius Pawka +Procras +protream +pydave +r4d2 +Radosław Szymczyszyn +Ralph-Wang +Raül Torralba +raydeal +rcolombo +Rekky +René +Rene Vergara +Renzo Poddighe +Reyes Yang +ricardogcolombo +Ricardo Jesus +Rich Layte +Roberto Miranda +robin +Robin Grindrod +Rok Garbas +Roland Sommer +Rory McNamara +rsw0x +rtorralba +Ruben Vereecken +Ryan Bright +Ryan Pineo +Ryan Wang +Sam Shepherd +Santiago Gallego +sasidhar-d +Sathors +Sebastian Röder +Sebastian Wiesner +Sergey Lebedev +Sergey Zasenko +Serhiy Oplakanets +SevereOverfl0w +Simeon F. Willbanks +Simeon Willbanks +Simon Désaulniers +sirex +skv +Sokovikov +Srijan Choudhary +Steeve +stefan +Stephen Tudor +Stephen Woods +Steve Brown +Steven Humphrey +Steven Oliver +Stuart Grimshaw +Sudar +¨switch87¨ +Tevin Zhang +theocrite +Thiago de Arruda +Thomas Duerr +Thomas Szymanski +tinyladi +Tobias Witt +Tobie Warburton +Tomasz Wisniewski +Tom Vincent +Tony +Tony Narlock +toogley +Torbjørn Vatn +tormaroe +ToruIwashita +Travis Holton +Trevor Sullivan +troydm +tUrG0n +twabiko +Tyler Ball +tyronepost +Tyrone Post +Vadim Khohlov +Vincent Hsu +Vladimir Rybas +Vladislav Khvostov +Vorzard +Vzaa +Waldecir Santos +Wildsky Fann +William Ma +William Travis Holton +X4fyr +xz.zhang +Yamamoto Yuji +Yannick Brehon +yerv000 +Yike Lu +yuhuanbo +Yu Huanbo +Yves Lange +yvhn +zauguin +Zaven Muradyan +ZPH diff --git a/sources_non_forked/vim-snippets/UltiSnips/cuda.snippets b/sources_non_forked/vim-snippets/UltiSnips/cuda.snippets new file mode 100644 index 00000000..2a9a7e5e --- /dev/null +++ b/sources_non_forked/vim-snippets/UltiSnips/cuda.snippets @@ -0,0 +1,5 @@ +priority -50 + +extends cpp + +# vim:ft=snippets: diff --git a/sources_non_forked/vim-snippets/UltiSnips/python.snippets b/sources_non_forked/vim-snippets/UltiSnips/python.snippets index fa3ff8b9..5d8e2641 100644 --- a/sources_non_forked/vim-snippets/UltiSnips/python.snippets +++ b/sources_non_forked/vim-snippets/UltiSnips/python.snippets @@ -486,6 +486,11 @@ def __coerce__(self, other): ${25:pass} endsnippet +snippet deff +def ${1:fname}(`!p snip.rv = vim.eval('indent(".") ? "self" : ""')`$2): + $0 +endsnippet + snippet def "function with docstrings" b def ${1:function}(`!p if snip.indent: diff --git a/sources_non_forked/vim-snippets/UltiSnips/tex.snippets b/sources_non_forked/vim-snippets/UltiSnips/tex.snippets index 4c7e44b4..f43de5ee 100644 --- a/sources_non_forked/vim-snippets/UltiSnips/tex.snippets +++ b/sources_non_forked/vim-snippets/UltiSnips/tex.snippets @@ -10,7 +10,7 @@ endsnippet snippet tab "tabular / array environment" b \begin{${1:t}${1/(t)$|(a)$|(.*)/(?1:abular)(?2:rray)/}}{${2:c}} -$0${2/((?<=.)c|l|r)|./(?1: & )/g} +$0${2/(?<=.)(c|l|r)|./(?1: & )/g} \end{$1${1/(t)$|(a)$|(.*)/(?1:abular)(?2:rray)/}} endsnippet @@ -20,7 +20,7 @@ snippet table "Table environment" b \caption{${2:caption}} \label{tab:${3:label}} \begin{${4:t}${4/(t)$|(a)$|(.*)/(?1:abular)(?2:rray)/}}{${5:c}} - $0${5/((?<=.)c|l|r)|./(?1: & )/g} + $0${5/(?<=.)(c|l|r)|./(?1: & )/g} \end{$4${4/(t)$|(a)$|(.*)/(?1:abular)(?2:rray)/}} \end{table} endsnippet diff --git a/sources_non_forked/vim-snippets/snippets/_.snippets b/sources_non_forked/vim-snippets/snippets/_.snippets index 0153a146..ad0235f1 100644 --- a/sources_non_forked/vim-snippets/snippets/_.snippets +++ b/sources_non_forked/vim-snippets/snippets/_.snippets @@ -279,3 +279,11 @@ snippet AGPL You should have received a copy of the GNU Affero General Public License along with this program. If not, see . +snippet ISC + ${1:one line to give the program's name and a brief description} + Copyright `&enc[:2] == "utf" ? "©" : "(c)"` `strftime("%Y")`, ${2:`g:snips_author`} + + Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies. + + THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + ${0} diff --git a/sources_non_forked/vim-snippets/snippets/cuda.snippets b/sources_non_forked/vim-snippets/snippets/cuda.snippets new file mode 100644 index 00000000..425ca67f --- /dev/null +++ b/sources_non_forked/vim-snippets/snippets/cuda.snippets @@ -0,0 +1 @@ +extends cpp diff --git a/sources_non_forked/vim-snippets/snippets/fortran.snippets b/sources_non_forked/vim-snippets/snippets/fortran.snippets index c9ab0602..8fecd330 100644 --- a/sources_non_forked/vim-snippets/snippets/fortran.snippets +++ b/sources_non_forked/vim-snippets/snippets/fortran.snippets @@ -26,6 +26,11 @@ snippet doc ! Description: $1 ! """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" $0 +snippet dox + !> @brief ${1} + !> ${2} + !> @author `g:snips_author` + ${0} # Variables definitions # Boolean snippet bool @@ -49,7 +54,7 @@ snippet type snippet const ${1:type}, parameter :: $2 = $0 snippet arr - ${1:type}, allocatable, dimension(${2::}) :: $0 + ${1:type}, ${2:allocatable, }dimension(${3::}) :: $0 snippet intent ${1:type}, intent(inout) :: $0 # Array @@ -57,7 +62,7 @@ snippet / (/ $1 /) ${2:,&} $0 snippet if if (${1:condition}) then - $2 + $0 end if snippet case select case (${1:expr}) @@ -66,8 +71,8 @@ snippet case $3 end select $0 snippet do - do ${1:i} = ${2:start},${3:end}, ${4:incr} - $4 + do ${1:i} = ${2:start}, ${3:end}, ${4:incr} + $0 end do snippet dow do while (${1:condition}) @@ -84,10 +89,10 @@ snippet func snippet pr write(*,*) $0 snippet read - read( unit = ${1:fp}, file = ${2:filename}${3:, iostat = IERR }) $0 + read(unit = ${1:fp}, file = ${2:filename}, iostat = ${3:ierr}) $0 snippet write - write( unit = ${1:fp}, file = ${2:filename}${3:, iostat = IERR }) $0 + write(unit = ${1:fp}, file = ${2:filename}, iostat = ${3:ierr}) $0 snippet open - open (unit = ${1:fp}, file = ${2:filename}, status = unknown${3:, iostat = IERR }) $0 + open(unit = ${1:fp}, file = ${2:filename}, status = ${3:unknown}, iostat = ${4:ierr}) $0 snippet close - close ( unit = ${1:fp} ) $0 + close(unit = ${1:fp}) $0 diff --git a/sources_non_forked/vim-snippets/snippets/handlebars.snippets b/sources_non_forked/vim-snippets/snippets/handlebars.snippets new file mode 100644 index 00000000..d1ab0f03 --- /dev/null +++ b/sources_non_forked/vim-snippets/snippets/handlebars.snippets @@ -0,0 +1,14 @@ +snippet if # {{#if value}} ... {{/if}} + {{#if ${1:value}}} + ${0} + {{/if}} +snippet ifn # {{#unless value}} ... {{/unless}} + {{#unless ${1:value}}} + ${0} + {{/unless}} +snippet ife # {{#if value}} ... {{else}} .. {{/if}} + {{#if ${1:value}}} + ${2} + {{else}} + ${3} + {{/if}} diff --git a/sources_non_forked/vim-snippets/snippets/javascript/javascript.es6.snippets b/sources_non_forked/vim-snippets/snippets/javascript/javascript.es6.snippets index 16e46328..a1adedef 100644 --- a/sources_non_forked/vim-snippets/snippets/javascript/javascript.es6.snippets +++ b/sources_non_forked/vim-snippets/snippets/javascript/javascript.es6.snippets @@ -2,8 +2,12 @@ snippet const const ${1} = ${0}; snippet let let ${1} = ${0}; -snippet im - import ${1} from '${0}'; +snippet im "import xyz from 'xyz'" + import ${1} from '${2:$1}'; +snippet imas "import * as xyz from 'xyz'" + import * as ${1} from '${2:$1}'; +snippet imm "import { member } from 'xyz'" + import { ${1} } from '${2}'; snippet cla class ${1} { ${0} @@ -18,9 +22,8 @@ snippet clac ${0} } } -# For of loop -snippet foro - for (let ${1:prop} of ${2:object}) { +snippet foro "for (const prop of object}) { ... }" + for (const ${1:prop} of ${2:object}) { ${0:$1} } # Generator diff --git a/sources_non_forked/vim-snippets/snippets/javascript/javascript.node.snippets b/sources_non_forked/vim-snippets/snippets/javascript/javascript.node.snippets index 2b5aefb4..489e0abb 100644 --- a/sources_non_forked/vim-snippets/snippets/javascript/javascript.node.snippets +++ b/sources_non_forked/vim-snippets/snippets/javascript/javascript.node.snippets @@ -5,7 +5,7 @@ snippet ex module.exports = ${1}; # require snippet re - ${1:var} ${2} = require('${3:module_name}'); + ${1:const} ${2} = require('${3:module_name}'); # EventEmitter snippet on on('${1:event_name}', function(${2:stream}) { diff --git a/sources_non_forked/vim-snippets/snippets/mustache.snippets b/sources_non_forked/vim-snippets/snippets/mustache.snippets index 8296afcb..ad8723ed 100644 --- a/sources_non_forked/vim-snippets/snippets/mustache.snippets +++ b/sources_non_forked/vim-snippets/snippets/mustache.snippets @@ -1,15 +1,12 @@ -# if {{#value}} ... {{/value}} -snippet if +snippet if # {{#value}} ... {{/value}} {{#${1:value}}} ${0} {{/$1}} -# if not {{^value}} ... {{/value}} -snippet ifn +snippet ifn # {{^value}} ... {{/value}} {{^${1:value}}} ${0} {{/$1}} -# if else {{#value}} ... {{/value}} {{^value}} ... {{/value}} -snippet ife +snippet ife # {{#value}} ... {{/value}} {{^value}} ... {{/value}} {{#${1:value}}} ${2} {{/$1}} diff --git a/sources_non_forked/vim-snippets/snippets/purescript.snippets b/sources_non_forked/vim-snippets/snippets/purescript.snippets new file mode 100644 index 00000000..06d6b34a --- /dev/null +++ b/sources_non_forked/vim-snippets/snippets/purescript.snippets @@ -0,0 +1,52 @@ +snippet mod + module `substitute(substitute(expand('%:r'), '[/\\]','.','g'),'^\%(\l*\.\)\?','','')` + ( + ) where + + import Prelude + + ${0} +snippet imp + import ${0:Data.List} +snippet impq + import ${1:Data.List} as ${0:List} +snippet fn0 + ${1:name} :: ${2:a} + $1 = ${0:undefined} +snippet fn + ${1:fn} :: ${2:a} -> ${3:a} + $1 ${4}= ${0} +snippet fn1 + ${1:fn} :: ${2:a} -> ${3:a} + $1 ${4}= ${0} +snippet fn2 + ${1:fn} :: ${2:a} -> ${3:a} -> ${4:a} + $1 ${5}= ${0} +snippet fn3 + ${1:fn} :: ${2:a} -> ${3:a} -> ${4:a} -> ${5:a} + $1 ${6}= ${0} +snippet case + case ${1} of + ${2} -> ${0} +snippet let + let + ${1} = ${2} + in + ${3} +snippet where + where + ${1} = ${0} +snippet testunit + module Test.Main where + + import Prelude + import Test.Unit (suite, test) + import Test.Unit.Main (runTest) + import Test.Unit.Assert as Assert + + main = runTest do + suite "${1}" do + test "${2:the tests run}" do + Assert.equal + "Hello, world!" + "Hello, sailor!" diff --git a/sources_non_forked/vim-snippets/snippets/rails.snippets b/sources_non_forked/vim-snippets/snippets/rails.snippets index e8342222..6a5c5ff0 100644 --- a/sources_non_forked/vim-snippets/snippets/rails.snippets +++ b/sources_non_forked/vim-snippets/snippets/rails.snippets @@ -325,7 +325,7 @@ snippet xpost snippet xput xhr :put, :${1:update}, id: ${2:1}, ${3:object}: ${4:object} snippet test - test 'should ${1:do something}' do + test '${1:should do something}' do ${0} end ########################### diff --git a/sources_non_forked/vim-snippets/snippets/tex.snippets b/sources_non_forked/vim-snippets/snippets/tex.snippets index 68ac5d05..05ec852c 100644 --- a/sources_non_forked/vim-snippets/snippets/tex.snippets +++ b/sources_non_forked/vim-snippets/snippets/tex.snippets @@ -1,317 +1,327 @@ +#version 1 #PREAMBLE #newcommand snippet nc \newcommand - \newcommand{\\${1:cmd}}[${2:opt}]{${3:realcmd}} ${0} + \\newcommand{\\${1:cmd}}[${2:opt}]{${3:realcmd}} ${0} #usepackage snippet up \usepackage - \usepackage[${1:options}]{${2:package}} ${0} + \\usepackage[${1:options}]{${2:package}} ${0} #newunicodechar snippet nuc \newunicodechar - \newunicodechar{${1}}{${2:\ensuremath}${3:tex-substitute}}} ${0} + \\newunicodechar{${1}}{${2:\\ensuremath}${3:tex-substitute}}} ${0} #DeclareMathOperator snippet dmo \DeclareMathOperator - \DeclareMathOperator{${1}}{${2}} ${0} + \\DeclareMathOperator{${1}}{${2}} ${0} #DOCUMENT # \begin{}...\end{} snippet begin \begin{} ... \end{} block - \begin{${1:env}} + \\begin{${1:env}} ${0:${VISUAL}} - \end{$1} + \\end{$1} # Tabular snippet tab tabular (or arbitrary) environment - \begin{${1:tabular}}{${2:c}} + \\begin{${1:tabular}}{${2:c}} ${0:${VISUAL}} - \end{$1} + \\end{$1} snippet thm thm (or arbitrary) environment with optional argument - \begin[${1:author}]{${2:thm}} + \\begin[${1:author}]{${2:thm}} ${0:${VISUAL}} - \end{$2} + \\end{$2} snippet center center environment - \begin{center} + \\begin{center} ${0:${VISUAL}} - \end{center} + \\end{center} # Align(ed) snippet ali align(ed) environment - \begin{align${1:ed}} - \label{eq:${2}} + \\begin{align${1:ed}} + \\label{eq:${2}} ${0:${VISUAL}} - \end{align$1} + \\end{align$1} # Gather(ed) snippet gat gather(ed) environment - \begin{gather${1:ed}} + \\begin{gather${1:ed}} ${0:${VISUAL}} - \end{gather$1} + \\end{gather$1} # Equation snippet eq equation environment - \begin{equation} + \\begin{equation} ${0:${VISUAL}} - \end{equation} + \\end{equation} # Equation snippet eql Labeled equation environment - \begin{equation} - \label{eq:${2}} + \\begin{equation} + \\label{eq:${2}} ${0:${VISUAL}} - \end{equation} + \\end{equation} # Equation snippet eq* unnumbered equation environment - \begin{equation*} + \\begin{equation*} ${0:${VISUAL}} - \end{equation*} + \\end{equation*} # Unnumbered Equation snippet \ unnumbered equation: \[ ... \] - \[ + \\[ ${0:${VISUAL}} - \] + \\] # Equation array snippet eqnarray eqnarray environment - \begin{eqnarray} + \\begin{eqnarray} ${0:${VISUAL}} - \end{eqnarray} + \\end{eqnarray} # Label snippet lab \label - \label{${1:eq:}${2:fig:}${3:tab:}${0}} + \\label{${1:eq:}${2:fig:}${3:tab:}${0}} # Enumerate snippet enum enumerate environment - \begin{enumerate} - \item ${0} - \end{enumerate} + \\begin{enumerate} + \\item ${0} + \\end{enumerate} snippet enuma enumerate environment - \begin{enumerate}[(a)] - \item ${0} - \end{enumerate} + \\begin{enumerate}[(a)] + \\item ${0} + \\end{enumerate} snippet enumi enumerate environment - \begin{enumerate}[(i)] - \item ${0} - \end{enumerate} + \\begin{enumerate}[(i)] + \\item ${0} + \\end{enumerate} # Itemize snippet itemize itemize environment - \begin{itemize} - \item ${0} - \end{itemize} + \\begin{itemize} + \\item ${0} + \\end{itemize} snippet item \item - \item ${1:${VISUAL}} + \\item ${1:${VISUAL}} # Description snippet desc description environment - \begin{description} - \item[${1}] ${0} - \end{description} + \\begin{description} + \\item[${1}] ${0} + \\end{description} # Endless new item snippet ]i \item (recursive) - \item ${1} + \\item ${1} ${0:]i} # Matrix snippet mat smart matrix environment - \begin{${1:p/b/v/V/B/small}matrix} + \\begin{${1:p/b/v/V/B/small}matrix} ${0:${VISUAL}} - \end{$1matrix} + \\end{$1matrix} # Cases snippet cas cases environment - \begin{cases} - ${1:equation}, &\text{ if }${2:case}\\ + \\begin{cases} + ${1:equation}, &\\text{ if }${2:case}\\ ${0:${VISUAL}} - \end{cases} + \\end{cases} # Split snippet spl split environment - \begin{split} + \\begin{split} ${0:${VISUAL}} - \end{split} + \\end{split} # Part snippet part document \part - \part{${1:part name}} % (fold) - \label{prt:${2:$1}} + \\part{${1:part name}} % (fold) + \\label{prt:${2:$1}} ${0} % part $2 (end) # Chapter snippet cha \chapter - \chapter{${1:chapter name}} - \label{cha:${2:$1}} + \\chapter{${1:chapter name}} + \\label{cha:${2:$1}} ${0} # Section snippet sec \section - \section{${1:section name}} - \label{sec:${2:$1}} + \\section{${1:section name}} + \\label{sec:${2:$1}} ${0} # Section without number snippet sec* \section* - \section*{${1:section name}} - \label{sec:${2:$1}} + \\section*{${1:section name}} + \\label{sec:${2:$1}} ${0} # Sub Section snippet sub \subsection - \subsection{${1:subsection name}} - \label{sub:${2:$1}} + \\subsection{${1:subsection name}} + \\label{sub:${2:$1}} ${0} # Sub Section without number snippet sub* \subsection* - \subsection*{${1:subsection name}} - \label{sub:${2:$1}} + \\subsection*{${1:subsection name}} + \\label{sub:${2:$1}} ${0} # Sub Sub Section snippet subs \subsubsection - \subsubsection{${1:subsubsection name}} - \label{ssub:${2:$1}} + \\subsubsection{${1:subsubsection name}} + \\label{ssub:${2:$1}} ${0} # Sub Sub Section without number snippet subs* \subsubsection* - \subsubsection*{${1:subsubsection name}} - \label{ssub:${2:$1}} + \\subsubsection*{${1:subsubsection name}} + \\label{ssub:${2:$1}} ${0} # Paragraph snippet par \paragraph - \paragraph{${1:paragraph name}} - \label{par:${2:$1}} + \\paragraph{${1:paragraph name}} + \\label{par:${2:$1}} ${0} # Sub Paragraph snippet subp \subparagraph - \subparagraph{${1:subparagraph name}} - \label{subp:${2:$1}} + \\subparagraph{${1:subparagraph name}} + \\label{subp:${2:$1}} ${0} snippet ni \noindent - \noindent + \\noindent ${0} #References snippet itd description \item - \item[${1:description}] ${0:item} + \\item[${1:description}] ${0:item} snippet figure reference to a figure - ${1:Figure}~\ref{${2:fig:}} + ${1:Figure}~\\ref{${2:fig:}} snippet table reference to a table - ${1:Table}~\ref{${2:tab:}} + ${1:Table}~\\ref{${2:tab:}} snippet listing reference to a listing - ${1:Listing}~\ref{${2:list}} + ${1:Listing}~\\ref{${2:list}} snippet section reference to a section - ${1:Section}~\ref{sec:${2}} ${0} + ${1:Section}~\\ref{sec:${2}} ${0} snippet page reference to a page - ${1:page}~\pageref{${2}} ${0} + ${1:page}~\\pageref{${2}} ${0} snippet index \index - \index{${1:index}} ${0} + \\index{${1:index}} ${0} #Citations snippet citen \citen - \citen{${1}} ${0} + \\citen{${1}} ${0} # natbib citations snippet citep \citep - \citep{${1}} ${0} + \\citep{${1}} ${0} snippet citet \citet - \citet{${1}} ${0} + \\citet{${1}} ${0} snippet cite \cite[]{} - \cite[${1}]{${2}} ${0} + \\cite[${1}]{${2}} ${0} snippet citea \citeauthor - \citeauthor{${1}} ${0} + \\citeauthor{${1}} ${0} snippet citey \citeyear - \citeyear{${1}} ${0} + \\citeyear{${1}} ${0} snippet fcite \footcite[]{} - \footcite[${1}]{${2}}${0} + \\footcite[${1}]{${2}}${0} #Formating text: italic, bold, underline, small capital, emphase .. snippet it italic text - \textit{${0:${VISUAL:text}}} + \\textit{${0:${VISUAL:text}}} snippet bf bold face text - \textbf{${0:${VISUAL:text}}} + \\textbf{${0:${VISUAL:text}}} snippet under underline text - \underline{${0:${VISUAL:text}}} + \\underline{${0:${VISUAL:text}}} snippet emp emphasize text - \emph{${0:${VISUAL:text}}} + \\emph{${0:${VISUAL:text}}} snippet sc small caps text - \textsc{${0:${VISUAL:text}}} + \\textsc{${0:${VISUAL:text}}} #Choosing font snippet sf sans serife text - \textsf{${0:${VISUAL:text}}} + \\textsf{${0:${VISUAL:text}}} snippet rm roman font text - \textrm{${0:${VISUAL:text}}} + \\textrm{${0:${VISUAL:text}}} snippet tt typewriter (monospace) text - \texttt{${0:${VISUAL:text}}} + \\texttt{${0:${VISUAL:text}}} #Math font snippet mf mathfrak - \mathfrak{${0:${VISUAL:text}}} + \\mathfrak{${0:${VISUAL:text}}} snippet mc mathcal - \mathcal{${0:${VISUAL:text}}} + \\mathcal{${0:${VISUAL:text}}} snippet ms mathscr - \mathscr{${0:${VISUAL:text}}} + \\mathscr{${0:${VISUAL:text}}} #misc snippet ft \footnote - \footnote{${0:${VISUAL:text}}} + \\footnote{${0:${VISUAL:text}}} snippet fig figure environment (includegraphics) - \begin{figure} - \begin{center} - \includegraphics[scale=${1}]{Figures/${2}} - \end{center} - \caption{${3}} - \label{fig:${4}} - \end{figure} + \\begin{figure} + \\begin{center} + \\includegraphics[scale=${1}]{Figures/${2}} + \\end{center} + \\caption{${3}} + \\label{fig:${4}} + \\end{figure} ${0} snippet tikz figure environment (tikzpicture) - \begin{figure} - \begin{center} - \begin{tikzpicture}[scale=${1:1}] + \\begin{figure}[htpb] + \\begin{center} + \\begin{tikzpicture}[scale=${1:1}, transform shape] ${2} - \end{tikzpicture} - \end{center} - \caption{${3}} - \label{fig:${4}} - \end{figure} + \\end{tikzpicture} + \\end{center} + \\caption{${3}} + \\label{fig:${4}} + \\end{figure} + ${0} +snippet subfig subfigure environment + \\begin{subfigure}[${1}]{${2:\\textwidth}} + \\begin{center} + ${3} + \\end{center} + \\caption{${4}} + \\label{fig:${5}} + \\end{subfigure} ${0} #math snippet stackrel \stackrel{}{} - \stackrel{${1:above}}{${2:below}} ${0} + \\stackrel{${1:above}}{${2:below}} ${0} snippet frac \frac{}{} - \frac{${1:num}}{${2:denom}} ${0} + \\frac{${1:num}}{${2:denom}} ${0} snippet sum \sum^{}_{} - \sum^{${1:n}}_{${2:i=1}} ${0} + \\sum^{${1:n}}_{${2:i=1}} ${0} snippet lim \lim_{} - \lim_{${1:n \to \infty}} ${0} + \\lim_{${1:n \\to \\infty}} ${0} snippet frame frame environment - \begin{frame}[${1:t}]{${2:title}} + \\begin{frame}[${1:t}]{${2:title}} ${0:${VISUAL}} - \end{frame} + \\end{frame} snippet block block environment - \begin{block}{${1:title}} - ${0:${VISUAL}} - \end{block} + \\begin{block}{${1:title}} + ${0:${VISUAL}} + \\end{block} snippet alert alertblock environment - \begin{alertblock}{${1:title}} - ${0:${VISUAL}} - \end{alertblock} + \\begin{alertblock}{${1:title}} + ${0:${VISUAL}} + \\end{alertblock} snippet example exampleblock environment - \begin{exampleblock}{${1:title}} - ${0:${VISUAL}} - \end{exampleblock} + \\begin{exampleblock}{${1:title}} + ${0:${VISUAL}} + \\end{exampleblock} snippet col2 two-column environment - \begin{columns} - \begin{column}{0.5\textwidth} + \\begin{columns} + \\begin{column}{0.5\\textwidth} ${1} - \end{column} - \begin{column}{0.5\textwidth} + \\end{column} + \\begin{column}{0.5\\textwidth} ${0} - \end{column} - \end{columns} + \\end{column} + \\end{columns} snippet \{ \{ \} \\{ ${0} \\} #delimiter snippet lr left right - \left${1} ${0} \right$1 -snippet lr( left( right) - \left( ${0} \right) -snippet lr| left| right| - \left| ${0} \right| -snippet lr{ left\{ right\} - \left\\{ ${0} \right\\} -snippet lr[ left[ right] - \left[ ${0} \right] -snippet lra langle rangle - \langle ${0} \rangle + \\left${1} ${0} \\right$1 +snippet lr( left( right) + \\left( ${0} \\right) +snippet lr| left| right| + \\left| ${0} \\right| +snippet lr{ left\{ right\} + \\left\\{ ${0} \\right\\} +snippet lr[ left[ right] + \\left[ ${0} \\right] +snippet lra langle rangle + \\langle ${0} \\rangle # Code listings snippet lst - \begin{listing}[language=${1:language}] + \\begin{listing}[language=${1:language}] ${0:${VISUAL}} - \end{listing} + \\end{listing} snippet lsi - \lstinline|${1}| ${0} + \\lstinline|${1}| ${0} # Hyperlinks snippet url - \url{${1}} ${0} + \\url{${1}} ${0} snippet href - \href{${1}}{${2}} ${0} + \\href{${1}}{${2}} ${0} # URL from Clipboard. snippet urlc - \url{`@+`} ${0} + \\url{`@+`} ${0} snippet hrefc - \href{`@+`}{${1}} ${0} + \\href{`@+`}{${1}} ${0}