merge to origin

.gitignore

@@ -1,7 +1,12 @@
-temp_dirs/undodir*
+temp_dirs/undodir/*
 sources_non_forked/ack.vim/.netrwhist
 temp_dirs/yankring_history_v2.txt
 sources_forked/yankring/doc/tags
 sources_non_forked/tlib/doc/tags
+<<<<<<< HEAD
+=======
+sources_non_forked/ctrlp.vim/doc/tags*
+my_configs.vim
+>>>>>>> 2644909e1e6273e4317a077ef289833e7500be53
 tags
 .DS_Store

README.md

@@ -148,43 +148,34 @@ Now you have vim-rails installed ;-)
 
 ### Plugin related mappings
 
-Open [bufexplorer](https://github.com/vim-scripts/bufexplorer.zip) and see and manage the current buffers:
+Open [bufexplorer](https://github.com/vim-scripts/bufexplorer.zip) and see and manage the current buffers (`<leader>o`):
     
     map <leader>o :BufExplorer<cr>
 
-Open [MRU.vim](https://github.com/vim-scripts/mru.vim) and see the recently open files:
+Open [MRU.vim](https://github.com/vim-scripts/mru.vim) and see the recently open files (`<leader>f`):
 
     map <leader>f :MRU<CR>
 
-Open [ctrlp.vim](https://github.com/kien/ctrlp.vim) plugin:
+Open [ctrlp.vim](https://github.com/kien/ctrlp.vim) plugin (`<leader>j` or `<ctrl>f`):
     
     let g:ctrlp_map = '<c-f>'
 
-Open [PeepOpen](http://topfunky.github.io/PeepOpen/) plugin:
-
-    map <leader>j :PeepOpen<cr>
-
 Managing the [NERD Tree](https://github.com/scrooloose/nerdtree) plugin:
 
     map <leader>nn :NERDTreeToggle<cr>
     map <leader>nb :NERDTreeFromBookmark 
     map <leader>nf :NERDTreeFind<cr>
 
-[goyo.vim](https://github.com/junegunn/goyo.vim) and [vim-zenroom2](https://github.com/amix/vim-zenroom2) lets you only focus on one thing at a time. It removes all the distractions and centers the content. It has a special look when editing Markdown, reStructuredText and textfiles. It only has one mapping.
+[goyo.vim](https://github.com/junegunn/goyo.vim) and [vim-zenroom2](https://github.com/amix/vim-zenroom2) lets you only focus on one thing at a time. It removes all the distractions and centers the content. It has a special look when editing Markdown, reStructuredText and textfiles. It only has one mapping. (`<leader>z`)
 
     map <leader>z :Goyo<cr>
 
 ### Normal mode mappings
 
-Fast saving of a buffer:
+Fast saving of a buffer (`<leader>w`):
 
 	nmap <leader>w :w!<cr>
 	
-Treat long lines as break lines (useful when moving around in them):
-
-	map j gj
-	map k gk
-	
 Map `<Space>` to `/` (search) and `<Ctrl>+<Space>` to `?` (backwards search):
 	
 	map <space> /
@@ -195,14 +186,14 @@ Disable highlight when `<leader><cr>` is pressed:
 	
 	map <silent> <leader><cr> :noh<cr>
 
-Smart way to move between windows:
+Smart way to move between windows (`<ctrl>j` etc.):
 	
 	map <C-j> <C-W>j
 	map <C-k> <C-W>k
 	map <C-h> <C-W>h
 	map <C-l> <C-W>l
 
-Closing of current buffer(s):
+Closing of current buffer(s) (`<leader>bd` and (`<leader>ba`)):
 	
 	" Close current buffer
 	map <leader>bd :Bclose<cr>
@@ -339,18 +330,6 @@ Vimscript mappings:
     map <leader>n :cn<cr>
     map <leader>p :cp<cr>
 
-## Useful blog tips regarding my Vim setup
-
-* [Vim: Annotate strings with gettext (the macro way)](http://amix.dk/blog/post/19678#Vim-Annotate-strings-with-gettext-the-macro-way)
-* [vimgrep: Searching through multiple file extensions](http://amix.dk/blog/post/19672#vimgrep-Searching-through-multiple-file-extensions)
-* [Filtering through vimgrep results using regular expressions](http://amix.dk/blog/post/19666#Filtering-through-vimgrep-results-using-regular-expressions)
-* [PeepOpen - File auto completion for Mac editors](http://amix.dk/blog/post/19601#PeepOpen-File-auto-completion-for-Mac-editors)
-* [Vim 7.3: Persistent undo and encryption!](http://amix.dk/blog/post/19548#Vim-7-3-Persistent-undo-and-encryption)
-* [Vim tips: Visual Search](http://amix.dk/blog/post/19334#Vim-tips-Visual-Search)
-* [Folding in Vim](http://amix.dk/blog/post/19132#Folding-in-Vim)
-* [
-Zen room for Vim: Focusing only on the essential](http://amix.dk/blog/post/19744#zenroom-for-Vim-Focsuing-only-on-the-essential)
-
 ## How to uninstall
 Do following:
 * Remove `~/.vim_runtime`

sources_non_forked/ack.vim/autoload/ack.vim

@@ -1,3 +1,7 @@
+if exists('g:autoloaded_ack') || &cp
+  finish
+endif
+
 if exists('g:ack_use_dispatch')
   if g:ack_use_dispatch && !exists(':Dispatch')
     call s:Warn('Dispatch not loaded! Falling back to g:ack_use_dispatch = 0.')
@@ -238,4 +242,5 @@ function! s:Warn(msg) "{{{
   echohl WarningMsg | echomsg 'Ack: ' . a:msg | echohl None
 endf "}}}
 
+let g:autoloaded_ack = 1
 " vim:set et sw=2 ts=2 tw=78 fdm=marker

sources_non_forked/ack.vim/doc/ack.txt

@@ -4,6 +4,10 @@
 Author:  Antoine Imbert <antoine.imbert+ackvim@gmail.com>         *ack-author*
 License: Same terms as Vim itself (see |license|)
 
+This plugin is only available if 'compatible' is not set.
+
+{Vi does not have any of this}
+
 ==============================================================================
 INTRODUCTION                                                             *ack*
 
@@ -16,7 +20,7 @@ shows the results in a split window.
     Search recursively in {directory} (which defaults to the current
     directory) for the {pattern}.  Behaves just like the |:grep| command, but
     will open the |Quickfix| window for you. If [!] is not given the first
-    occurence is jumped to.
+    occurrence is jumped to.
 
 :AckAdd [options] {pattern} [{directory}]                            *:AckAdd*
 
@@ -90,7 +94,6 @@ Example:
 >
         let g:ackprg = "ag --vimgrep"
 <
-
                                                        *g:ack_default_options*
 g:ack_default_options
 Default: " -s -H --nocolor --nogroup --column"
@@ -107,18 +110,17 @@ Example:
         let g:ack_default_options =
               \ " -s -H --nocolor --nogroup --column --smart-case --follow"
 <
-
                                                        *g:ack_apply_qmappings*
 g:ack_apply_qmappings
 Default: 1
 
-This option enable mappings on quickview window.
+This option enables mappings on the |quickfix| window.
 
                                                        *g:ack_apply_lmappings*
 g:ack_apply_lmappings
 Default: 1
 
-This option enable mappings on Location list window.
+This option enables mappings on |location-list| windows.
 
                                                               *g:ack_mappings*
 g:ack_mappings
@@ -139,7 +141,6 @@ Example, if you want to open the result in the middle of the screen:
 >
         let g:ack_mappings = { "o": "<CR>zz" }
 <
-
                                                               *g:ack_qhandler*
 g:ack_qhandler
 Default: "botright copen"
@@ -150,7 +151,6 @@ If you want to open a quickview window with 30 lines you can do:
 >
         let g:ack_qhandler = "botright copen 30"
 <
-
                                                               *g:ack_lhandler*
 g:ack_lhandler
 Default: "botright lopen"
@@ -161,9 +161,7 @@ If you want to open a Location list window with 30 lines you can do:
 >
         let g:ack_lhandler = "botright lopen 30"
 <
-
                                                               *g:ackhighlight*
-
 g:ackhighlight
 Default: 0
 
@@ -173,7 +171,6 @@ Example:
 >
         let g:ackhighlight = 1
 <
-
                                                              *g:ack_autoclose*
 g:ack_autoclose
 Default: 0
@@ -185,9 +182,7 @@ Example:
 >
         let g:ack_autoclose = 1
 <
-
                                                       *g:ack_autofold_results*
-
 g:ack_autofold_results
 Default: 0
 
@@ -200,9 +195,7 @@ Example:
 >
         let g:ack_autofold_results = 1
 <
-
                                                                 *g:ackpreview*
-
 g:ackpreview
 Default: 0
 
@@ -212,9 +205,7 @@ Example:
 >
         let g:ackpreview = 1
 <
-
                                                           *g:ack_use_dispatch*
-
 g:ack_use_dispatch
 Default: 0
 
@@ -229,9 +220,7 @@ Example:
 >
         let g:ack_use_dispatch = 1
 <
-
                                              *g:ack_use_cword_for_empty_search*
-
 g:ack_use_cword_for_empty_search
 Default: 1
 
@@ -239,34 +228,76 @@ Use this option to enable blank searches to run against the word under the
 cursor. When this option is not set, blank searches will only output an error
 message.
 
-
 Example:
 >
         let g:ack_use_cword_for_empty_search = 0
 <
-
-
 ==============================================================================
 MAPPINGS                                                        *ack-mappings*
 
-The following keyboard shortcuts are available in the quickfix window:
+The following keyboard shortcuts are available in the |quickfix| and
+|location-list| windows:
 
-o                   open file (same as enter).
+?                   display a quick summary of these mappings.
 
-O                   open file and close quickfix window.
+o                   open file (same as Enter).
+
+O                   open file and close the quickfix window.
 
 go                  preview file (open but maintain focus on ack.vim results).
 
 t                   open in a new tab.
 
-T                   open in new tab silently.
+T                   open in new tab without moving to it.
 
 h                   open in horizontal split.
 
-H                  open in horizontal split silently.
+H                   open in horizontal split, keeping focus on the results.
 
 v                   open in vertical split.
 
-gv                  open in vertical split silently.
+gv                  open in vertical split, keeping focus on the results.
 
 q                   close the quickfix window.
+
+To adjust these, see |g:ack_mappings|.
+
+==============================================================================
+Ignoring files                                                    *ack-ignore*
+
+If you're using this plugin with ag, The Silver Searcher, bear in mind that:
+
+    - It ignores file patterns from your .gitignore and .hgignore.
+
+    - If there are other files in your source repository you don't wish to
+      search, you can add their patterns to an .agignore file.
+
+==============================================================================
+ISSUES AND FAQ                                            *ack-issues-and-faq*
+
+I use NERDTree and opening ack.vim results in a vertical split displaces it.~
+
+    You are probably using NERDTree with its default alignment at the left
+    side of the window. Set these custom mappings in your vimrc to work around
+    this:
+>
+        let g:ack_mappings = {
+              \  'v':  '<C-W><CR><C-W>L<C-W>p<C-W>J<C-W>p',
+              \ 'gv': '<C-W><CR><C-W>L<C-W>p<C-W>J' }
+<
+    This solution will be improved in the future.
+
+Results show a mix of relative and absolute paths, making them hard to read.~
+
+    This is a quirk of Vim that can happen with plain |:vimgrep| too. You can
+    try this in your vimrc to work around it:
+>
+        autocmd BufAdd * exe "cd" fnameescape(getcwd())
+<
+    but for some users this may be disruptive to their Vim workflow. For more
+    details, see:
+
+        http://vi.stackexchange.com/a/4816/7174
+        https://github.com/mileszs/ack.vim/issues/143
+
+vim:set et sw=4 ts=4 tw=78:

sources_non_forked/ack.vim/plugin/ack.vim

@@ -1,4 +1,4 @@
-if exists('g:loaded_ack')
+if exists('g:loaded_ack') || &cp
   finish
 endif
 

sources_non_forked/ag.vim/README.md

@@ -1,5 +1,7 @@
 # ag.vim #
 
+## Deprecated: See [this comment](https://github.com/rking/ag.vim/issues/124#issuecomment-227038003) for more info. Maybe try [ack.vim](https://github.com/mileszs/ack.vim#can-i-use-ag-the-silver-searcher-with-this) as an alternative. ##
+
 This plugin is a front for ag, A.K.A.
 [the_silver_searcher](https://github.com/ggreer/the_silver_searcher).  Ag can
 be used as a replacement for 153% of the uses of `ack`.  This plugin will allow

sources_non_forked/ctrlp.vim/.gitignore

@@ -0,0 +1,7 @@
+*.markdown
+*.zip
+note.txt
+tags
+tags-cn
+.hg*
+tmp/*

sources_non_forked/ctrlp.vim/autoload/ctrlp.vim

@@ -93,6 +93,7 @@ let [s:pref, s:bpref, s:opts, s:new_opts, s:lc_opts] =
 	\ 'open_single_match':     ['s:opensingle', []],
 	\ 'brief_prompt':          ['s:brfprt', 0],
 	\ 'match_current_file':    ['s:matchcrfile', 0],
+	\ 'match_natural_name':    ['s:matchnatural', 0],
 	\ 'compare_lim':           ['s:compare_lim', 3000],
 	\ 'bufname_mod':           ['s:bufname_mod', ':t'],
 	\ 'bufpath_mod':           ['s:bufpath_mod', ':~:.:h'],
@@ -315,11 +316,11 @@ fu! s:Open()
 	cal s:setupblank()
 endf
 
-fu! s:Close()
+fu! s:Close(exit)
 	cal s:buffunc(0)
 	if winnr('$') == 1
 		bw!
-	el
+	elsei a:exit
 		try | bun!
 		cat | clo! | endt
 		cal s:unmarksigns()
@@ -425,7 +426,7 @@ fu! s:UserCmd(lscmd)
 	let do_ign =
 		\ type(s:usrcmd) == 4 && has_key(s:usrcmd, 'ignore') && s:usrcmd['ignore']
 	if do_ign && ctrlp#igncwd(s:cwd) | retu | en
-	if exists('+ssl') && &ssl
+	if exists('+ssl') && &ssl && &shell !~ 'sh'
 		let [ssl, &ssl, path] = [&ssl, 0, tr(path, '/', '\')]
 	en
 	if (has('win32') || has('win64')) && match(&shellcmdflag, "/") != -1
@@ -653,9 +654,9 @@ fu! s:Update(str)
 endf
 
 fu! s:ForceUpdate()
-	let wv = winsaveview()
+	let pos = exists('*getcurpos') ? getcurpos() : getpos('.')
 	sil! cal s:Update(escape(s:getinput(), '\'))
-	cal winrestview(wv)
+	cal setpos('.', pos)
 endf
 
 fu! s:BuildPrompt(upd)
@@ -839,9 +840,9 @@ fu! s:PrtSelectMove(dir)
 	let wht = winheight(0)
 	let dirs = {'t': 'gg','b': 'G','j': 'j','k': 'k','u': wht.'k','d': wht.'j'}
 	exe 'keepj norm!' dirs[a:dir]
-	let wv = winsaveview()
+	let pos = exists('*getcurpos') ? getcurpos() : getpos('.')
 	cal s:BuildPrompt(0)
-	cal winrestview(wv)
+	cal setpos('.', pos)
 endf
 
 fu! s:PrtSelectJump(char)
@@ -864,9 +865,9 @@ fu! s:PrtSelectJump(char)
 			let [jmpln, s:jmpchr] = [npos == -1 ? pos : npos, [chr, npos]]
 		en
 		exe 'keepj norm!' ( jmpln + 1 ).'G'
-		let wv = winsaveview()
+		let pos = exists('*getcurpos') ? getcurpos() : getpos('.')
 		cal s:BuildPrompt(0)
-		cal winrestview(wv)
+		cal setpos('.', pos)
 	en
 endf
 " Misc {{{2
@@ -907,8 +908,9 @@ fu! s:PrtDeleteMRU()
 endf
 
 fu! s:PrtExit()
+	exe bufwinnr(s:bufnr).'winc w'
 	if bufnr('%') == s:bufnr && bufname('%') == 'ControlP'
-		noa cal s:Close()
+		noa cal s:Close(1)
 		noa winc p
 	en
 endf
@@ -1754,7 +1756,7 @@ fu! ctrlp#syntax()
 	en
 	sy match CtrlPNoEntries '^ == NO ENTRIES ==$'
 	if hlexists('CtrlPLinePre')
-		sy match CtrlPLinePre '^>'
+		exe "sy match CtrlPLinePre '^".escape(get(g:, 'ctrlp_line_prefix', '>'),'^$.*~\')."'"
 	en
 
 	if s:itemtype == 1 && s:has_conceal
@@ -1822,7 +1824,7 @@ fu! s:highlight(pat, grp)
 				" occurrence of our letters. We also ensure that our matcher is case
 				" insensitive or sensitive depending.
 				cal matchadd(a:grp, beginning.middle.ending)
-			endfor
+			endfo
 		en
 
 		cal matchadd('CtrlPLinePre', '^>')
@@ -1941,7 +1943,7 @@ fu! s:isabs(path)
 endf
 
 fu! s:bufnrfilpath(line)
-	if s:isabs(a:line) || a:line =~ '^\~[/\\]'
+	if s:isabs(a:line) || a:line =~ '^\~[/\\]' || a:line =~ '^\w\+:\/\/'
 		let filpath = a:line
 	el
 		let filpath = s:dyncwd.s:lash().a:line
@@ -1956,9 +1958,10 @@ fu! s:bufnrfilpath(line)
 endf
 
 fu! ctrlp#normcmd(cmd, ...)
+	let buftypes = [ 'quickfix', 'help' ]
 	if a:0 < 2 && s:nosplit() | retu a:cmd | en
 	let norwins = filter(range(1, winnr('$')),
-		\ 'empty(getbufvar(winbufnr(v:val), "&bt")) || s:isneovimterminal(winbufnr(v:val))')
+		\ 'index(buftypes, getbufvar(winbufnr(v:val), "&bt")) == -1 || s:isneovimterminal(winbufnr(v:val))')
 	for each in norwins
 		let bufnr = winbufnr(each)
 		if empty(bufname(bufnr)) && empty(getbufvar(bufnr, '&ft'))
@@ -2345,9 +2348,16 @@ endf
 
 fu! s:buildpat(lst)
 	let pat = a:lst[0]
+	if s:matchnatural == 1
+		for item in range(1, len(a:lst) - 1)
+			let c = a:lst[item - 1]
+			let pat .= (c == '/' ? '[^/]\{-}' : '[^'.c.'/]\{-}').a:lst[item]
+		endfo
+	else
 		for item in range(1, len(a:lst) - 1)
 			let pat .= '[^'.a:lst[item - 1].']\{-}'.a:lst[item]
 		endfo
+	en
 	retu pat
 endf
 
@@ -2533,7 +2543,7 @@ if has('autocmd')
 	aug CtrlPAug
 		au!
 		au BufEnter ControlP cal s:checkbuf()
-		au BufLeave ControlP noa cal s:Close()
+		au BufLeave ControlP noa cal s:Close(0)
 		au VimLeavePre * cal s:leavepre()
 	aug END
 en

sources_non_forked/lightline.vim/README.md

@@ -520,8 +520,8 @@ Oops! We forgot the cool mark for the branch component! (work with the patched f
 ```vim
 function! LightLineFugitive()
   if exists("*fugitive#head")
-    let _ = fugitive#head()
+    let branch = fugitive#head()
-    return _ !=# '' ? '⭠ '._ : ''
+    return branch !=# '' ? '⭠ '.branch : ''
   endif
   return ''
 endfunction
@@ -596,8 +596,8 @@ endfunction
 
 function! LightLineFugitive()
   if &ft !~? 'vimfiler\|gundo' && exists("*fugitive#head")
-    let _ = fugitive#head()
+    let branch = fugitive#head()
-    return _ !=# '' ? '⭠ '._ : ''
+    return branch !=# '' ? '⭠ '.branch : ''
   endif
   return ''
 endfunction
@@ -691,8 +691,8 @@ function! LightLineFugitive()
   try
     if expand('%:t') !~? 'Tagbar\|Gundo\|NERD' && &ft !~? 'vimfiler' && exists('*fugitive#head')
       let mark = ''  " edit here for cool mark
-      let _ = fugitive#head()
+      let branch = fugitive#head()
-      return _ !=# '' ? mark._ : ''
+      return branch !=# '' ? mark.branch : ''
     endif
   catch
   endtry

sources_non_forked/lightline.vim/autoload/lightline.vim

@@ -2,7 +2,7 @@
 " Filename: autoload/lightline.vim
 " Author: itchyny
 " License: MIT License
-" Last Change: 2016/05/14 13:20:45.
+" Last Change: 2016/06/12 22:40:00.
 " =============================================================================
 
 let s:save_cpo = &cpo
@@ -276,7 +276,7 @@ function! lightline#highlight(...) abort
     let rs = has_key(get(c, d, {}), 'right') ? c[d].right : has_key(f, d) && has_key(get(c, f[d], {}), 'right') ? c[f[d]].right : c.normal.right
     for [p, l, zs] in [['Left', len(left), ls], ['Right', len(right), rs]]
       for [i, t] in map(range(0, l), '[v:val, 0]') + types
-        if i != l
+        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))
         endif

sources_non_forked/lightline.vim/doc/lightline.txt

@@ -4,7 +4,7 @@ Version: 0.0
 Author: itchyny (https://github.com/itchyny)
 License: MIT License
 Repository: https://github.com/itchyny/lightline.vim
-Last Change: 2016/05/08 13:56:19.
+Last Change: 2016/05/26 21:57:34.
 
 CONTENTS					*lightline-contents*
 
@@ -175,14 +175,18 @@ OPTIONS						*lightline-option*
 		|g:lightline.component_expand|. The types are used to specify
 		the color. Specifically, the type raw is used to specify a
 		component which should not be wrapped by item group: %(...%).
->
+		The default value is: >
+
 		let g:lightline.component_type = {
 		    \ 'tabs': 'tabsel',
 		    \ 'close': 'raw' }
 <
 	g:lightline.tab_component		*g:lightline.tab_component*
 		A dictionary for components in one tab.
+		The default value is: >
 
+		let g:lightline.tab_component = {}
+<
 	g:lightline.tab_component_function	*g:lightline.tab_component_function*
 		Another dictionary for components in one tab.
 		A function specified as a tab component takes one argument:
@@ -286,8 +290,8 @@ nice.
 	endfunction
 	function! LightLineFugitive()
 		if exists('*fugitive#head')
-			let _ = fugitive#head()
+			let branch = fugitive#head()
-			return _ !=# '' ? ''._ : ''
+			return branch !=# '' ? ''.branch : ''
 		endif
 		return ''
 	endfunction
@@ -311,8 +315,8 @@ look nice.
 	endfunction
 	function! LightLineFugitive()
 		if exists('*fugitive#head')
-			let _ = fugitive#head()
+			let branch = fugitive#head()
-			return _ !=# '' ? '⭠ '._ : ''
+			return branch !=# '' ? '⭠ '.branch : ''
 		endif
 		return ''
 	endfunction
@@ -337,7 +341,7 @@ Exposed functions for lightline.vim.
 		Returns the mode of the Vim using |g:lightline.mode_map|.
 
 	lightline#init()			*lightline#init()*
-		Initializes the variable |g:lightline|.
+		Initializes the internal state from |g:lightline|.
 
 	lightline#colorscheme()			*lightline#colorscheme()*
 		Initializes the colorscheme and the highlight groups.
@@ -741,8 +745,8 @@ A nice example for |vim-powerline| font users:
 	endfunction
 	function! LightLineFugitive()
 		if &ft !~? 'vimfiler' && exists('*fugitive#head')
-			let _ = fugitive#head()
+			let branch = fugitive#head()
-			return _ !=# '' ? '⭠ '._ : ''
+			return branch !=# '' ? '⭠ '.branch : ''
 		endif
 		return ''
 	endfunction
@@ -802,8 +806,8 @@ For users who uses lots of plugins:
 	  try
 	    if expand('%:t') !~? 'Tagbar\|Gundo\|NERD' && &ft !~? 'vimfiler' && exists('*fugitive#head')
 	      let mark = ''  " edit here for cool mark
-	      let _ = fugitive#head()
+	      let branch = fugitive#head()
-	      return _ !=# '' ? mark._ : ''
+	      return branch !=# '' ? mark.branch : ''
 	    endif
 	  catch
 	  endtry

sources_non_forked/lightline.vim/test/highlight.vim

@@ -3,9 +3,6 @@ let s:assert = themis#helper('assert')
 
 function! s:suite.before_each()
   hi clear
-  let g:lightline = {}
-  call lightline#init()
-  call lightline#colorscheme()
 endfunction
 
 function! s:hi(name)
@@ -22,6 +19,9 @@ function! s:pattern(xs, ...) abort
 endfunction
 
 function! s:suite.highlight()
+  let g:lightline = {}
+  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]))
@@ -34,6 +34,9 @@ function! s:suite.highlight()
 endfunction
 
 function! s:suite.insert()
+  let g:lightline = {}
+  call lightline#init()
+  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]))
@@ -48,6 +51,9 @@ endfunction
 
 
 function! s:suite.visual()
+  let g:lightline = {}
+  call lightline#init()
+  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]))
@@ -61,6 +67,9 @@ function! s:suite.visual()
 endfunction
 
 function! s:suite.replace()
+  let g:lightline = {}
+  call lightline#init()
+  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]))
@@ -97,6 +106,27 @@ function! s:suite.left_right()
   call s:assert.match(s:hi('LightLineMiddle_normal'), s:pattern(palette.normal.middle[0]))
 endfunction
 
+function! s:suite.no_components()
+  let g:lightline = {
+        \   'active': {
+        \     'left': [],
+        \     'right': []
+        \   },
+        \   'inactive': {
+        \     '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'), '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()
   let g:lightline = {
         \   'active': {

sources_non_forked/nerdtree/autoload/nerdtree/ui_glue.vim

@@ -187,17 +187,17 @@ endfunction
 " closes the parent dir of the current node
 function! s:closeCurrentDir(node)
     let parent = a:node.parent
-    if parent ==# {} || parent.isRoot()
+    while g:NERDTreeCascadeOpenSingleChildDir && !parent.isRoot()
-        call nerdtree#echo("cannot close tree root")
+        let childNodes = parent.getVisibleChildren()
-    else
+        if len(childNodes) == 1 && childNodes[0].path.isDirectory
-        while g:NERDTreeCascadeOpenSingleChildDir && !parent.parent.isRoot()
-            if parent.parent.getVisibleChildCount() == 1
-                call parent.close()
             let parent = parent.parent
         else
             break
         endif
     endwhile
+    if parent ==# {} || parent.isRoot()
+        call nerdtree#echo("cannot close tree root")
+    else
         call parent.close()
         call b:NERDTree.render()
         call parent.putCursorHere(0, 0)
@@ -280,7 +280,7 @@ function! s:findAndRevealPath()
             else
                 call g:NERDTree.CursorToTreeWin()
             endif
-            call b:NERDTree.setShowHidden(g:NERDTreeShowHidden)
+            call b:NERDTree.ui.setShowHidden(g:NERDTreeShowHidden)
             call s:chRoot(g:NERDTreeDirNode.New(p.getParent(), b:NERDTree))
         else
             if !g:NERDTree.IsOpen()

sources_non_forked/syntastic/CONTRIBUTING.md

@@ -11,7 +11,7 @@
 ## 1. Bug reports / GitHub issues
 
 Please note that the preferred channel for posting bug reports is the
-[issue tracker at GitHub][0]. Reports posted elsewhere are less likely
+[issue tracker at GitHub][bug_tracker]. Reports posted elsewhere are less likely
 to be seen by the core team.
 
 When reporting a bug make sure you search the existing GitHub issues
@@ -39,14 +39,14 @@ too:
 ## 2. Submitting a patch
 
 Before you consider adding features to syntastic, _please_ spend a few minutes
-(re-)reading the latest version of the [manual][1]. Syntastic is changing
+(re-)reading the latest version of the [manual][manual]. Syntastic is changing
 rapidly at times, and it's possible that some features you want to add exist
 already.
 
 To submit a patch:
 
-* fork the [repo][2] on GitHub;
+* fork the [repo][github] on GitHub;
-* make a [topic branch][3] and start hacking;
+* make a [topic branch][branches] and start hacking;
 * submit a pull request based off your topic branch.
 
 Small, focused patches are preferred.
@@ -69,14 +69,14 @@ Follow the coding conventions/styles used in the syntastic core:
 * don't use `l:` prefixes for variables unless actually required (i.e.
 almost never);
 * code for maintainability; we would rather a function be a couple of
-lines longer and have (for example) some [explaining variables][4] to
+lines longer and have (for example) some [explaining variables][variables] to
 aid readability.
 
 <a name="checkerstyle"></a>
 
 ## 4. Syntax checker notes
 
-Make sure to read the [guide][5] if you plan to add new syntax checkers.
+Make sure to read the [guide][guide] if you plan to add new syntax checkers.
 
 Use the existing checkers as templates, rather than writing everything
 from scratch.
@@ -97,9 +97,9 @@ let errorformat =
     \ '%-G%.%#'
 ```
 
-[0]: https://github.com/scrooloose/syntastic/issues
+[bug_tracker]:      https://github.com/scrooloose/syntastic/issues
-[1]: https://github.com/scrooloose/syntastic/blob/master/doc/syntastic.txt
+[manual]:           https://github.com/scrooloose/syntastic/blob/master/doc/syntastic.txt
-[2]: https://github.com/scrooloose/syntastic
+[github]:           https://github.com/scrooloose/syntastic
-[3]: https://github.com/dchelimsky/rspec/wiki/Topic-Branches#using-topic-branches-when-contributing-patches
+[branches]:         https://github.com/dchelimsky/rspec/wiki/Topic-Branches#using-topic-branches-when-contributing-patches
-[4]: http://www.refactoring.com/catalog/extractVariable.html
+[variables]:        http://www.refactoring.com/catalog/extractVariable.html
-[5]: https://github.com/scrooloose/syntastic/wiki/Syntax-Checker-Guide
+[guide]:            https://github.com/scrooloose/syntastic/wiki/Syntax-Checker-Guide

sources_non_forked/syntastic/README.markdown

@@ -46,37 +46,38 @@
 
 ## 1\. Introduction
 
-Syntastic is a syntax checking plugin for [Vim][13] that runs files through
+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.
 
 At the time of this writing, syntastic has checking plugins for ActionScript,
-Ada, Ansible configurations, API Blueprint, AppleScript, AsciiDoc, ASM,
+Ada, Ansible configurations, API Blueprint, AppleScript, AsciiDoc, Assembly
-BEMHTML, Bro, Bourne shell, C, C++, C#, Cabal, Chef, CoffeeScript, Coco,
+languages, BEMHTML, Bro, Bourne shell, C, C++, C#, Cabal, Chef, CoffeeScript,
-Coq, CSS, Cucumber, CUDA, D, Dart, DocBook, Dockerfile, Dust, Elixir,
+Coco, Coq, CSS, Cucumber, CUDA, D, Dart, DocBook, Dockerfile, Dust, Elixir,
 Erlang, eRuby, Fortran, Gentoo metadata, GLSL, Go, Haml, Haskell, Haxe,
 Handlebars, HSS, HTML, Java, JavaScript, JSON, JSX, LESS, Lex, Limbo, LISP,
 LLVM intermediate language, Lua, Markdown, MATLAB, Mercury, NASM, Nix,
 Objective-C, Objective-C++, OCaml, Perl, Perl POD, PHP, gettext Portable
-Object, OS X and iOS property lists, Pug (formerly Jade), Puppet, Python, QML,
+Object, OS X and iOS property lists, Pug (formerly Jade), Puppet, Python,
-R, Racket, RDF TriG, RDF Turtle, Relax NG, reStructuredText, RPM spec, Ruby,
+QML, R, Racket, RDF TriG, RDF Turtle, Relax NG, reStructuredText, RPM spec,
-SASS/SCSS, Scala, Slim, SML, Sphinx, SQL, Stylus, Tcl, TeX, Texinfo, Twig,
+Ruby, SASS/SCSS, Scala, Slim, SML, Sphinx, SQL, Stylus, Tcl, TeX, Texinfo,
-TypeScript, Vala, Verilog, VHDL, VimL, xHtml, XML, XSLT, XQuery, YACC, YAML,
+Twig, TypeScript, Vala, Verilog, VHDL, VimL, xHtml, XML, XSLT, XQuery,
-YANG data models, z80, Zope page templates, and zsh. See the [wiki][3] for
+YACC, YAML, YANG data models, z80, Zope page templates, and Zsh. See the
-details about the corresponding supported checkers.
+[manual][checkers] for details about the corresponding supported checkers
+(`:help syntastic-checkers` in Vim).
 
 A number of third-party Vim plugins also provide checkers for syntastic,
-for example: [merlin][30], [omnisharp-vim][25], [rust.vim][12],
+for example: [merlin][merlin], [omnisharp-vim][omnisharp], [rust.vim][rust],
-[syntastic-extras][26], [syntastic-more][27], [vim-crystal][29],
+[syntastic-extras][myint], [syntastic-more][roktas], [vim-crystal][crystal],
-[vim-eastwood][28], and [vim-swift][24].
+[vim-eastwood][eastwood], and [vim-swift][swift].
 
 Below is a screenshot showing the methods that Syntastic uses to display syntax
 errors. Note that, in practise, you will only have a subset of these methods
 enabled.
 
-![Screenshot 1][0]
+![Screenshot 1][screenshot]
 
 1. Errors are loaded into the location list for the corresponding window.
 2. When the cursor is on a line containing an error, the error message is echoed in the command window.
@@ -94,7 +95,7 @@ enabled.
 ### 2.1\. Requirements
 
 Syntastic itself has rather relaxed requirements: it doesn't have any external
-dependencies, and it needs a version of [Vim][13] compiled with a few common
+dependencies, and it needs a version of [Vim][vim] compiled with a few common
 features: `autocmd`, `eval`, `file_in_path`, `modify_fname`, `quickfix`,
 `reltime`, and `user_commands`. Not all possible combinations of features that
 include the ones above make equal sense on all operating systems, but Vim
@@ -102,8 +103,8 @@ version 7 or later with the "normal", "big", or "huge" feature sets should be
 fine.
 
 Syntastic should work with any modern plugin managers for Vim, such as
-[NeoBundle][14], [Pathogen][1], [Vim-Addon-Manager][15], [Vim-Plug][16], or
+[NeoBundle][neobundle], [Pathogen][pathogen], [Vim-Addon-Manager][vam], [Vim-Plug][plug], or
-[Vundle][17]. Instructions for installing syntastic with [Pathogen][1] are
+[Vundle][vundle]. Instructions for installing syntastic with [Pathogen][pathogen] are
 included below for completeness.
 
 Starting with Vim version 7.4.1486 you can also load syntastic using the
@@ -115,20 +116,21 @@ syntastic is present only in versions 7.4.1486 and later.
 Last but not least: syntastic doesn't know how to do any syntax checks by
 itself. In order to get meaningful results you need to install external
 checkers corresponding to the types of files you use. Please consult the
-[wiki][3] for a list of supported checkers.
+[manual][checkers] (`:help syntastic-checkers` in Vim) for a list of supported
+checkers.
 
 <a name="installpathogen"></a>
 
 ### 2.2\. Installing syntastic with Pathogen
 
-If you already have [Pathogen][1] working then skip [Step 1](#step1) and go to
+If you already have [Pathogen][pathogen] working then skip [Step 1](#step1) and go to
 [Step 2](#step2).
 
 <a name="step1"></a>
 
 #### 2.2.1\. Step 1: Install pathogen.vim
 
-First I'll show you how to install Tim Pope's [Pathogen][1] so that it's easy to
+First I'll show you how to install Tim Pope's [Pathogen][pathogen] so that it's easy to
 install syntastic. Do this in your terminal so that you get the `pathogen.vim`
 file and the directories it needs:
 ```sh
@@ -155,7 +157,7 @@ Quit vim and start it back up to reload it, then type:
 :Helptags
 ```
 If you get an error when you do this, then you probably didn't install
-[Pathogen][1] right. Go back to [Step 1](#step1) and make sure you did the
+[Pathogen][pathogen] right. Go back to [Step 1](#step1) and make sure you did the
 following:
 
 1. Created both the `~/.vim/autoload` and `~/.vim/bundle` directories.
@@ -192,10 +194,11 @@ __4.1. Q. I installed syntastic but it isn't reporting any errors...__
 
 A. The most likely reason is that none of the syntax checkers that it requires
 are installed. For example: by default, python requires either `flake8` or
-`pylint` to be installed and in your `$PATH`. To see which executables are
+`pylint` to be installed and in your `$PATH`. Read the [manual][checkers]
-supported, look at the [wiki][3]. Note that aliases do not work; the actual
+(`:help syntastic-checkers` in Vim) to find out what executables are
-executables must be available in your `$PATH`. Symbolic links are okay though.
+supported. Note that aliases do not work; the actual executables must be
-You can see syntastic's idea of available checkers by running `:SyntasticInfo`.
+available in your `$PATH`. Symbolic links are okay though.  You can see
+syntastic's idea of available checkers by running `:SyntasticInfo`.
 
 A second probable reason is that none of the available checkers are
 enabled. Syntastic comes preconfigured with a default list of enabled checkers
@@ -222,7 +225,7 @@ on Windows.
 Finally, another reason it could fail is that either the command line options
 or the error output for a syntax checker may have changed. In this case, make
 sure you have the latest version of the syntax checker installed. If it still
-fails then post an [issue][4] - or better yet, create a pull request.
+fails then post an [issue][bug_tracker] - or better yet, create a pull request.
 
 <a name="faqpython3"></a>
 
@@ -238,18 +241,18 @@ let g:syntastic_python_python_exec = '/path/to/python3'
 
 __4.3. Q. Are there any local checkers for HTML5 that I can use with syntastic?__
 
-[HTML Tidy][18] has a fork named [HTML Tidy for HTML5][19]. It's a drop
+[HTML Tidy][tidy_old] has a fork named [HTML Tidy for HTML5][tidy]. It's a drop
 in replacement, and syntastic can use it without changes. Just install it
 somewhere and point `g:syntastic_html_tidy_exec` to its executable:
 ```vim
 let g:syntastic_html_tidy_exec = 'tidy5'
 ```
-Alternatively, you can install [vnu.jar][21] from the [validator.nu][20]
+Alternatively, you can install [vnu.jar][vnu_jar] from the [validator.nu][vnu]
-project and run it as a [HTTP server][23]:
+project and run it as a [HTTP server][vnu_server]:
 ```sh
 $ java -Xss512k -cp /path/to/vnu.jar nu.validator.servlet.Main 8888
 ```
-Then you can [configure][22] syntastic to use it:
+Then you can configure syntastic to use it:
 ```vim
 let g:syntastic_html_validator_api = 'http://localhost:8888/'
 ```
@@ -260,7 +263,7 @@ __4.4. Q. The `perl` checker has stopped working...__
 
 A. The `perl` checker runs `perl -c` against your file, which in turn
 __executes__ any `BEGIN`, `UNITCHECK`, and `CHECK` blocks, and any `use`
-statements in your file (cf. [perlrun][10]). This is probably fine if you
+statements in your file (cf. [perlrun][perlrun]). This is probably fine if you
 wrote the file yourself, but it's a security problem if you're checking
 third-party files. Since there is currently no way to disable this behaviour
 while still producing useful results, the checker is now disabled by default.
@@ -274,7 +277,7 @@ let g:syntastic_enable_perl_checker = 1
 
 __4.5. Q. What happened to the `rustc` checker?__
 
-A. It is now part of the [rust.vim][12] plugin. If you install this plugin the
+A. It is now part of the [rust.vim][rust] plugin. If you install this plugin the
 checker should be picked up automatically by syntastic.
 
 <a name="faqxcrun"></a>
@@ -282,7 +285,7 @@ checker should be picked up automatically by syntastic.
 __4.6. Q. What happened to the `xcrun` checker?__
 
 A. The `xcrun` checker used to have a security problem and it has been removed.
-A better checker for __Swift__ is part of the [vim-swift][24] plugin. If you
+A better checker for __Swift__ is part of the [vim-swift][swift] plugin. If you
 install this plugin the checker should be picked up automatically by syntastic.
 
 <a name="faqloclist"></a>
@@ -324,8 +327,8 @@ A. Stick a line like this in your `vimrc`:
 let g:syntastic_<filetype>_checkers = ['<checker-name>']
 ```
 
-To see the list of supported checkers for your filetype look at the
+To see the list of supported checkers for your filetype read the
-[wiki][3].
+[manual][checkers] (`:help syntastic-checkers` in Vim).
 
 e.g. Python has the following checkers, among others: `flake8`, `pyflakes`,
 `pylint` and a native `python` checker.
@@ -406,7 +409,7 @@ A. Vim provides several built-in commands for this. See `:help :lnext` and
 `:help :lprevious`.
 
 If you use these commands a lot then you may want to add shortcut mappings to
-your `vimrc`, or install something like [unimpaired][2], which provides such
+your `vimrc`, or install something like [unimpaired][unimpaired], which provides such
 mappings (among other things).
 
 <a name="faqbdelete"></a>
@@ -427,50 +430,50 @@ cabbrev <silent> bd <C-r>=(getcmdtype()==#':' && getcmdpos()==1 ? 'lclose\|bdele
 ## 5\. Resources
 
 The preferred place for posting suggestions, reporting bugs, and general
-discussions related to syntastic is the [issue tracker at GitHub][4].
+discussions related to syntastic is the [issue tracker at GitHub][bug_tracker].
-A guide for writing syntax checkers can be found in the [wiki][11].
+A guide for writing syntax checkers can be found in the [wiki][guide].
-There are also a dedicated [google group][5], and a
+There are also a dedicated [google group][google_group], and a
-[syntastic tag at StackOverflow][6].
+[syntastic tag at StackOverflow][stack_overflow].
 
 Syntastic aims to provide a common interface to syntax checkers for as many
 languages as possible. For particular languages, there are, of course, other
 plugins that provide more functionality than syntastic. You might want to take
-a look at [ghcmod-vim][31], [jedi-vim][7], [python-mode][8], [vim-go][32], or
+a look at [ghcmod-vim][ghcmod], [jedi-vim][jedi], [python-mode][python_mode], [vim-go][vimgo], or
-[YouCompleteMe][9].
+[YouCompleteMe][ycm].
 
-[0]: https://github.com/scrooloose/syntastic/raw/master/_assets/screenshot_1.png
+[screenshot]:       https://github.com/scrooloose/syntastic/raw/master/_assets/screenshot_1.png
-[1]: https://github.com/tpope/vim-pathogen
+
-[2]: https://github.com/tpope/vim-unimpaired
+[bug_tracker]:      https://github.com/scrooloose/syntastic/issues
-[3]: https://github.com/scrooloose/syntastic/wiki/Syntax-Checkers
+[checkers]:         https://github.com/scrooloose/syntastic/blob/master/doc/syntastic-checkers.txt
-[4]: https://github.com/scrooloose/syntastic/issues
+[crystal]:          https://github.com/rhysd/vim-crystal
-[5]: https://groups.google.com/group/vim-syntastic
+[eastwood]:         https://github.com/venantius/vim-eastwood
-[6]: http://stackoverflow.com/questions/tagged/syntastic
+[ghcmod]:           https://github.com/eagletmt/ghcmod-vim
-[7]: https://github.com/davidhalter/jedi-vim
+[google_group]:     https://groups.google.com/group/vim-syntastic
-[8]: https://github.com/klen/python-mode
+[guide]:            https://github.com/scrooloose/syntastic/wiki/Syntax-Checker-Guide
-[9]: http://valloric.github.io/YouCompleteMe/
+[jedi]:             https://github.com/davidhalter/jedi-vim
-[10]: http://perldoc.perl.org/perlrun.html#*-c*
+[merlin]:           https://github.com/the-lambda-church/merlin
-[11]: https://github.com/scrooloose/syntastic/wiki/Syntax-Checker-Guide
+[myint]:            https://github.com/myint/syntastic-extras
-[12]: https://github.com/rust-lang/rust.vim
+[neobundle]:        https://github.com/Shougo/neobundle.vim
-[13]: http://www.vim.org/
+[omnisharp]:        https://github.com/OmniSharp/omnisharp-vim
-[14]: https://github.com/Shougo/neobundle.vim
+[pathogen]:         https://github.com/tpope/vim-pathogen
-[15]: https://github.com/MarcWeber/vim-addon-manager
+[perlrun]:          http://perldoc.perl.org/perlrun.html#*-c*
-[16]: https://github.com/junegunn/vim-plug/
+[plug]:             https://github.com/junegunn/vim-plug/
-[17]: https://github.com/gmarik/Vundle.vim
+[python_mode]:      https://github.com/klen/python-mode
-[18]: http://tidy.sourceforge.net/
+[roktas]:           https://github.com/roktas/syntastic-more
-[19]: http://www.htacg.org/tidy-html5/
+[rust]:             https://github.com/rust-lang/rust.vim
-[20]: http://about.validator.nu/
+[stack_overflow]:   http://stackoverflow.com/questions/tagged/syntastic
-[21]: https://github.com/validator/validator/releases/latest
+[swift]:            https://github.com/kballard/vim-swift
-[22]: https://github.com/scrooloose/syntastic/wiki/HTML%3A---validator
+[tidy]:             http://www.htacg.org/tidy-html5/
-[23]: http://validator.github.io/validator/#standalone
+[tidy_old]:         http://tidy.sourceforge.net/
-[24]: https://github.com/kballard/vim-swift
+[unimpaired]:       https://github.com/tpope/vim-unimpaired
-[25]: https://github.com/OmniSharp/omnisharp-vim
+[vam]:              https://github.com/MarcWeber/vim-addon-manager
-[26]: https://github.com/myint/syntastic-extras
+[vim]:              http://www.vim.org/
-[27]: https://github.com/roktas/syntastic-more
+[vimgo]:            https://github.com/fatih/vim-go
-[28]: https://github.com/venantius/vim-eastwood
+[vnu]:              http://about.validator.nu/
-[29]: https://github.com/rhysd/vim-crystal
+[vnu_jar]:          https://github.com/validator/validator/releases/latest
-[30]: https://github.com/the-lambda-church/merlin
+[vnu_server]:       http://validator.github.io/validator/#standalone
-[31]: https://github.com/eagletmt/ghcmod-vim
+[vundle]:           https://github.com/gmarik/Vundle.vim
-[32]: https://github.com/fatih/vim-go
+[ycm]:              http://valloric.github.io/YouCompleteMe/
 
 <!--
 vim:tw=79:sw=4:

sources_non_forked/syntastic/autoload/syntastic/preprocess.vim

@@ -357,6 +357,54 @@ function! syntastic#preprocess#stylelint(errors) abort " {{{2
     return out
 endfunction " }}}2
 
+function! syntastic#preprocess#tern_lint(errors) abort " {{{2
+    let errs = join(a:errors, '')
+    let json = s:_decode_JSON(errs)
+
+echomsg string(json)
+    let out = []
+    if type(json) == type({}) && has_key(json, 'messages') && type(json['messages']) == type([])
+        for e in json['messages']
+            try
+                let line_from = byte2line(e['from'] + 1)
+                if line_from > 0
+                    let line = line_from
+                    let column = e['from'] - line2byte(line_from) + 2
+                    let line_to = byte2line(e['from'] + 1)
+                    let hl = line_to == line ? e['to'] - line2byte(line_to) + 1 : 0
+                else
+                    let line = 0
+                    let column = 0
+                    let hl = 0
+                endif
+
+                if column < 0
+                    let column = 0
+                endif
+                if hl < 0
+                    let hl = 0
+                endif
+
+                call add(out,
+                    \ e['file'] . ':' .
+                    \ e['severity'][0] . ':' .
+                    \ line . ':' .
+                    \ column . ':' .
+                    \ hl . ':' .
+                    \ e['message'])
+            catch /\m^Vim\%((\a\+)\)\=:E716/
+                call syntastic#log#warn('checker javascript/tern_lint: unrecognized error item ' . string(e))
+                let out = []
+            endtry
+        endfor
+    else
+        call syntastic#log#warn('checker javascript/tern_lint: unrecognized error format')
+    endif
+
+echomsg string(out)
+    return out
+endfunction " }}}2
+
 function! syntastic#preprocess#tslint(errors) abort " {{{2
     return map(copy(a:errors), 'substitute(v:val, ''\m^\(([^)]\+)\)\s\(.\+\)$'', ''\2 \1'', "")')
 endfunction " }}}2

sources_non_forked/syntastic/autoload/syntastic/util.vim

@@ -37,13 +37,19 @@ function! syntastic#util#system(command) abort " {{{2
     let $LC_MESSAGES = 'C'
     let $LC_ALL = ''
 
+    let cmd_start = reltime()
     let out = system(a:command)
+    let cmd_time = split(reltimestr(reltime(cmd_start)))[0]
 
     let $LC_ALL = old_lc_all
     let $LC_MESSAGES = old_lc_messages
 
     let &shell = old_shell
 
+    if exists('g:_SYNTASTIC_DEBUG_TRACE')
+        call syntastic#log#debug(g:_SYNTASTIC_DEBUG_TRACE, 'system: command run in ' . cmd_time . 's')
+    endif
+
     return out
 endfunction " }}}2
 

sources_non_forked/syntastic/doc/syntastic.txt

@@ -76,9 +76,7 @@ syntax checker plugins are defined on a per-filetype basis where each one wraps
 up an external syntax checking program. The core script delegates off to these
 plugins and uses their output to provide the syntastic functionality.
 
-Take a look at the wiki for a list of supported filetypes and checkers:
+Take a look at the list of supported filetypes and checkers: |syntastic-checkers|.
-
-    https://github.com/scrooloose/syntastic/wiki/Syntax-Checkers
 
 Note: This doc only deals with using syntastic. To learn how to write syntax
 checker integrations, see the guide on the GitHub wiki:
@@ -563,7 +561,7 @@ option should be set to something like: >
         \ "file:p":  ['\m^/usr/include/', '\m\c\.h$'] }
 <
 Each element turns off messages matching the patterns specified by the
-corresponding value. Values are lists, but if a list consist of a single
+corresponding value. Values are lists, but if a list consists of a single
 element you may omit the brackets (e.g. you may write "style" instead of
 ["style"]). Elements with values [] or "" are ignored (this is useful for
 overriding filters, cf. |filter-overrides|).
@@ -751,10 +749,8 @@ If neither |'g:syntastic_<filetype>_checkers'| nor |'b:syntastic_checkers'|
 is set, a default list of checker is used. Beware however that this list
 deliberately kept minimal, for performance reasons.
 
-Take a look at the wiki to find out what checkers and filetypes are supported
+Take a look elsewhere in this manual to find out what checkers and filetypes
-by syntastic:
+are supported by syntastic: |syntastic-checkers|.
-
-    https://github.com/scrooloose/syntastic/wiki/Syntax-Checkers
 
 Use `:SyntasticInfo` to see which checkers are available for a given filetype.
 
@@ -848,9 +844,8 @@ omitting the filename from the command line: >
                                             *syntastic-config-no-makeprgbuild*
 For checkers that do not use the "makeprgBuild()" function you will have to
 look at the source code of the checker in question. If there are specific
-options that can be set, they are normally documented in the wiki:
+options that can be set they are normally documented in this manual (see
-
+|syntastic-checkers|).
-    https://github.com/scrooloose/syntastic/wiki/Syntax-Checkers
 
 ------------------------------------------------------------------------------
 5.4 Sorting errors                                     *syntastic-config-sort*

sources_non_forked/syntastic/plugin/syntastic.vim

@@ -19,7 +19,7 @@ if has('reltime')
     lockvar! g:_SYNTASTIC_START
 endif
 
-let g:_SYNTASTIC_VERSION = '3.7.0-137'
+let g:_SYNTASTIC_VERSION = '3.7.0-153'
 lockvar g:_SYNTASTIC_VERSION
 
 " Sanity checks {{{1
@@ -522,7 +522,7 @@ function! SyntasticMake(options) abort " {{{2
     let env_save = {}
     if has_key(a:options, 'env') && len(a:options['env'])
         for key in keys(a:options['env'])
-            if key =~? '\m^[a-z_]\+$'
+            if key =~? '\m^[a-z_][a-z0-9_]*$'
                 execute 'let env_save[' . string(key) . '] = $' . key
                 execute 'let $' . key . ' = ' . string(a:options['env'][key])
             endif

sources_non_forked/syntastic/plugin/syntastic/checker.vim

@@ -91,6 +91,7 @@ function! g:SyntasticChecker.getExecEscaped() abort " {{{2
 endfunction " }}}2
 
 function! g:SyntasticChecker.getLocListRaw() abort " {{{2
+    let checker_start = reltime()
     let name = self._filetype . '/' . self._name
 
     if has_key(self, '_enable')
@@ -128,6 +129,8 @@ function! g:SyntasticChecker.getLocListRaw() abort " {{{2
     call self._populateHighlightRegexes(list)
     call syntastic#log#debug(g:_SYNTASTIC_DEBUG_LOCLIST, name . ' raw:', list)
     call self._quietMessages(list)
+    call syntastic#log#debug(g:_SYNTASTIC_DEBUG_TRACE,
+        \ 'getLocList: checker ' . name . ' run in ' . split(reltimestr(reltime(checker_start)))[0] . 's')
     return list
 endfunction " }}}2
 

sources_non_forked/syntastic/syntax_checkers/ansible/ansible_lint.vim

@@ -28,7 +28,9 @@ endfunction
 function! SyntaxCheckers_ansible_ansible_lint_GetLocList() dict
     let makeprg = self.makeprgBuild({ 'args_after': '-p' })
 
-    let errorformat = '%f:%l: [ANSIBLE%n] %m'
+    let errorformat =
+        \ '%f:%l: [EANSIBLE%n] %m,' .
+        \ '%f:%l: [ANSIBLE%n] %m'
 
     let env = syntastic#util#isRunningWindows() ? {} : { 'TERM': 'dumb' }
 

sources_non_forked/syntastic/syntax_checkers/cpp/clang_check.vim

@@ -17,7 +17,6 @@ let g:loaded_syntastic_cpp_clang_check_checker = 1
 call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'filetype': 'cpp',
     \ 'name': 'clang_check',
-    \ 'exec': 'clang-check',
     \ 'redirect': 'c/clang_check'})
 
 " vim: set sw=4 sts=4 et fdm=marker:

sources_non_forked/syntastic/syntax_checkers/cpp/clang_tidy.vim

@@ -17,7 +17,6 @@ let g:loaded_syntastic_cpp_clang_tidy_checker = 1
 call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'filetype': 'cpp',
     \ 'name': 'clang_tidy',
-    \ 'exec': 'clang-tidy',
     \ 'redirect': 'c/clang_tidy'})
 
 " vim: set sw=4 sts=4 et fdm=marker:

sources_non_forked/syntastic/syntax_checkers/cpp/pc_lint.vim

@@ -18,7 +18,6 @@ let g:loaded_syntastic_cpp_pc_lint_checker = 1
 call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'filetype': 'cpp',
     \ 'name': 'pc_lint',
-    \ 'exec': 'lint-nt',
     \ 'redirect': 'c/pc_lint'})
 
 " vim: set sw=4 sts=4 et fdm=marker:

sources_non_forked/syntastic/syntax_checkers/cuda/nvcc.vim

@@ -10,19 +10,41 @@ if exists('g:loaded_syntastic_cuda_nvcc_checker')
 endif
 let g:loaded_syntastic_cuda_nvcc_checker = 1
 
+if !exists('g:syntastic_cuda_config_file')
+    let g:syntastic_cuda_config_file = '.syntastic_cuda_config'
+endif
+
 let s:save_cpo = &cpo
 set cpo&vim
 
 function! SyntaxCheckers_cuda_nvcc_GetLocList() dict
-    if syntastic#util#var('cuda_arch') !=# ''
+    let arch_flag = syntastic#util#var('cuda_arch')
-        let arch_flag = '-arch=' . g:syntastic_cuda_arch
+    if arch_flag !=# ''
-    else
+        let arch_flag = '-arch=' . arch_flag
-        let arch_flag = ''
+        call syntastic#log#oneTimeWarn('variable g:syntastic_cuda_arch is deprecated, ' .
+            \ 'please add ' . string(arch_flag) . ' to g:syntastic_cuda_nvcc_args instead')
     endif
-    let makeprg =
+
-        \ self.getExecEscaped() . ' ' . arch_flag .
+    let build_opts = {}
-        \ ' --cuda -O0 -I . -Xcompiler -fsyntax-only ' .
+    let dummy = ''
-        \ syntastic#util#shexpand('%') . ' ' . syntastic#c#NullOutput()
+    if index(['h', 'hpp', 'cuh'], expand('%:e', 1), 0, 1) >= 0
+        if syntastic#util#var('cuda_check_header', 0)
+            let dummy = expand('%:p:h', 1) . syntastic#util#Slash() . '.syntastic_dummy.cu'
+            let build_opts = {
+                \ 'exe_before': 'echo > ' . syntastic#util#shescape(dummy) . ' ;',
+                \ 'fname_before': '.syntastic_dummy.cu -include' }
+        else
+            return []
+        endif
+    endif
+
+    call extend(build_opts, {
+        \ 'args_before': arch_flag . ' --cuda -O0 -I .',
+        \ 'args': syntastic#c#ReadConfig(g:syntastic_cuda_config_file),
+        \ 'args_after': '-Xcompiler -fsyntax-only',
+        \ 'tail_after': syntastic#c#NullOutput() })
+
+    let makeprg = self.makeprgBuild(build_opts)
 
     let errorformat =
         \ '%*[^"]"%f"%*\D%l: %m,'.
@@ -40,19 +62,13 @@ function! SyntaxCheckers_cuda_nvcc_GetLocList() dict
         \ '%DMaking %*\a in %f,'.
         \ '%f|%l| %m'
 
-    if index(['h', 'hpp', 'cuh'], expand('%:e', 1), 0, 1) >= 0
+    let loclist = SyntasticMake({ 'makeprg': makeprg, 'errorformat': errorformat })
-        if syntastic#util#var('cuda_check_header', 0)
+
-            let makeprg =
+    if dummy !=# ''
-                \ 'echo > .syntastic_dummy.cu ; ' .
+        call delete(dummy)
-                \ self.getExecEscaped() . ' ' . arch_flag .
-                \ ' --cuda -O0 -I . .syntastic_dummy.cu -Xcompiler -fsyntax-only -include ' .
-                \ syntastic#util#shexpand('%') . ' ' . syntastic#c#NullOutput()
-        else
-            return []
-        endif
     endif
 
-    return SyntasticMake({ 'makeprg': makeprg, 'errorformat': errorformat })
+    return loclist
 endfunction
 
 call g:SyntasticRegistry.CreateAndRegisterChecker({

sources_non_forked/syntastic/syntax_checkers/html/eslint.vim

@@ -0,0 +1,23 @@
+"============================================================================
+"File:        eslint.vim
+"Description: Syntax checking plugin for syntastic
+"Maintainer:  LCD 47 <lcd047 at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_html_eslint_checker')
+    finish
+endif
+let g:loaded_syntastic_html_eslint_checker = 1
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'html',
+    \ 'name': 'eslint',
+    \ 'redirect': 'javascript/eslint'})
+
+" vim: set sw=4 sts=4 et fdm=marker:

sources_non_forked/syntastic/syntax_checkers/javascript/tern_lint.vim

@@ -0,0 +1,53 @@
+"============================================================================
+"File:        tern_lint.vim
+"Description: Syntax checking plugin for syntastic
+"Maintainer:  LCD 47 <lcd047@gmail.com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"============================================================================
+
+if exists('g:loaded_syntastic_javascript_tern_lint_checker')
+    finish
+endif
+let g:loaded_syntastic_javascript_tern_lint_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_javascript_tern_lint_IsAvailable() dict
+    return has('byte_offset') && executable(self.getExec())
+endfunction
+
+function! SyntaxCheckers_javascript_tern_lint_GetLocList() dict
+    let makeprg = self.makeprgBuild({})
+
+    let errorformat = '%f:%t:%l:%c:%n:%m'
+
+    let loclist = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'preprocess': 'tern_lint',
+        \ 'returns': [0] })
+
+    for e in loclist
+        if get(e, 'col', 0) && get(e, 'nr', 0)
+            let e['hl'] = '\%>' . (e['col'] - 1) . 'c\%<' . (e['nr'] + 1) . 'c'
+        endif
+        let e['nr'] = 0
+    endfor
+
+    return loclist
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'javascript',
+    \ 'name': 'tern_lint',
+    \ 'exec': 'tern-lint' })
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:

sources_non_forked/syntastic/syntax_checkers/racket/racket.vim

@@ -42,7 +42,8 @@ endfunction
 
 call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'filetype': 'racket',
-    \ 'name': 'racket'})
+    \ 'name': 'racket',
+    \ 'enable': 'enable_racket_racket_checker' })
 
 let &cpo = s:save_cpo
 unlet s:save_cpo

sources_non_forked/syntastic/syntax_checkers/sass/sass_lint.vim

@@ -0,0 +1,51 @@
+"============================================================================
+"File:        sass_lint.vim
+"Description: Syntax checking plugin for syntastic
+"Maintainer:  LCD 47 <lcd047 at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_sass_sass_lint_checker')
+    finish
+endif
+let g:loaded_syntastic_sass_sass_lint_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_sass_sass_lint_IsAvailable() dict
+    if !executable(self.getExec())
+        return 0
+    endif
+    return syntastic#util#versionIsAtLeast(self.getVersion(), [1, 5])
+endfunction
+
+function! SyntaxCheckers_sass_sass_lint_GetLocList() dict
+    let makeprg = self.makeprgBuild({
+        \ 'args': '-v',
+        \ 'args_after': '-q -f compact' })
+
+    let errorformat =
+        \ '%f: line %l\, col %c\, %trror - %m,' .
+        \ '%f: line %l\, col %c\, %tarning - %m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'returns': [0, 1] })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'sass',
+    \ 'name': 'sass_lint',
+    \ 'exec': 'sass-lint' })
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:

sources_non_forked/syntastic/syntax_checkers/scss/sass_lint.vim

@@ -0,0 +1,23 @@
+"============================================================================
+"File:        sass_lint.vim
+"Description: Syntax checking plugin for syntastic
+"Maintainer:  LCD 47 <lcd047 at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_scss_sass_lint_checker')
+    finish
+endif
+let g:loaded_syntastic_scss_sass_lint_checker = 1
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'scss',
+    \ 'name': 'sass_lint',
+    \ 'redirect': 'sass/sass_lint'})
+
+" vim: set sw=4 sts=4 et fdm=marker:

sources_non_forked/syntastic/syntax_checkers/vala/valac.vim

@@ -41,35 +41,37 @@ endfunction " }}}1
 " Utilities {{{1
 
 function! s:GetValaModules() " {{{2
-    if exists('g:syntastic_vala_modules')
+    if exists('g:syntastic_vala_modules') || exists('b:syntastic_vala_modules')
-        if type(g:syntastic_vala_modules) == type('')
+        let modules = syntastic#util#var('vala_modules')
-            return split(g:syntastic_vala_modules, '\s\+')
+        if type(modules) == type('')
-        elseif type(g:syntastic_vala_modules) == type([])
+            return split(modules, '\m\s\+')
-            return copy(g:syntastic_vala_modules)
+        elseif type(modules) == type([])
+            return copy(modules)
         else
-            echoerr 'g:syntastic_vala_modules must be either list or string: fallback to in file modules string'
+            echoerr 'syntastic_vala_modules must be either list or string: fallback to in file modules string'
         endif
     endif
 
     let modules_line = search('^// modules: ', 'n')
     let modules_str = getline(modules_line)
-    return split(strpart(modules_str, 12), '\s\+')
+    return split(strpart(modules_str, 12), '\m\s\+')
 endfunction " }}}2
 
 function! s:GetValaVapiDirs() " {{{2
-    if exists('g:syntastic_vala_vapi_dirs')
+    if exists('g:syntastic_vala_vapi_dirs') || exists('b:syntastic_vala_vapi_dirs')
-        if type(g:syntastic_vala_vapi_dirs) == type('')
+        let vapi_dirs = syntastic#util#var('vala_vapi_dirs')
-            return split(g:syntastic_vala_vapi_dirs, '\s\+')
+        if type(vapi_dirs) == type('')
-        elseif type(g:syntastic_vala_vapi_dirs) == type([])
+            return split(vapi_dirs, '\m\s\+')
-            return copy(g:syntastic_vala_vapi_dirs)
+        elseif type(vapi_dirs) == type([])
+            return copy(vapi_dirs)
         else
-            echoerr 'g:syntastic_vala_vapi_dirs must be either a list, or a string: fallback to in-file modules string'
+            echoerr 'syntastic_vala_vapi_dirs must be either a list, or a string: fallback to in-file modules string'
         endif
     endif
 
     let vapi_line = search('^//\s*vapidirs:\s*','n')
     let vapi_str = getline(vapi_line)
-    return split( substitute( vapi_str, '^//\s*vapidirs:\s*', '', 'g' ), '\s\+' )
+    return split( substitute( vapi_str, '\m^//\s*vapidirs:\s*', '', 'g' ), '\m\s\+' )
 endfunction " }}}2
 
 " }}}1

sources_non_forked/syntastic/syntax_checkers/vim/vimlint.vim

@@ -67,9 +67,10 @@ function! SyntaxCheckers_vim_vimlint_GetLocList() dict " {{{1
         \ 'EVL204': 3,
         \ 'EVL205': 3 }
 
-    if exists('g:syntastic_vimlint_options')
+    if exists('g:syntastic_vimlint_options') || exists('b:syntastic_vimlint_options')
-        if type(g:syntastic_vimlint_options) == type({})
+        let opts = syntastic#util#var('vimlint_options')
-            let options = filter(copy(g:syntastic_vimlint_options), 'v:key =~# "\\m^EVL"')
+        if type(opts) == type({})
+            let options = filter(copy(opts), 'v:key =~# "\\m^EVL"')
             call extend(param, options, 'force')
         endif
     endif

sources_non_forked/vim-fugitive/plugin/fugitive.vim

@@ -1116,7 +1116,7 @@ endfunction
 
 function! s:CommitComplete(A,L,P) abort
   if a:A =~ '^-' || type(a:A) == type(0) " a:A is 0 on :Gcommit -<Tab>
-    let args = ['-C', '-F', '-a', '-c', '-e', '-i', '-m', '-n', '-o', '-q', '-s', '-t', '-u', '-v', '--all', '--allow-empty', '--amend', '--author=', '--cleanup=', '--dry-run', '--edit', '--file=', '--include', '--interactive', '--message=', '--no-verify', '--only', '--quiet', '--reedit-message=', '--reuse-message=', '--signoff', '--template=', '--untracked-files', '--verbose']
+    let args = ['-C', '-F', '-a', '-c', '-e', '-i', '-m', '-n', '-o', '-q', '-s', '-t', '-u', '-v', '--all', '--allow-empty', '--amend', '--author=', '--cleanup=', '--dry-run', '--edit', '--file=', '--fixup=', '--include', '--interactive', '--message=', '--no-verify', '--only', '--quiet', '--reedit-message=', '--reuse-message=', '--signoff', '--squash=', '--template=', '--untracked-files', '--verbose']
     return filter(args,'v:val[0 : strlen(a:A)-1] ==# a:A')
   else
     return s:repo().superglob(a:A)
@@ -2840,7 +2840,7 @@ function! s:cfile() abort
       elseif getline('.') =~# '^#\trenamed:.* -> '
         let file = '/'.matchstr(getline('.'),' -> \zs.*')
         return [file]
-      elseif getline('.') =~# '^#\t[[:alpha:] ]\+: *.'
+      elseif getline('.') =~# '^#\t\(\k\| \)\+: *.'
         let file = '/'.matchstr(getline('.'),': *\zs.\{-\}\ze\%( ([^()[:digit:]]\+)\)\=$')
         return [file]
       elseif getline('.') =~# '^#\t.'

sources_non_forked/vim-go/CHANGELOG.md

@@ -1,25 +1,61 @@
-## 1.7 (unreleased)
+## 1.8 (unplanned)
+
+IMPROVEMENTS:
+
+* `:GoDoc` accepts arguments now which are passed directly to `godoc`. So usages like `:GoDoc flag` works again (it was changed in previous versions [gh-894]
+* `:GoDef` works now for modified files as well [gh-910]
+* Internal: fix indentations on all files to **2-spaces/no tabs**. This is now the default vim-go style across all VimL files [gh-915]
+
+BUG FIXES:
+
+* Escape `#` characters when opening URL's, as it's handled as alternative file in vim [gh-895]
+* Fix typos in `doc/vim-go.txt` about usages of syntax highglightings [gh-897]
+* Fix `:GoCoverage` not running for Neovim [gh-899]
+* Fix `:GoFmt` not picking up `-srcdir` if the command was set to use `goimports` [gh-904]
+* Fix `:GoTestCompile` to not leave behind artifacts if the cwd and the test files's directory do not match [gh-909]
+
+## 1.7.1 (June 7, 2016)
+
+BUG FIXES:
+* Fixed typo in `syntax/go.vim` file from `go:go_highlight_fields` to `g:go_highlight_fields`
+
+## 1.7 (June 7, 2016)
 
 FEATURES:
 
 * New **`:GoImpl`** command that generates method stubs for implementing an interface. Checkout the [demo](https://twitter.com/fatih/status/729991365581545472) to see how it works. [gh-846]
+* `godef` support is added back as an optional setting.  By default `:GoDef` still uses `guru`, but can be changed to `godef` by adding the option: `let g:go_def_mode = 'godef'` [gh-888]
 * New `<C-w><C-]>` and `<C-w>]>` shortcuts to split current window and jumpt to the identifier under cursor. [gh-838]
+* New syntax setting" `g:go_highlight_fields` that highlights struct field references [gh-854]
 
 IMPROVEMENTS:
 
+* Invoking `:GoRename` now reloads all files to reflect new changes automatically [gh-855]
+* Calling `:GoTestCompile` does not create any temporary binary file anymore [gh-879]
 * Enable passing the `-tags` flag to `:GoDef`. Now you can pass build tags to `:GoDef` via `:GoGuruTags` or `g:go_guru_tags`
 * Internal refactoring to use custom `system()` function that wraps both the standard `system()` call and `vimproc`. Now all system calls will take advantage and will use `vimproc` if installed. [gh-801]
+* Completion enables now `gocode`'s `autobuild` and `propose-builtins` flags automatically. With these settings packages will be automatically build to get the freshest completion candidates and builtin keywords will be showed as well. By defaults these settings are enabled. Settings can be disabled/enabled via `g:go_gocode_autobuild` and `g:go_gocode_propose_builtins`. [gh-815]
 * Added new `http.HandlerFunc` snippets with `hf` and `hhf` shortcuts [gh-816]
 * Added new `Example` and `Benchmark` snippets with `example` and `benchmark` shortcuts [gh-836]
 * Search tool binaries first in `GOBIN` and then in `PATH` as most of vim-go users installs it to `GOBIN` mostly [gh-823]
+* Improve `guru` based commands by providing automatically detected GOPATHS, such as `gb`, `godep` to be used if possible [gh-861]
+* Add `<Plug>(go-imports)` mapping to make it assignable to other keys [gh-878]
+* Increase compatibility with tcsh [gh-869]
+* Improve `:GoInstallBinaries` for GOPATH's which don't have packages that work well with `go get -u`. We have a new `g:go_get_update` setting to disable it. By default it's enabled. [gh-883]
+
+
 
 BUG FIXES:
 * Fix `(go-freevars)` plug mapping to work as in visual mode instead of noncompatible normal mode [gh-832]
 * Commands based on guru now shows a more meaningful error message instead of just showing the exit status (-1)
 * Fix `:GoCoverage` accidently enabling syntax highlighting for users who don't use syntax (i.e syntax off) [gh-827]
+* Fix `:GoCoverage` colors to work for xterm as well [gh-863]
 * Fix commenting out block of texts for Go templates (filetype gothtmltmpl) [gh-813]
 * Fix `:GoImplements` failing because of an empty scope definition. Now we default to current package to make it usable.
 * Fix `:GoPlay` posting to non HTTPS url. [gh-847]
+* Fix escaping the filenames for lint and motion commands [gh-862]
+* Fix escaping the filename to `:GoDef` completely for tcsh [gh-868]
+* Fix showing SUCCESS for `go test` related commands if no test files are available [gh-859]
 
 
 

sources_non_forked/vim-go/README.md

@@ -180,6 +180,7 @@ To change it:
 ```vim
 let g:go_highlight_functions = 1
 let g:go_highlight_methods = 1
+let g:go_highlight_fields = 1
 let g:go_highlight_structs = 1
 let g:go_highlight_interfaces = 1
 let g:go_highlight_operators = 1
@@ -218,6 +219,11 @@ let g:go_bin_path = expand("~/.gotools")
 let g:go_bin_path = "/home/fatih/.mypath"      "or give absolute path
 ```
 
+Disable updating dependencies when installing/updating binaries:
+```vim
+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

sources_non_forked/vim-go/autoload/ctrlp/decls.vim

@@ -156,3 +156,4 @@ function! ctrlp#decls#cmd(mode, ...)
   return s:id
 endfunction
 
+" vim: sw=2 ts=2 et

sources_non_forked/vim-go/autoload/go/alternate.vim

@@ -28,3 +28,5 @@ function! go#alternate#Switch(bang, cmd)
     execute ":" . a:cmd . " " . alt_file
   endif
 endfunction
+
+" vim: sw=2 ts=2 et

sources_non_forked/vim-go/autoload/go/asmfmt.vim

@@ -50,3 +50,5 @@ function! go#asmfmt#Format()
   " Restore the cursor/window positions.
   call winrestview(l:curw)
 endfunction
+
+" vim: sw=2 ts=2 et

sources_non_forked/vim-go/autoload/go/cmd.vim

@@ -188,15 +188,18 @@ endfunction
 function! go#cmd#Test(bang, compile, ...)
   let args = ["test"]
 
-    " don't run the test, only compile it. Useful to capture and fix errors or
+  " don't run the test, only compile it. Useful to capture and fix errors.
-    " to create a test binary.
   if a:compile
-        call add(args, "-c")
+    let compile_file = "vim-go-test-compile"
+    call extend(args, ["-c", "-o", compile_file])
   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 = go#util#Shelllist(goargs, 1)
+    endif
 
     call extend(args, goargs, 1)
   else
@@ -217,6 +220,11 @@ function! go#cmd#Test(bang, compile, ...)
     else
       let id = go#jobcontrol#Spawn(a:bang, "test", args)
     endif
+
+    if a:compile
+      call go#jobcontrol#AddHandler(function('s:test_compile_handler'))
+      let s:test_compile_handlers[id] = compile_file
+    endif
     return id
   endif
 
@@ -224,21 +232,21 @@ function! go#cmd#Test(bang, compile, ...)
   redraw
 
   let command = "go " . join(args, ' ')
-
   let out = go#tool#ExecuteInDir(command)
 
   let l:listtype = "quickfix"
 
-    if go#util#ShellError() != 0
   let cd = exists('*haslocaldir') && haslocaldir() ? 'lcd ' : 'cd '
   let dir = getcwd()
-        try
   execute cd fnameescape(expand("%:p:h"))
+
+  if a:compile
+    call delete(compile_file)
+  endif
+
+  if go#util#ShellError() != 0
     let errors = go#tool#ParseErrors(split(out, '\n'))
     let errors = go#tool#FilterValids(errors)
-        finally
-            execute cd . fnameescape(dir)
-        endtry
 
     call go#list#Populate(l:listtype, errors)
     call go#list#Window(l:listtype, len(errors))
@@ -259,6 +267,7 @@ function! go#cmd#Test(bang, compile, ...)
       echon "vim-go: " | echohl Function | echon "[test] PASS" | echohl None
     endif
   endif
+  execute cd . fnameescape(dir)
 endfunction
 
 " Testfunc runs a single test that surrounds the current cursor position.
@@ -332,4 +341,19 @@ function! go#cmd#Generate(bang, ...)
   let $GOPATH = old_gopath
 endfunction
 
-" vim:ts=4:sw=4:et
+
+" -----------------------
+" | Neovim job handlers |
+" -----------------------
+let s:test_compile_handlers = {}
+
+function! s:test_compile_handler(job, exit_status, data)
+  if !has_key(s:test_compile_handlers, a:job.id)
+    return
+  endif
+  let l:compile_file = s:test_compile_handlers[a:job.id]
+  call delete(l:compile_file)
+  unlet s:test_compile_handlers[a:job.id]
+endfunction
+
+" vim: sw=2 ts=2 et

sources_non_forked/vim-go/autoload/go/complete.vim

@@ -1,9 +1,4 @@
-if !exists("g:go_gocode_bin")
+function! s:gocodeCurrentBuffer()
-    let g:go_gocode_bin = "gocode"
-endif
-
-
-fu! s:gocodeCurrentBuffer()
   let buf = getline(1, '$')
   if &encoding != 'utf-8'
     let buf = map(buf, 'iconv(v:val, &encoding, "utf-8")')
@@ -17,9 +12,9 @@ fu! s:gocodeCurrentBuffer()
   call writefile(buf, file)
 
   return file
-endf
+endfunction
 
-fu! s:gocodeCommand(cmd, preargs, args)
+function! s:gocodeCommand(cmd, preargs, args)
   for i in range(0, len(a:args) - 1)
     let a:args[i] = go#util#Shellescape(a:args[i])
   endfor
@@ -27,7 +22,7 @@ fu! s:gocodeCommand(cmd, preargs, args)
     let a:preargs[i] = go#util#Shellescape(a:preargs[i])
   endfor
 
-    let bin_path = go#path#CheckBinPath(g:go_gocode_bin)
+  let bin_path = go#path#CheckBinPath("gocode")
   if empty(bin_path)
     return
   endif
@@ -49,20 +44,43 @@ fu! s:gocodeCommand(cmd, preargs, args)
     endif
     return result
   endif
-endf
+endfunction
 
-fu! s:gocodeCurrentBufferOpt(filename)
+function! s:gocodeCurrentBufferOpt(filename)
   return '-in=' . a:filename
-endf
+endfunction
+
+let s:optionsEnabled = 0
+function! s:gocodeEnableOptions()
+  if s:optionsEnabled 
+    return
+  endif
+
+  let bin_path = go#path#CheckBinPath("gocode")
+  if empty(bin_path)
+    return
+  endif
+
+  let s:optionsEnabled = 1
+
+  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))))
+endfunction
+
+function! s:toBool(val)
+  if a:val | return 'true ' | else | return 'false' | endif
+endfunction
+
+function! s:gocodeAutocomplete()
+  call s:gocodeEnableOptions()
 
-fu! s:gocodeAutocomplete()
   let filename = s:gocodeCurrentBuffer()
   let result = s:gocodeCommand('autocomplete',
         \ [s:gocodeCurrentBufferOpt(filename), '-f=vim'],
         \ [expand('%:p'), go#util#OffsetCursor()])
   call delete(filename)
   return result
-endf
+endfunction
 
 function! go#complete#GetInfo()
   let offset = go#util#OffsetCursor()+1
@@ -120,7 +138,7 @@ function! s:trim_bracket(val)
   return a:val
 endfunction
 
-fu! go#complete#Complete(findstart, base)
+function! go#complete#Complete(findstart, base)
   "findstart = 1 when we need to get the text length
   if a:findstart == 1
     execute "silent let g:gocomplete_completions = " . s:gocodeAutocomplete()
@@ -135,4 +153,4 @@ fu! go#complete#Complete(findstart, base)
   endif
 endf
 
-" vim:ts=4:sw=4:et
+" vim: sw=2 ts=2 et

sources_non_forked/vim-go/autoload/go/coverage.vim

@@ -28,6 +28,19 @@ function! go#coverage#Buffer(bang, ...)
     return -1
   endif
 
+  " check if there is any test file, if not we just return
+  let cd = exists('*haslocaldir') && haslocaldir() ? 'lcd ' : 'cd '
+  let dir = getcwd()
+  try
+    execute cd . fnameescape(expand("%:p:h"))
+    if empty(glob("*_test.go"))
+      call go#util#EchoError("no tests files available")
+      return
+    endif
+  finally
+    execute cd . fnameescape(dir)
+  endtry
+
   let s:toggle = 1
   let l:tmpname = tempname()
   let args = [a:bang, 0, "-coverprofile", l:tmpname]
@@ -221,9 +234,9 @@ function! go#coverage#overlay(file)
   endfor
 
   syntax manual
-    highlight normaltext term=bold ctermfg=59 guifg=#75715E
+  highlight normaltext term=bold ctermfg=darkgrey guifg=#75715E
-    highlight covered term=bold ctermfg=118 guifg=#A6E22E
+  highlight covered term=bold ctermfg=green guifg=#A6E22E
-    highlight uncover term=bold ctermfg=197 guifg=#F92672
+  highlight uncover term=bold ctermfg=red guifg=#F92672
 
   " clear the matches if we leave the buffer
   autocmd BufWinLeave <buffer> call go#coverage#Clear()
@@ -269,5 +282,4 @@ 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
-" vim:ts=4:sw=4:et

sources_non_forked/vim-go/autoload/go/def.vim

@@ -2,24 +2,60 @@ let s:go_stack = []
 let s:go_stack_level = 0
 
 function! go#def#Jump(mode)
-	let bin_path = go#path#CheckBinPath("guru")
-	if empty(bin_path)
-		return
-	endif
-
   let old_gopath = $GOPATH
   let $GOPATH = go#path#Detect()
 
+  let fname = fnamemodify(expand("%"), ':p:gs?\\?/?')
+  if &modified
+    " Write current unsaved buffer to a temp file and use the modified content
+    let l:tmpname = tempname()
+    call writefile(getline(1, '$'), l:tmpname)
+    let fname = l:tmpname
+  endif
+
+  " so guru right now is slow for some people. previously we were using
+  " godef which also has it's own quirks. But this issue come up so many
+  " times I've decided to support both. By default we still use guru as it
+  " covers all edge cases, but now anyone can switch to godef if they wish
+  let bin_name = get(g:, 'go_def_mode', 'guru')
+  if bin_name == 'godef'
+    let bin_path = go#path#CheckBinPath("godef")
+    if empty(bin_path)
+      let $GOPATH = old_gopath
+      return
+    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'), ':')
+  elseif bin_name == 'guru'
+    let bin_path = go#path#CheckBinPath("guru")
+    if empty(bin_path)
+      let $GOPATH = old_gopath
+      return
+    endif
+
     let flags = ""
     if exists('g:go_guru_tags')
       let tags = get(g:, 'go_guru_tags')
       let flags = printf(" -tags %s", tags)
     endif
 
-	let fname = fnamemodify(expand("%"), ':p:gs?\\?/?')
+    let fname = shellescape(fname.':#'.go#util#OffsetCursor())
-	let command = printf("%s %s definition %s:#%s", bin_path, flags, shellescape(fname), go#util#OffsetCursor())
+    let command = printf("%s %s definition %s", bin_path, flags, fname)
-
     let out = go#util#System(command)
+  else
+    call go#util#EchoError('go_def_mode value: '. bin_name .' is not valid. Valid values are: [godef, guru]')
+    return
+  endif
+
+  if exists("l:tmpname")
+    call delete(l:tmpname)
+  endif
+
   if go#util#ShellError() != 0
     call go#util#EchoError(out)
     return
@@ -200,3 +236,4 @@ function! go#def#Stack(...)
   endif
 endfunction
 
+" vim: sw=2 ts=2 et

sources_non_forked/vim-go/autoload/go/doc.vim

@@ -77,6 +77,15 @@ function! go#doc#OpenBrowser(...)
 endfunction
 
 function! go#doc#Open(newmode, mode, ...)
+  if len(a:000)
+    " check if we have 'godoc' and use it automatically
+    let bin_path = go#path#CheckBinPath('godoc')
+    if empty(bin_path)
+      return
+    endif
+
+    let command = printf("%s %s", bin_path, join(a:000, ' '))
+  else
     " check if we have 'gogetdoc' and use it automatically
     let bin_path = go#path#CheckBinPath('gogetdoc')
     if empty(bin_path)
@@ -84,9 +93,11 @@ function! go#doc#Open(newmode, mode, ...)
     endif
 
     let offset = go#util#OffsetCursor()
-    let fname = expand("%:p")
+    let fname = expand("%:p:gs!\\!/!")
+    let pos = shellescape(fname.':#'.offset)
 
-    let command = printf("%s -pos %s:#%s", bin_path, fname, offset)
+    let command = printf("%s -pos %s", bin_path, pos)
+  endif
 
   let out = go#util#System(command)
   if go#util#ShellError() != 0
@@ -134,10 +145,11 @@ function! s:GodocView(newposition, position, content)
   call append(0, split(a:content, "\n"))
   sil $delete _
   setlocal nomodifiable
+  sil normal! gg
 
   " close easily with <esc> or enter
   noremap <buffer> <silent> <CR> :<C-U>close<CR>
   noremap <buffer> <silent> <Esc> :<C-U>close<CR>
 endfunction
 
-" vim:ts=2:sw=2:et
+" vim: sw=2 ts=2 et

sources_non_forked/vim-go/autoload/go/fmt.vim

@@ -86,41 +86,36 @@ function! go#fmt#Format(withGoimport)
   endif
 
   " get the command first so we can test it
-    let fmt_command = g:go_fmt_command
+  let bin_name = g:go_fmt_command
   if a:withGoimport  == 1
-        let fmt_command  = g:go_goimports_bin
+    let bin_name  = g:go_goimports_bin
   endif
 
   " check if the user has installed command binary.
   " For example if it's goimports, let us check if it's installed,
   " if not the user get's a warning via go#path#CheckBinPath()
-    let bin_path = go#path#CheckBinPath(fmt_command)
+  let bin_path = go#path#CheckBinPath(bin_name)
   if empty(bin_path)
     return
   endif
 
-    if fmt_command != "gofmt"
+  if bin_name != "gofmt"
     " change GOPATH too, so goimports can pick up the correct library
     let old_gopath = $GOPATH
     let $GOPATH = go#path#Detect()
-
-        let fmt_command = bin_path
   endif
 
   " populate the final command with user based fmt options
-    let command = fmt_command . ' -w '
+  let command = bin_path . ' -w '
   if a:withGoimport  != 1
     let command  = command . g:go_fmt_options
   endif
 
-    if fmt_command == "goimports"
+  if bin_name == "goimports"
     if !exists('b:goimports_vendor_compatible')
-            let out = go#util#System("goimports --help")
+      let out = go#util#System(bin_path . " --help")
       if out !~ "-srcdir"
-                echohl WarningMsg
+        call go#util#EchoWarning("vim-go: goimports does not support srcdir. update with: :GoUpdateBinaries")
-                echomsg "vim-go: goimports does not support srcdir."
-                echomsg "  update with: :GoUpdateBinaries"
-                echohl None
       else
         let b:goimports_vendor_compatible = 1
       endif
@@ -140,7 +135,7 @@ function! go#fmt#Format(withGoimport)
   endif
   let out = go#util#System(command . " " . l:tmpname)
 
-    if fmt_command != "gofmt"
+  if bin_name != "gofmt"
     let $GOPATH = old_gopath
   endif
 
@@ -212,5 +207,4 @@ function! go#fmt#Format(withGoimport)
   endif
 endfunction
 
-
+" vim: sw=2 ts=2 et
-" vim:ts=4:sw=4:et

sources_non_forked/vim-go/autoload/go/guru.vim

@@ -74,7 +74,8 @@ func! s:RunGuru(mode, format, selected, needs_scope) range abort
   endif
 
   " this is our final command
-    let command .= printf(' %s %s:%s', a:mode, shellescape(filename), pos)
+  let filename .= ':'.pos
+  let command .= printf(' %s %s', a:mode, shellescape(filename))
 
   let old_gopath = $GOPATH
   let $GOPATH = go#path#Detect()
@@ -300,4 +301,4 @@ function! go#guru#SameIds(selected)
   echo same_ids
 endfunction
 
-" vim:ts=4:sw=4:et
+" vim: sw=2 ts=2 et

sources_non_forked/vim-go/autoload/go/impl.vim

@@ -122,3 +122,5 @@ function! go#impl#Complete(arglead, cmdline, cursorpos)
     return []
   endif
 endfunction
+
+" vim: sw=2 ts=2 et

sources_non_forked/vim-go/autoload/go/import.vim

@@ -210,4 +210,4 @@ function! s:Error(s)
 endfunction
 
 
-" vim:ts=4:sw=4:et
+" vim: sw=2 ts=2 et

sources_non_forked/vim-go/autoload/go/jobcontrol.vim

@@ -115,6 +115,11 @@ endfunction
 " it'll be closed.
 function! s:on_exit(job_id, exit_status)
   let std_combined = self.stderr + self.stdout
+
+  let cd = exists('*haslocaldir') && haslocaldir() ? 'lcd ' : 'cd '
+  let dir = getcwd()
+  execute cd self.dir
+
   call s:callback_handlers_on_exit(s:jobs[a:job_id], a:exit_status, std_combined)
 
   if a:exit_status == 0
@@ -123,21 +128,18 @@ function! s:on_exit(job_id, exit_status)
 
     let self.state = "SUCCESS"
     call go#util#EchoSuccess("SUCCESS")
+
+    execute cd . fnameescape(dir)
     return
   endif
 
   let self.state = "FAILED"
   call go#util#EchoError("FAILED")
 
-  let cd = exists('*haslocaldir') && haslocaldir() ? 'lcd ' : 'cd '
-  let dir = getcwd()
-  try
-    execute cd self.dir
   let errors = go#tool#ParseErrors(std_combined)
   let errors = go#tool#FilterValids(errors)
-  finally
+
   execute cd . fnameescape(dir)
-  endtry
 
   if !len(errors)
     " failed to parse errors, output the original content
@@ -209,4 +211,4 @@ function! s:abort(path)
   endfor
 endfunction
 
-" vim:ts=2:sw=2:et
+" vim: sw=2 ts=2 et

sources_non_forked/vim-go/autoload/go/lint.vim

@@ -24,7 +24,7 @@ endif
 
 function! go#lint#Gometa(autosave, ...) abort
   if a:0 == 0
-        let goargs = expand('%:p:h')
+    let goargs = shellescape(expand('%:p:h'))
   else
     let goargs = go#util#Shelljoin(a:000)
   endif
@@ -196,4 +196,4 @@ function! go#lint#Errcheck(...) abort
 
 endfunction
 
-" vim:ts=4:sw=4:et
+" vim: sw=2 ts=2 et

sources_non_forked/vim-go/autoload/go/list.vim

@@ -123,4 +123,4 @@ function! go#list#Type(listtype)
   endif
 endfunction
 
-" vim:ts=4:sw=4:et
+" vim: sw=2 ts=2 et

sources_non_forked/vim-go/autoload/go/package.vim

@@ -46,7 +46,7 @@ function! go#package#Paths()
     let dirs += [s:goroot]
   endif
 
-    let workspaces = split($GOPATH, go#util#PathListSep())
+  let workspaces = split(go#path#Detect(), go#util#PathListSep())
   if workspaces != []
     let dirs += workspaces
   endif
@@ -157,4 +157,4 @@ function! go#package#Complete(ArgLead, CmdLine, CursorPos)
     return sort(keys(ret))
 endfunction
 
-" vim:sw=4:et
+" vim: sw=2 ts=2 et

sources_non_forked/vim-go/autoload/go/path.vim

@@ -151,6 +151,9 @@ function! go#path#CheckBinPath(binpath)
 
     " if it's in PATH just return it
     if executable(binpath)
+        if v:version == 704 && has('patch235')
+            let binpath = exepath(binpath)
+        endif
         let $PATH = old_path
         return binpath
     endif
@@ -169,4 +172,4 @@ function! go#path#CheckBinPath(binpath)
     return go_bin_path . go#util#PathSep() . basename
 endfunction
 
-" vim:ts=4:sw=4:et
+" vim: sw=2 ts=2 et

sources_non_forked/vim-go/autoload/go/play.vim

@@ -90,5 +90,4 @@ function! s:get_browser_command()
   return go_play_browser_command
 endfunction
 
-
+" vim: sw=2 ts=2 et
-" vim:ts=4:sw=4:et

sources_non_forked/vim-go/autoload/go/rename.vim

@@ -36,6 +36,15 @@ function! go#rename#Rename(bang, ...)
 
   let out = go#tool#ExecuteInDir(cmd)
 
+  " 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
+  " about the autoread bug
+  let current_autoread = &autoread
+  set autoread
+  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')
@@ -65,5 +74,4 @@ function! go#rename#Rename(bang, ...)
   silent execute ":e"
 endfunction
 
-" vim:ts=4:sw=4:et
+" vim: sw=2 ts=2 et
-"

sources_non_forked/vim-go/autoload/go/term.vim

@@ -135,4 +135,4 @@ function! s:on_exit(job_id, exit_status)
     unlet s:jobs[a:job_id]
 endfunction
 
-" vim:ts=4:sw=4:et
+" vim: sw=2 ts=2 et

sources_non_forked/vim-go/autoload/go/textobj.vim

@@ -16,7 +16,7 @@ endif
 function! go#textobj#Function(mode)
   let offset = go#util#OffsetCursor()
 
-  let fname = expand("%:p")
+  let fname = shellescape(expand("%:p"))
   if &modified
     " Write current unsaved buffer to a temp file and use the modified content
     let l:tmpname = tempname()
@@ -103,7 +103,7 @@ function! go#textobj#FunctionJump(mode, direction)
 
   let offset = go#util#OffsetCursor()
 
-  let fname = expand("%:p")
+  let fname = shellescape(expand("%:p"))
   if &modified
     " Write current unsaved buffer to a temp file and use the modified content
     let l:tmpname = tempname()
@@ -177,4 +177,4 @@ function! go#textobj#FunctionJump(mode, direction)
   keepjumps call cursor(info.func.line, 1)
 endfunction
 
-" vim:ts=2:sw=2:et
+" vim: sw=2 ts=2 et

sources_non_forked/vim-go/autoload/go/tool.vim

@@ -1,19 +1,21 @@
 function! go#tool#Files()
   if go#util#IsWin()
-        let command = 'go list -f "{{range $f := .GoFiles}}{{$.Dir}}\{{$f}}{{printf \"\n\"}}{{end}}{{range $f := .CgoFiles}}{{$.Dir}}\{{$f}}{{printf \"\n\"}}{{end}}"'
+    let format = '{{range $f := .GoFiles}}{{$.Dir}}\{{$f}}{{printf \"\n\"}}{{end}}{{range $f := .CgoFiles}}{{$.Dir}}\{{$f}}{{printf \"\n\"}}{{end}}'
   else
-        let command = "go list -f '{{range $f := .GoFiles}}{{$.Dir}}/{{$f}}{{printf \"\\n\"}}{{end}}{{range $f := .CgoFiles}}{{$.Dir}}/{{$f}}{{printf \"\\n\"}}{{end}}'"
+    let format = "{{range $f := .GoFiles}}{{$.Dir}}/{{$f}}{{printf \"\\n\"}}{{end}}{{range $f := .CgoFiles}}{{$.Dir}}/{{$f}}{{printf \"\\n\"}}{{end}}"
   endif
+  let command = 'go list -f '.shellescape(format)
   let out = go#tool#ExecuteInDir(command)
   return split(out, '\n')
 endfunction
 
 function! go#tool#Deps()
   if go#util#IsWin()
-        let command = 'go list -f "{{range $f := .Deps}}{{$f}}{{printf \"\n\"}}{{end}}"'
+    let format = '{{range $f := .Deps}}{{$f}}{{printf \"\n\"}}{{end}}'
   else
-        let command = "go list -f $'{{range $f := .Deps}}{{$f}}\n{{end}}'"
+    let format = "{{range $f := .Deps}}{{$f}}\n{{end}}"
   endif
+  let command = 'go list -f '.shellescape(format)
   let out = go#tool#ExecuteInDir(command)
   return split(out, '\n')
 endfunction
@@ -21,10 +23,11 @@ endfunction
 function! go#tool#Imports()
   let imports = {}
   if go#util#IsWin()
-        let command = 'go list -f "{{range $f := .Imports}}{{$f}}{{printf \"\n\"}}{{end}}"'
+    let format = '{{range $f := .Imports}}{{$f}}{{printf \"\n\"}}{{end}}'
   else
-        let command = "go list -f $'{{range $f := .Imports}}{{$f}}\n{{end}}'"
+    let format = "{{range $f := .Imports}}{{$f}}{{printf \"\\n\"}}{{end}}"
   endif
+  let command = 'go list -f '.shellescape(format)
   let out = go#tool#ExecuteInDir(command)
   if go#util#ShellError() != 0
     echo out
@@ -32,7 +35,7 @@ function! go#tool#Imports()
   endif
 
   for package_path in split(out, '\n')
-        let cmd = "go list -f {{.Name}} " . package_path
+    let cmd = "go list -f '{{.Name}}' " . shellescape(package_path)
     let package_name = substitute(go#tool#ExecuteInDir(cmd), '\n$', '', '')
     let imports[package_name] = package_path
   endfor
@@ -168,10 +171,10 @@ function! go#tool#OpenBrowser(url)
         return
     endif
     if cmd =~ '^!'
-        let cmd = substitute(cmd, '%URL%', '\=shellescape(a:url)', 'g')
+        let cmd = substitute(cmd, '%URL%', '\=escape(shellescape(a:url),"#")', 'g')
         silent! exec cmd
     elseif cmd =~ '^:[A-Z]'
-        let cmd = substitute(cmd, '%URL%', '\=a:url', 'g')
+        let cmd = substitute(cmd, '%URL%', '\=escape(a:url,"#")', 'g')
         exec cmd
     else
         let cmd = substitute(cmd, '%URL%', '\=shellescape(a:url)', 'g')
@@ -179,4 +182,4 @@ function! go#tool#OpenBrowser(url)
     endif
 endfunction
 
-" vim:ts=4:sw=4:et
+" vim: sw=2 ts=2 et

sources_non_forked/vim-go/autoload/go/ui.vim

@@ -87,7 +87,7 @@ function! go#ui#OpenDefinition(filter)
 
   " don't touch our first line or any blank line
   if curline =~ a:filter || curline =~ "^$"
-        " supress information about calling this function
+    " suppress information about calling this function
     echo ""
     return
   endif
@@ -111,3 +111,4 @@ function! go#ui#OpenDefinition(filter)
   norm! zz
 endfunction
 
+" vim: sw=2 ts=2 et

sources_non_forked/vim-go/autoload/go/util.vim

@@ -206,4 +206,4 @@ function! go#util#EchoProgress(msg)
     redraws! | echon "vim-go: " | echohl Identifier | echon a:msg | echohl None
 endfunction
 
-" vim:ts=4:sw=4:et
+" vim: sw=2 ts=2 et

sources_non_forked/vim-go/compiler/go.vim

@@ -38,4 +38,4 @@ CompilerSet errorformat+=%-G%.%#                      " All lines not matching a
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim:ts=4:sw=4:et
+" vim: sw=2 ts=2 et

sources_non_forked/vim-go/doc/vim-go.txt

@@ -439,7 +439,8 @@ CTRL-t
 :GoInstallBinaries
 
     Download and Install all necessary Go tool binaries such as `godef`,
-    `goimports`, `gocode`, etc.. under `g:go_bin_path`
+    `goimports`, `gocode`, etc.. under `g:go_bin_path`. Set |g:go_get_update|
+    to disable updating dependencies.
 
                                                           *:GoUpdateBinaries*
 :GoUpdateBinaries
@@ -631,6 +632,7 @@ CTRL-t
       :GoImpl T io.ReadWriteCloser
 <
   
+
 ===============================================================================
 MAPPINGS                                                        *go-mappings*
 
@@ -672,17 +674,14 @@ Calls `go build` for the current package
 
 Calls `go generate` for the current package
 
-
                                                                  *(go-info)*
 
 Shows type information for the word under the cursor
 
-
                                                               *(go-install)*
 
 Calls `go install` for the current package
 
-
                                                                  *(go-test)*
 
 Calls `go test` for the current package
@@ -710,6 +709,10 @@ Calls `go test -coverprofile-temp.out` for the current package and shows the
 coverage annotation. If run agains it acts as a toggle and clears the
 annotation.
 
+                                                                *(go-imports)*
+
+Calls `goimports` for the current package
+
                                                                   *(go-vet)*
 
 Calls `go vet` for the current package
@@ -834,6 +837,11 @@ Alternates between the implementation and test code in a new horizontal split
 
 Alternates between the implementation and test code in a new vertical split
 
+                                                                *(go-import)*
+
+Calls `:GoImport` for the current package
+
+
 ===============================================================================
 TEXT OBJECTS                                                 *go-text-objects*
 
@@ -973,6 +981,14 @@ K , keywordprg shortcut. Usually this shortcut is set to use the program `man`.
 In Go, using `godoc` is more idiomatic. Default is enabled. >
 
   let g:go_doc_keywordprg_enabled = 1
+<
+                                                            *'g:go_def_mode'*
+
+Use this option to define the command to be used for |:GoDef|. By default
+`guru` is being used as it covers all edge cases. But one might also use
+`godef` as it's more faster. Current valid options are: `[guru, godef]` >
+
+  let g:go_def_mode = 'guru'
 <
                                                  *'g:go_def_mapping_enabled'*
 
@@ -1028,6 +1044,14 @@ is used. Use "neosnippet" for neosnippet.vim: >
   let g:go_snippet_engine = "ultisnips"
 <
 
+                                                         *'g:go_get_update'*
+
+Use this option to disable updating dependencies with |GoInstallBinaries|. By
+default this is enabled.
+>
+  let g:go_get_update = 1
+<
+
                                                          *'g:go_guru_scope'*
 
 Use this option to define the scope of the analysis to be passed for guru
@@ -1099,6 +1123,12 @@ Highlights method names. By default it's disabled. >
 Highlights struct names. By default it's disabled. >
 
   let g:go_highlight_structs = 0
+<
+                                                  *'g:go_highlight_fields'*
+
+Highlights field names. By default it's disabled. >
+
+  let g:go_highlight_fields = 0
 <
                                                *'g:go_highlight_interfaces'*
 
@@ -1243,10 +1273,24 @@ By default it is set to edit.
                                                        *g:go_gorename_prefill*
 
 Specifies whether |:GoRename| prefills the new identifier name with the
-word under the cursor. By default is is enabled.
+word under the cursor. By default it is enabled.
 >
   let g:go_gorename_prefill = 1
 <
+                                                       *g:go_gocode_autobuild*
+
+Specifies whether `gocode` should automatically build out-of-date packages
+when their source fiels are modified, in order to obtahin the freshes
+autocomplete results for them.  By default it is enabled.
+>
+  let g:go_gocode_autobuild = 1
+<
+                                                *g:go_gocode_propose_builtins*
+
+Specifies whether `gocode` should add built-in types, functions and constants
+to an autocompletion proposals. By default it is enabled.
+>
+  let g:go_gocode_propose_builtins = 1
 
 
 ===============================================================================

sources_non_forked/vim-go/ftdetect/gofiletype.vim

@@ -28,4 +28,4 @@ au BufReadPost *.s call s:gofiletype_post()
 
 au BufRead,BufNewFile *.tmpl set filetype=gohtmltmpl
 
-" vim:ts=4:sw=4:et
+" vim: sw=2 ts=2 et

sources_non_forked/vim-go/ftplugin/asm.vim

@@ -15,3 +15,5 @@ setlocal commentstring=//\ %s
 setlocal noexpandtab
 
 command! -nargs=0 AsmFmt call go#asmfmt#Format()
+
+" vim: sw=2 ts=2 et

sources_non_forked/vim-go/ftplugin/go.vim

@@ -60,4 +60,4 @@ if get(g:, "go_auto_type_info", 0)
   setlocal updatetime=800
 endif
 
-" vim:ts=4:sw=4:et
+" vim: sw=2 ts=2 et

sources_non_forked/vim-go/ftplugin/go/commands.vim

@@ -76,4 +76,4 @@ endif
 " -- impl
 command! -nargs=* -buffer -complete=customlist,go#impl#Complete GoImpl call go#impl#Impl(<f-args>)
 
-" vim:ts=4:sw=4:et
+" vim: sw=2 ts=2 et

sources_non_forked/vim-go/ftplugin/go/mappings.vim

@@ -33,6 +33,7 @@ nnoremap <silent> <Plug>(go-files) :<C-u>call go#tool#Files()<CR>
 nnoremap <silent> <Plug>(go-deps) :<C-u>call go#tool#Deps()<CR>
 nnoremap <silent> <Plug>(go-info) :<C-u>call go#complete#Info(0)<CR>
 nnoremap <silent> <Plug>(go-import) :<C-u>call go#import#SwitchImport(1, '', expand('<cword>'), '')<CR>
+nnoremap <silent> <Plug>(go-imports) :<C-u>call go#fmt#Format(1)<CR>
 
 nnoremap <silent> <Plug>(go-implements) :<C-u>call go#guru#Implements(-1)<CR>
 nnoremap <silent> <Plug>(go-callees) :<C-u>call go#guru#Callees(-1)<CR>
@@ -69,3 +70,5 @@ nnoremap <silent> <Plug>(go-vet) :<C-u>call go#lint#Vet(!g:go_jump_to_error)<CR>
 nnoremap <silent> <Plug>(go-alternate-edit) :<C-u>call go#alternate#Switch(0, "edit")<CR>
 nnoremap <silent> <Plug>(go-alternate-vertical) :<C-u>call go#alternate#Switch(0, "vsplit")<CR>
 nnoremap <silent> <Plug>(go-alternate-split) :<C-u>call go#alternate#Switch(0, "split")<CR>
+
+" vim: sw=2 ts=2 et

sources_non_forked/vim-go/ftplugin/go/snippets.vim

@@ -44,3 +44,5 @@ if g:go_snippet_engine == "ultisnips"
 elseif g:go_snippet_engine == "neosnippet"
   call s:GoNeosnippet()
 endif
+
+" vim: sw=2 ts=2 et

sources_non_forked/vim-go/ftplugin/go/tagbar.vim

@@ -53,3 +53,5 @@ endfunction
 
 
 call s:SetTagbar()
+
+" vim: sw=2 ts=2 et

sources_non_forked/vim-go/ftplugin/gohtmltmpl.vim

@@ -4,3 +4,5 @@ endif
 let b:did_ftplugin = 1
 
 setlocal commentstring=<!--\ %s\ -->
+
+" vim: sw=2 ts=2 et

sources_non_forked/vim-go/gosnippets/snippets/go.snip

@@ -311,7 +311,6 @@ func Example${1:Method}() {
 		${0}
 		// Output:
 	}
-endsnippet
 # test benchmark
 snippet benchmark
 	func Benchmark${1:Method}(b *testing.B) {
@@ -319,7 +318,6 @@ func Benchmark${1:Method}(b *testing.B) {
 			${0}
 		}
 	}
-endsnippet
 # variable declaration
 snippet var
 abbr var x Type [= ...]

sources_non_forked/vim-go/indent/go.vim

@@ -75,4 +75,4 @@ function! GoIndent(lnum)
   return ind
 endfunction
 
-" vim:ts=4:sw=4:et
+" vim: sw=2 ts=2 et

sources_non_forked/vim-go/indent/gohtmltmpl.vim

@@ -42,3 +42,5 @@ function! GetGoHTMLTmplIndent(lnum)
 
   return ind
 endfunction
+
+" vim: sw=2 ts=2 et

sources_non_forked/vim-go/plugin/go.vim

@@ -13,6 +13,7 @@ let s:packages = [
       \ "golang.org/x/tools/cmd/guru",
       \ "golang.org/x/tools/cmd/gorename",
       \ "github.com/golang/lint/golint",
+      \ "github.com/rogpeppe/godef",
       \ "github.com/kisielk/errcheck",
       \ "github.com/jstemmer/gotags",
       \ "github.com/klauspost/asmfmt/cmd/asmfmt",
@@ -65,7 +66,10 @@ function! s:GoInstallBinaries(updateBinaries)
     set noshellslash
   endif
 
-    let cmd = "go get -u -v "
+  let cmd = "go get -v "
+  if get(g:, "go_get_update", 1) != 0
+    let cmd .= "-u "
+  endif
 
   let s:go_version = matchstr(go#util#System("go version"), '\d.\d.\d')
 
@@ -169,5 +173,4 @@ augroup vim-go
   endif
 augroup END
 
-
+" vim: sw=2 ts=2 et
-" vim:ts=4:sw=4:et

sources_non_forked/vim-go/syntax/go.vim

@@ -67,6 +67,10 @@ if !exists("g:go_highlight_methods")
   let g:go_highlight_methods = 0
 endif
 
+if !exists("g:go_highlight_fields")
+  let g:go_highlight_fields = 0
+endif
+
 if !exists("g:go_highlight_structs")
   let g:go_highlight_structs = 0
 endif
@@ -308,6 +312,12 @@ if g:go_highlight_methods != 0
 endif
 hi def link     goMethod            Type
 
+" Fields;
+if g:go_highlight_fields != 0
+  syn match goField                 /\(\.\)\@<=\a\+\([\ \n\r\:\)]\)\@=/
+endif
+hi def link    goField              Type
+
 " Structs;
 if g:go_highlight_structs != 0
   syn match goStruct                /\(.\)\@<=\w\+\({\)\@=/
@@ -366,3 +376,5 @@ endif
 syn sync minlines=500
 
 let b:current_syntax = "go"
+
+" vim: sw=2 ts=2 et

sources_non_forked/vim-go/syntax/godefstack.vim

@@ -16,3 +16,5 @@ hi def link godefStackComment           Comment
 hi def link godefStackCurrentPosition   Special
 hi def link godefStackFilename          Directory
 hi def link godefStackEntryLocationNumber LineNr
+
+" vim: sw=2 ts=2 et

sources_non_forked/vim-go/syntax/gohtmltmpl.vim

@@ -12,4 +12,4 @@ unlet b:current_syntax
 
 let b:current_syntax = "gohtmltmpl"
 
-" vim:ts=4:sw=4:et
+" vim: sw=2 ts=2 et

sources_non_forked/vim-go/syntax/gotexttmpl.vim

@@ -82,4 +82,4 @@ hi def link goTplComment Comment
 
 let b:current_syntax = "gotexttmpl"
 
-" vim:ts=4:sw=4:et
+" vim: sw=2 ts=2 et

sources_non_forked/vim-go/syntax/vimgo.vim

@@ -9,3 +9,5 @@ syn region  goTitle start="\%1l" end=":"
 
 hi def link goInterface Type
 hi def link goTitle Label
+
+" vim: sw=2 ts=2 et

sources_non_forked/vim-multiple-cursors/README.md

@@ -199,10 +199,21 @@ highlight link multiple_cursors_visual Visual
 
 ## FAQ
 
-**Q** <kbd>CTRL</kbd>+<kbd>n</kbd> doesn't seem to work in gVIM?
+#### **Q** <kbd>CTRL</kbd>+<kbd>n</kbd> doesn't seem to work in gVIM?
 
 **A** Try setting `set selection=inclusive` in your `~/.gvimrc`
 
+#### **Q** How can I select `n` keywords with several keystrokes? I have tried `200<C-n>` which does not work.
+
+**A** You can use :MultipleCursorsFind keyword. I have this binding in my vimrc:
+
+```VimL
+nnoremap <silent> <M-j> :MultipleCursorsFind <C-R>/<CR>
+vnoremap <silent> <M-j> :MultipleCursorsFind <C-R>/<CR>
+```
+
+This allows one to a) search for the keyword using `*` b) turn search results into cursors with `Alt-j`.
+
 ## Known Issues
 - Select mode is not implemented
 

sources_non_forked/vim-snipmate/Contributors.md

@@ -14,6 +14,7 @@ additional contributions from:
 * [asymmetric](https://github.com/asymmetric)
 * [bpugh](https://github.com/bpugh)
 * [bruno-](https://github.com/bruno-)
+* [CharlesGueunet](https://github.com/CharlesGueunet)
 * [darkwise](https://github.com/darkwise)
 * [dreviejo](https://github.com/dreviejo)
 * [fish-face](https://github.com/fish-face)
@@ -40,6 +41,7 @@ additional contributions from:
 * [redpill](https://github.com/redpill)
 * [rglassett](http://github.com/rglassett)
 * [robhudson](https://github.com/robhudson)
+* [shinymayhem](https://github.com/shinymayhem)
 * [Shraymonks](https://github.com/shraymonks)
 * [sickill](https://github.com/sickill)
 * [statik](https://github.com/statik)

sources_non_forked/vim-snipmate/README.md

@@ -87,7 +87,7 @@ languages. For this we provide two options: scope aliases and the
 `:SnipMateLoadScope` command. Scope aliases simply say "whenever this scope is
 loaded, also load this other scope:
 
-    let g:snipMate = {}
+    let g:snipMate = get(g:, 'snipMate', {}) " Allow for vimrc re-sourcing
     let g:snipMate.scope_aliases = {}
     let g:snipMate.scope_aliases['ruby'] = 'ruby,rails'
 
@@ -98,6 +98,16 @@ does `:SnipMateLoadScope rails` when editing a Rails project for example.
 
 ## Release Notes ##
 
+### 0.89 - 2016-05-29 ###
+
+* Various regex updates to legacy parser
+* Addition of double bang syntax to completely remove a snippet from lookup
+* Group various SnipMate autocommands
+* Support setting 'shiftwidth' to 0
+* Parser now operates linewise, adding some flexibility
+* Mirror substitutions are more literal
+* Mirror length is calculated correctly when substitutions occur
+
 ### 0.88 - 2015-04-04 ###
 
 * Implement simple caching

sources_non_forked/vim-snipmate/autoload/snipMate.vim

@@ -28,7 +28,8 @@ 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 = snipMate#sniplist_str(snippet, b:snip_state.stops)
+		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)
@@ -77,11 +78,11 @@ function! snipMate#expandSnip(snip, version, col) abort
 endfunction
 
 function! snipMate#placeholder_str(num, stops) abort
-	return snipMate#sniplist_str(a:stops[a:num].placeholder, a:stops)[0]
+	return snipMate#sniplist_str(a:stops[a:num].placeholder, a:stops)
 endfunction
 
 function! snipMate#sniplist_str(snippet, stops) abort
-	let lines = ['']
+	let str = ''
 	let pos = 0
 	let add_to = 1
 	let seen_stops = []
@@ -90,110 +91,82 @@ function! snipMate#sniplist_str(snippet, stops) abort
 		let item = a:snippet[pos]
 
 		if type(item) == type('')
-			if add_to
+			let str .= item
-				let lines[-1] .= item
-			else
-				call add(lines, item)
-			endif
-			let add_to = 0
 		elseif type(item) == type([])
-			let lines[-1] .= snipMate#placeholder_str(item[0], a:stops)
+			let str .= snipMate#placeholder_str(item[0], a:stops)
-			let add_to = 1
 		endif
 
 		let pos += 1
 		unlet item " avoid E706
 	endwhile
 
-	return lines
+	return str
 endfunction
 
 function! s:build_stops(snippet, stops, lnum, col, indent) abort
 	let stops = a:stops
-	let line  = a:lnum
+	let lnum  = a:lnum
 	let col   = a:col
 
-	for [id, dict] in items(stops)
+	for line in a:snippet
-		for i in dict.instances
+		let col = s:build_loc_info(line, stops, lnum, col, [])
-			if len(i) > 1 && type(i[1]) != type({})
+		if line isnot a:snippet[-1]
-				if !has_key(dict, 'placeholder')
+			let lnum += 1
-					let dict.placeholder = i[1:]
+			let col = a:indent
-				else
-					unlet i[1:]
-				endif
 		endif
 	endfor
-		if !has_key(dict, 'placeholder')
-			let dict.placeholder = []
-			let j = 0
-			while len(dict.instances[j]) > 1
-				let j += 1
-			endwhile
-			call add(dict.instances[j], '')
-		endif
-		unlet dict.instances
-	endfor
-
-	let [line, col] = s:build_loc_info(a:snippet, stops, line, col, a:indent)
 
 	" add zero tabstop if it doesn't exist and then link it to the highest stop
 	" number
 	let stops[0] = get(stops, 0,
-				\ { 'placeholder' : [], 'line' : line, 'col' : col })
+				\ { 'placeholder' : [], 'line' : lnum, 'col' : col })
 	let stop_count = max(keys(stops)) + 2
 	let stops[stop_count - 1] = stops[0]
 
 	return stop_count
 endfunction
 
-function! s:build_loc_info(snippet, stops, line, col, indent) abort
+function! s:build_loc_info(snippet, stops, lnum, col, seen_items) abort
 	let stops   = a:stops
-	let line    = a:line
+	let lnum    = a:lnum
 	let col     = a:col
 	let pos     = 0
 	let in_text = 0
+	let seen_items = a:seen_items
 
-	while pos < len(a:snippet)
+	for item in a:snippet
-		let item = a:snippet[pos]
-
 		if type(item) == type('')
-			if in_text
-				let line += 1
-				let col = a:indent
-			endif
 			let col += len(item)
-			let in_text = 1
 		elseif type(item) == type([])
 			let id = item[0]
-			if len(item) > 1 && type(item[1]) != type({})
+			let stub = item[-1]
-				let stops[id].line = line
+			let stub.line = lnum
-				let stops[id].col = col
+			let stub.col = col
-				let [line, col] = s:build_loc_info(item[1:], stops, line, col, a:indent)
+			call s:add_update_objects(stub, seen_items)
+
+			if len(item) > 2 && type(item[1]) != type({})
+				let col = s:build_loc_info(item[1:-2], stops, lnum, col, seen_items)
 			else
-				call s:add_mirror(stops, id, line, col, item)
 				let col += len(snipMate#placeholder_str(id, stops))
 			endif
+
 			let in_text = 0
 		endif
-
-		let pos += 1
 		unlet item " avoid E706
-	endwhile
+	endfor
 
-	return [line, col]
+	return col
 endfunction
 
-function! s:add_mirror(stops, id, line, col, item) abort
+function! s:add_update_objects(object, targets) abort
-	let stops = a:stops
+	let targets = a:targets
-	let item = a:item
+
-	let stops[a:id].mirrors = get(stops[a:id], 'mirrors', [])
+	for item in targets
-	let mirror = get(a:item, 1, {})
+		let item.update_objects = get(item, 'update_objects', [])
-	let mirror.line = a:line
+		call add(item.update_objects, a:object)
-	let mirror.col = a:col
+	endfor
-	call add(stops[a:id].mirrors, mirror)
+
-	if len(item) == 1
+	call add(targets, a:object)
-		call add(item, mirror)
-	endif
 endfunction
 
 " reads a .snippets file

sources_non_forked/vim-snipmate/autoload/snipmate/jumping.vim

@@ -113,7 +113,7 @@ function! s:state_update_changes() dict abort
 		return self.remove()
 	endif
 
-	call self.update(self.cur_stop, change_len)
+	call self.update(self.cur_stop, change_len, change_len)
 	if !empty(self.mirrors)
 		call self.update_mirrors(change_len)
 	endif
@@ -141,14 +141,37 @@ function! s:state_update_mirrors(change) dict abort
 			endif
 		endfor
 
-		call self.update(mirror, changeLen)
+		if has_key(mirror, 'oldSize')
+			" recover the old size deduce the endline
+			let oldSize = mirror.oldSize
+		else
+			" first time, we use the intitial size
+			let oldSize = strlen(newWord)
+		endif
+
 		" Split the line into three parts: the mirror, what's before it, and
 		" what's after it. Then combine them using the new mirror string.
 		" Subtract one to go from column index to byte index
+
 		let theline = getline(mirror.line)
-		let update  = strpart(theline, 0, mirror.col - 1)
+
-		let update .= substitute(newWord, get(mirror, 'pat', ''), get(mirror, 'sub', ''), get(mirror, 'flags', ''))
+		" part before the current mirror
-		let update .= strpart(theline, mirror.col + self.end_col - self.start_col - a:change - 1)
+		let beginline  = strpart(theline, 0, mirror.col - 1)
+
+		" current mirror transformation, and save size
+		let wordMirror= substitute(newWord, get(mirror, 'pat', ''), get(mirror, 'sub', ''), get(mirror, 'flags', ''))
+		let mirror.oldSize = strlen(wordMirror)
+
+		" end of the line, use the oldSize because with the transformation,
+		" the size of the mirror can be different from those of the snippet
+		let endline    = strpart(theline, mirror.col + oldSize -1)
+
+		" Update other object on the line
+		call self.update(mirror, changeLen, mirror.oldSize - oldSize)
+
+		" reconstruct the line
+		let update = beginline.wordMirror.endline
+
 		call setline(mirror.line, update)
 	endfor
 
@@ -179,17 +202,17 @@ function! s:state_find_update_objects(item) dict abort
 	return item.update_objects
 endfunction
 
-function! s:state_update(item, change_len) dict abort
+function! s:state_update(item, change_len, mirror_change) dict abort
 	let item = a:item
-	if exists('item.update_objects')
+	if !exists('item.update_objects')
-		let to_update = item.update_objects
+		let item.update_objects = self.find_update_objects(a:item)
-	else
-		let to_update = self.find_update_objects(a:item)
-		let item.update_objects = to_update
 	endif
+	let to_update = item.update_objects
 
 	for obj in to_update
-		let obj.col += a:change_len
+		" object does not necessarly have the same decalage
+		" than mirrors if mirrors use regexp
+		let obj.col += a:mirror_change
 		if obj is self.cur_stop
 			let self.start_col += a:change_len
 			let self.end_col += a:change_len

sources_non_forked/vim-snipmate/autoload/snipmate/legacy.vim

@@ -12,8 +12,7 @@ function! snipmate#legacy#process_snippet(snip) abort
 	else
 		let visual = ''
 	endif
-	let snippet = substitute(snippet, '\n\(\t\+\).\{-\}\zs{VISUAL}',
+        let snippet = s:substitute_visual(snippet, visual)
-				\ substitute(escape(visual, '%\'), "\n", "\n\\\\1", 'g'), 'g')
 
 	" Evaluate eval (`...`) expressions.
 	" Backquotes prefixed with a backslash "\" are ignored.
@@ -118,6 +117,16 @@ function! snipmate#legacy#build_stops(snip, lnum, col, indent) abort
 	return [stops, i + 1]
 endfunction
 
+function! s:substitute_visual(snippet, visual) abort
+    let lines = []
+    for line in split(a:snippet, "\n")
+        let indent = matchstr(line, '^\t\+')
+        call add(lines, substitute(line, '{VISUAL}',
+                    \ substitute(escape(a:visual, '%\'), "\n", "\n" . indent, 'g'), 'g'))
+    endfor
+    return join(lines, "\n")
+endfunction
+
 " Counts occurences of haystack in needle
 function! s:count(haystack, needle) abort
 	let counter = 0

sources_non_forked/vim-snipmate/autoload/snipmate/parse.vim

@@ -5,6 +5,7 @@ function! s:sfile() abort
 endfunction
 
 let s:parser_proto = {}
+let s:special_chars = "$`\n"
 
 function! s:new_parser(text) abort
     let ret = copy(s:parser_proto)
@@ -14,6 +15,7 @@ function! s:new_parser(text) abort
     let ret.indent = 0
     let ret.value = []
     let ret.vars = {}
+    let ret.stored_lines = []
     call ret.advance()
     return ret
 endfunction
@@ -82,35 +84,56 @@ function! s:parser_varend() dict abort
 endfunction
 
 function! s:parser_placeholder() dict abort
-    return self.parse('}')
+    let ret = self.text('}')
+    return empty(ret) ? [''] : ret
 endfunction
 
 function! s:parser_subst() dict abort
     let ret = {}
-    let ret.pat = join(self.text('/', 1))
+    let ret.pat = self.pat()
     if self.same('/')
-        let ret.sub = join(self.text('/}'))
+        let ret.sub = self.pat(1)
     endif
     if self.same('/')
-        let ret.flags = join(self.text('}', 1))
+        let ret.flags = self.pat(1)
     endif
     return ret
 endfunction
 
+function! s:parser_pat(...) dict abort
+    let val = ''
+
+    while self.pos < self.len
+        if self.same('\')
+            if self.next == '/'
+                let val .= '/'
+                call self.advance()
+            elseif a:0 && self.next == '}'
+                let val .= '}'
+                call self.advance()
+            else
+                let val .= '\'
+            endif
+        elseif self.next == '/' || a:0 && self.next == '}'
+            break
+        else
+            let val .= self.next
+            call self.advance()
+        endif
+    endwhile
+
+    return val
+endfunction
+
 function! s:parser_expr() dict abort
-    let str = join(self.text('`', 1))
+    let str = self.string('`')
     call self.same('`')
     return snipmate#util#eval(str)
 endfunction
 
-function! s:parser_text(...) dict abort
+function! s:parser_string(till, ...) dict abort
-    let res = []
     let val = ''
-    if a:0 == 2 && a:2
+    let till = '\V\[' . escape(a:till, '\') . ']'
-        let till = '\V' . escape(a:1, '\')
-    else
-        let till = '[`$' . (a:0 ? a:1 : '') . ']'
-    endif
 
     while self.pos < self.len
         if self.same('\')
@@ -120,11 +143,6 @@ function! s:parser_text(...) dict abort
             call self.advance()
         elseif self.next =~# till
             break
-        elseif self.next == "\n"
-            call add(res, val)
-            let val = ''
-            let self.indent = 0
-            call self.advance()
         elseif self.next == "\t"
             let self.indent += 1
             let val .= s:indent(1)
@@ -135,55 +153,77 @@ function! s:parser_text(...) dict abort
         endif
     endwhile
 
-    call add(res, val)
+    return val
-    return res
 endfunction
 
-function! s:parser_parse(...) dict abort
+function! s:join_consecutive_strings(list) abort
-    let ret = a:0 ? [] : self.value
+    let list = a:list
+    let pos = 0
+    while pos + 1 < len(list)
+        if type(list[pos]) == type('') && type(list[pos+1]) == type('')
+            let list[pos] .= list[pos+1]
+            call remove(list, pos + 1)
+        else
+            let pos += 1
+        endif
+    endwhile
+endfunction
+
+function! s:parser_text(till) dict abort
+    let ret = []
+
     while self.pos < self.len
+        let lines = []
+
         if self.same('$')
             let var = self.var()
             if !empty(var)
                 if var[0] is# 'VISUAL'
-                    let add_to = s:visual_placeholder(var, self.indent)
+                    let lines = s:visual_placeholder(var, self.indent)
-                    if !empty(ret) && type(ret[-1]) == type('')
-                        let ret[-1] .= add_to[0]
-                    else
-                        call add(ret, add_to[0])
-                    endif
-                    call extend(ret, add_to[1:-1])
                 elseif var[0] >= 0
                     call add(ret, var)
                     call self.add_var(var)
                 endif
             endif
         elseif self.same('`')
-            let add_to = self.expr()
+            let lines = split(self.expr(), "\n", 1)
-            if !empty(ret) && type(ret[-1]) == type('')
-                let ret[-1] .= add_to
         else
-                call add(ret, add_to)
+            let lines = [self.string(a:till . s:special_chars)]
         endif
-        else
+
-            let text = a:0 ? self.text(a:1) : self.text()
+        if !empty(lines)
-            if exists('add_to')
+            call add(ret, lines[0])
-                let ret[-1] .= text[0]
+            call extend(self.stored_lines, lines[1:])
-                call remove(text, 0)
-                unlet add_to
         endif
-            call extend(ret, text)
+
-        endif
+        " Empty lines are ignored if this is tested at the start of an iteration
-        if a:0 && self.next == a:1
+        if self.next ==# a:till
             break
         endif
     endwhile
+
+    call s:join_consecutive_strings(ret)
     return ret
 endfunction
 
-call extend(s:parser_proto, snipmate#util#add_methods(s:sfile(), 'parser',
+function! s:parser_line() dict abort
-            \ [ 'advance', 'same', 'id', 'add_var', 'var', 'varend',
+    let ret = []
-            \ 'placeholder', 'subst', 'expr', 'text', 'parse' ]), 'error')
+    if !empty(self.stored_lines)
+        call add(ret, remove(self.stored_lines, 0))
+    else
+        call extend(ret, self.text("\n"))
+        call self.same("\n")
+    endif
+    let self.indent = 0
+    return ret
+endfunction
+
+function! s:parser_parse() dict abort
+    while self.pos < self.len || !empty(self.stored_lines)
+        let line = self.line()
+        call add(self.value, line)
+    endwhile
+endfunction
 
 function! s:indent(count) abort
     if &expandtab
@@ -211,9 +251,59 @@ function! s:visual_placeholder(var, indent) abort
     return content
 endfunction
 
-function! snipmate#parse#snippet(text) abort
+function! s:parser_create_stubs() dict abort
+
+    for [id, dict] in items(self.vars)
+        for i in dict.instances
+            if len(i) > 1 && type(i[1]) != type({})
+                if !has_key(dict, 'placeholder')
+                    let dict.placeholder = i[1:]
+                    call add(i, dict)
+                else
+                    unlet i[1:]
+                    call s:create_mirror_stub(i, dict)
+                endif
+            else
+                call s:create_mirror_stub(i, dict)
+            endif
+        endfor
+        if !has_key(dict, 'placeholder')
+            let dict.placeholder = []
+            let j = 0
+            while len(dict.instances[j]) > 2
+                let j += 1
+            endwhile
+            let oldstub = remove(dict.instances[j], 1, -1)[-1]
+            call add(dict.instances[j], '')
+            call add(dict.instances[j], dict)
+            call filter(dict.mirrors, 'v:val isnot oldstub')
+        endif
+        unlet dict.instances
+    endfor
+
+endfunction
+
+function! s:create_mirror_stub(mirror, dict)
+    let mirror = a:mirror
+    let dict = a:dict
+    let stub = get(mirror, 1, {})
+    call add(mirror, stub)
+    let dict.mirrors = get(dict, 'mirrors', [])
+    call add(dict.mirrors, stub)
+endfunction
+
+function! snipmate#parse#snippet(text, ...) abort
     let parser = s:new_parser(a:text)
     call parser.parse()
+    if !(a:0 && a:1)
+        call parser.create_stubs()
+    endif
     unlet! b:snipmate_visual
     return [parser.value, parser.vars]
 endfunction
+
+call extend(s:parser_proto, snipmate#util#add_methods(s:sfile(), 'parser',
+            \ [ 'advance', 'same', 'id', 'add_var', 'var', 'varend',
+            \   'line', 'string', 'create_stubs', 'pat',
+            \   'placeholder', 'subst', 'expr', 'text', 'parse',
+            \ ]), 'error')

sources_non_forked/vim-snipmate/doc/snipMate.txt

@@ -1,7 +1,6 @@
 *SnipMate.txt*  Plugin for using TextMate-style snippets in Vim.
 
 SnipMate                                       *snippet* *snippets* *SnipMate*
-Last Change: December 27, 2009
 
 1. Description                        |SnipMate-description|
 2. Usage                              |SnipMate-usage|
@@ -504,6 +503,15 @@ Perhaps some of these features will be added in a later release.
 ==============================================================================
 CHANGELOG                                                 *SnipMate-changelog*
 
+0.89 - 2016-05-29
+-----------------
+
+* Various regex updates to legacy parser Addition of double bang syntax to
+* completely remove a snippet from lookup Group various SnipMate autocommands
+* Support setting 'shiftwidth' to 0 Parser now operates linewise, adding some
+* flexibility Mirror substitutions are more literal Mirror length is
+* calculated correctly when substitutions occur
+
 0.88 - 2015-04-04
 -----------------
 

sources_non_forked/vim-snipmate/t/parser.vim

@@ -2,27 +2,27 @@ describe 'snippet parser'
 
     before
         function! Parse(snippet, ...)
-            let [snip, stops] = snipmate#parse#snippet(a:snippet)
+            let [snip, stops] = snipmate#parse#snippet(a:snippet, (a:0 ? a:1 : 1))
-            return a:0 ? [snip, stops] : snip
+            return (a:0 > 1 && a:2) ? [snip, stops] : snip
         endfunction
         let b:snipmate_visual = 'testvisual'
     end
 
     it 'parses numeric $id and ${id} vars as [id] lists'
-        let expect = [[1234567890]]
+        let expect = [[[1234567890]]]
         Expect Parse('$1234567890') == expect
         Expect Parse('${1234567890}') == expect
     end
 
     it 'disregards $ or ${ followed by a non-id'
-        Expect Parse('$x1') == ['x1']
+        Expect Parse('$x1') == [['x1']]
-        Expect Parse('${x}1') == ['x}1']
+        Expect Parse('${x}1') == [['x}1']]
-        Expect Parse('$VISUA1') == ['VISUA1']
+        Expect Parse('$VISUA1') == [['VISUA1']]
-        Expect Parse('${VISUA}1') == ['VISUA}1']
+        Expect Parse('${VISUA}1') == [['VISUA}1']]
     end
 
     it 'gathers references to each instance of each stop id'
-        let [snip, b:stops] = Parse('x$1x${2:x$1x}x$1x${1/a/b}x$VISUALx', 1)
+        let [snip, b:stops] = Parse('x$1x${2:x$1x}x$1x${1/a/b}x$VISUALx', 1, 1)
         function! InstanceFound(list)
             return !empty(filter(copy(b:stops[a:list[0]].instances),
                         \ 'v:val is a:list'))
@@ -36,87 +36,107 @@ describe 'snippet parser'
                 unlet item " E732
             endfor
         endfunction
-        call CheckList(snip)
+        call CheckList(snip[0])
     end
 
     it 'parses mirror substitutions ${n/pat/sub} as [n, {...}]'
-        let expect = [[1, { 'pat' : 'abc', 'sub' : 'def' }]]
+        let expect = [[[1, { 'pat' : 'abc', 'sub' : 'def' }]]]
         Expect Parse('${1/abc/def}') == expect
-        let expect[0][1].flags = ''
+        let expect[0][0][1].flags = ''
         Expect Parse('${1/abc/def/}') == expect
-        let expect[0][1].flags = 'g'
+        let expect[0][0][1].flags = 'g'
         Expect Parse('${1/abc/def/g}') == expect
     end
 
+    it 'reads patterns literally except for "\/"'
+        Expect Parse('${1/\a\/b/\c\/d\}}') == [[[1, { 'pat' : '\a/b', 'sub' : '\c/d}' }]]]
+    end
+
     it 'parses vars with placeholders as [id, placeholder] lists'
-        Expect Parse('${1:abc}') == [[1, 'abc']]
+        Expect Parse('${1:abc}') == [[[1, 'abc']]]
     end
 
     it 'evaluates backtick expressions'
-        Expect Parse('`fnamemodify("x.y", ":r")`') == ['x']
+        Expect Parse('`fnamemodify("x.y", ":r")`') == [['x']]
     end
 
     it 'parses placeholders for vars and other specials'
         let text = 'a `fnamemodify("x.y", ":r")` ${2:(${3/a/b})}'
         let expect = ['a x ', [2, '(', [3, { 'pat' : 'a', 'sub' : 'b' }], ')']]
-        Expect Parse(text) == expect
+        Expect Parse(text) == [expect]
-        Expect Parse(printf('${1:%s}', text)) == [[1] + expect]
+        Expect Parse(printf('${1:%s}', text)) == [[[1] + expect]]
     end
 
     it 'converts tabs according to &et, &sts, &sw, &ts'
         " &noet -> leave tabs alone
         setl noet
-        Expect Parse("abc\tdef\n\t\tghi") == ["abc\tdef", "\t\tghi"]
+        Expect Parse("abc\tdef\n\t\tghi") == [["abc\tdef"], ["\t\tghi"]]
 
         " &et -> &sts or &sw
         setl et sts=2 sw=3
-        Expect Parse("abc\tdef\n\t\tghi") == ["abc  def", "    ghi"]
+        Expect Parse("abc\tdef\n\t\tghi") == [["abc  def"], ["    ghi"]]
 
         setl et sts=0 sw=3
-        Expect Parse("abc\tdef\n\t\tghi") == ["abc   def", "      ghi"]
+        Expect Parse("abc\tdef\n\t\tghi") == [["abc   def"], ["      ghi"]]
 
         setl et sts=-1 sw=3
-        Expect Parse("abc\tdef\n\t\tghi") == ["abc   def", "      ghi"]
+        Expect Parse("abc\tdef\n\t\tghi") == [["abc   def"], ["      ghi"]]
 
         " See #227
         if exists('*shiftwidth')
             setl et sts=0 sw=0 ts=3
-            Expect Parse("abc\tdef\n\t\tghi") == ["abc   def", "      ghi"]
+            Expect Parse("abc\tdef\n\t\tghi") == [["abc   def"], ["      ghi"]]
         endif
     end
 
     it 'parses backslashes as escaping the next character or joining lines'
-        Expect Parse('x\x') == ['xx']
+        Expect Parse('x\x') == [['xx']]
-        Expect Parse('x\\x') == ['x\x']
+        Expect Parse('x\\x') == [['x\x']]
-        Expect Parse("x\\\nx") == ['xx']
+        Expect Parse("x\\\nx") == [['xx']]
-        Expect Parse('x\$1') == ['x$1']
+        Expect Parse('x\$1') == [['x$1']]
-        Expect Parse('${1:\}}') == [[1, '}']]
+        Expect Parse('${1:\}}') == [[[1, '}']]]
-        Expect Parse('${1/\//\}}') == [[1, { 'pat' : '/', 'sub' : '}' }]]
+        Expect Parse('`fnamemodify("\`.x", ":r")`') == [['`']]
-        Expect Parse('`fnamemodify("\`.x", ":r")`') == ['`']
+        Expect Parse('\`x\`') == [['`x`']]
-        Expect Parse('\`x\`') == ['`x`']
     end
 
     it 'splits text at newlines'
-        Expect Parse("x\nx") == ['x', 'x']
+        Expect Parse("x\nx") == [['x'], ['x']]
     end
 
     it 'joins evaluated expressions to surrounding text on the same line'
         let g:foo = 'bar'
-        Expect Parse("x`g:foo`x") == ['xbarx']
+        Expect Parse("x`g:foo`x") == [['xbarx']]
-        Expect Parse("x`g:foo`\nx") == ['xbar', 'x']
+        Expect Parse("x`g:foo`\nx") == [['xbar'], ['x']]
-        Expect Parse("x\n`g:foo`x") == ['x', 'barx']
+        Expect Parse("x\n`g:foo`x") == [['x'], ['barx']]
-    end
-
-    it 'adds empty strings before/after vars if at the start/end of a line'
-        Expect Parse("x$1\nx") == ['x', [1], '', 'x']
-        Expect Parse("x\n$1x") == ['x', '', [1], 'x']
     end
 
     it 'expands $VISUAL placeholders with any indents'
-        Expect Parse("x$VISUALx") == ['xtestvisualx']
+        Expect Parse("x$VISUALx") == [['xtestvisualx']]
         let b:snipmate_visual = "  foo\nbar\n  baz"
         setl noet
-        Expect Parse("\tx\n\t$VISUAL\nx") == ["\tx", "\t  foo", "\tbar", "\t  baz", "x"]
+        Expect Parse("\tx\n\t$VISUAL\nx") == [["\tx"], ["\t  foo"], ["\tbar"],
+                    \ ["\t  baz"], ["x"]]
+    end
+
+    it 'determines which var with an id is the stop'
+        let [snip, stops] = Parse("$1$1$1", 0, 1)
+        Expect snip == [[[1, "", stops[1]], [1, {}], [1, {}]]]
+
+        let [snip, stops] = Parse("$1${1}$1", 0, 1)
+        Expect snip == [[[1, "", stops[1]], [1, {}], [1, {}]]]
+
+        let [snip, stops] = Parse("$1${1:}$1", 0, 1)
+        Expect snip == [[[1, {}], [1, "", stops[1]], [1, {}]]]
+
+    end
+
+    it 'picks the first of many possible stops'
+        let [snip, stops] = Parse("$1${1:foo}${1:bar}", 0, 1)
+        Expect snip == [[[1, {}], [1, "foo", stops[1]], [1, {}]]]
+    end
+
+    it 'represents empty lines as an empty string'
+        Expect Parse("foo\n\nbar") == [['foo'], [''], ['bar']]
     end
 
 end

sources_non_forked/vim-snippets/UltiSnips/htmldjango.snippets

@@ -186,7 +186,7 @@ snippet iblock "" bi
 {% block ${1:blockname} %}${VISUAL}{% endblock $1 %}
 endsnippet
 
-snippet csfr "" bi
+snippet csrf "" bi
 {% csrf_token %}
 endsnippet
 

sources_non_forked/vim-snippets/UltiSnips/java.snippets

@@ -21,7 +21,7 @@ def nl(snip):
 		snip.rv += " "
 def getArgs(group):
 	import re
-	word = re.compile('[a-zA-Z><.]+ \w+')
+	word = re.compile('[a-zA-Z0-9><.]+ \w+')
 	return [i.split(" ") for i in word.findall(group) ]
 
 def camel(word):
@@ -123,8 +123,8 @@ for i in args:
 	snip.rv += "\n\tpublic void set" + camel(i[1]) + "(" + i[0] + " " + i[1] + ") {\n" + "\
 	\tthis." + i[1] + " = " + i[1] + ";\n\t}\n"
 
-	snip.rv += "\n\tpublic " + i[0] + " get" + camel(i[1]) + "() {\
+	snip.rv += "\n\tpublic " + i[0] + " get" + camel(i[1]) + "() {\n\
-	\n\t\treturn " + i[1] + ";\n\t}\n"
+	\treturn " + i[1] + ";\n\t}\n"
 `
 }
 endsnippet
@@ -356,8 +356,7 @@ endsnippet
 snippet /se?tge?t|ge?tse?t|gs/ "setter and getter" br
 public void set${1:Name}(${2:String} `!p snip.rv = mixedCase(t[1])`) {
 	this.`!p snip.rv = mixedCase(t[1])` = `!p snip.rv = mixedCase(t[1])`;
-}
+}`!p snip.rv += "\n"`
-
 public $2 get$1() {
 	return `!p snip.rv = mixedCase(t[1])`;
 }

sources_non_forked/vim-snippets/UltiSnips/json.snippets

@@ -4,7 +4,7 @@ snippet s "String" b
 "${1:key}": "${0:value}",
 endsnippet
 
-snippet n "number" b
+snippet n "Number" b
 "${1:key}": ${0:value},
 endsnippet
 
@@ -13,8 +13,39 @@ snippet a "Array" b
 	${VISUAL}$0
 ],
 endsnippet
+
+snippet na "Named array" b
+"${1:key}": [
+	${VISUAL}$0
+],
+endsnippet
+
 snippet o "Object" b
 {
 	${VISUAL}$0
 },
 endsnippet
+
+snippet no "Named object" b
+"${1:key}": {
+	${VISUAL}$0
+},
+endsnippet
+
+snippet null "Null" b
+"${0:key}": null,
+endsnippet
+
+
+global !p
+def compB(t, opts):
+	if t:
+		opts = [m[len(t):] for m in opts if m.startswith(t)]
+	if len(opts) == 1:
+		return opts[0]
+	return "(" + '|'.join(opts) + ')'
+endglobal
+
+snippet b "Bool" b
+"${1:key}": $2`!p snip.rv=compB(t[2], ['true', 'false'])`,
+endsnippet

sources_non_forked/vim-snippets/UltiSnips/php-phpspec.snippets

@@ -1,8 +1,9 @@
-# Snippets for phpspec
+# Snippets for phpspec, to use add the following to your .vimrc
+# `autocmd BufRead,BufNewFile,BufEnter *Spec.php UltiSnipsAddFiletypes php-phpspec`
 
 priority -50
 
-snippet spec "phpspec class" b
+snippet spec "class XYZSpec extends ObjectBehaviour"
 <?php
 
 namespace `!p
@@ -22,17 +23,200 @@ class `!p
 snip.rv = re.match(r'.*(?=\.)', fn).group()
 ` extends ObjectBehavior
 {
-	public function it${1:_does_something}()
+	function it_${1}()
 	{
 		$0
 	}
 }
 endsnippet
 
-snippet it "phpspec function it..." b
+snippet it "function it_does_something() { ... }"
-public function it${1:_does_something}()
+function it_${1}()
 {
-	$0
+	${0:${VISUAL}}
 }
 endsnippet
 
+snippet let "function let() { ... }"
+function let()
+{
+	${0:${VISUAL}}
+}
+endsnippet
+
+snippet letgo "function letgo() { ... }"
+function letgo()
+{
+	${0:${VISUAL}}
+}
+endsnippet
+
+# Object construction
+snippet cw "$this->beConstructedWith($arg)"
+$this->beConstructedWith(${1});
+endsnippet
+
+snippet ct "$this->beConstructedThrough($methodName, [$arg])"
+$this->beConstructedThrough(${1:'methodName'}, [${2:'$arg'}]);
+endsnippet
+
+# Identity and comparison matchers
+snippet sreturn "$this->XYZ()->shouldReturn('value')"
+$this->${1:method}()->shouldReturn(${2:'value'});
+endsnippet
+
+snippet snreturn "$this->XYZ()->shouldNotReturn('value')"
+$this->${1:method}()->shouldNotReturn(${2:'value'});
+endsnippet
+
+snippet sbe "$this->XYZ()->shouldBe('value')"
+$this->${1:method}()->shouldBe(${2:'value'});
+endsnippet
+
+snippet snbe "$this->XYZ()->shouldNotBe('value')"
+$this->${1:method}()->shouldNotBe(${2:'value'});
+endsnippet
+
+snippet sequal "$this->XYZ()->shouldEqual('value')"
+$this->${1:method}()->shouldEqual(${2:'value'});
+endsnippet
+
+snippet snequal "$this->XYZ()->shouldNotEqual('value')"
+$this->${1:method}()->shouldNotEqual(${2:'value'});
+endsnippet
+
+snippet sbequalto "$this->XYZ()->shouldBeEqualTo('value')"
+$this->${1:method}()->shouldBeEqualTo(${2:'value'});
+endsnippet
+
+snippet snbequalto "$this->XYZ()->shouldNotBeEqualTo('value')"
+$this->${1:method}()->shouldNotBeEqualTo(${2:'value'});
+endsnippet
+
+snippet sblike "$this->XYZ()->shouldBeLike('value')"
+$this->${1:method}()->shouldBeLike(${2:'value'});
+endsnippet
+
+snippet snblike "$this->XYZ()->shouldNotBeLike('value')"
+$this->${1:method}()->shouldNotBeLike(${2:'value'});
+endsnippet
+
+# Throw matcher
+snippet sthrowm "$this->shouldThrow('\Exception')->duringXYZ($arg)"
+$this->shouldThrow(${1:'\Exception'})->during${2:Method}(${3:'$arg'});
+endsnippet
+
+snippet sthrowi "$this->shouldThrow('\Exception')->duringInstantiation()"
+$this->shouldThrow(${1:'\Exception'})->duringInstantiation();
+endsnippet
+
+# Type matchers
+snippet stype "$this->shouldHaveType('Type')"
+$this->shouldHaveType(${1});
+endsnippet
+
+snippet sntype "$this->shouldNotHaveType('Type')"
+$this->shouldNotHaveType(${1});
+endsnippet
+
+snippet srinstance "$this->shouldReturnAnInstanceOf('Type')"
+$this->shouldReturnAnInstanceOf(${1});
+endsnippet
+
+snippet snrinstance "$this->shouldNotReturnAnInstanceOf('Type')"
+$this->shouldNotReturnAnInstanceOf(${1});
+endsnippet
+
+snippet sbinstance "$this->shouldBeAnInstanceOf('Type')"
+$this->shouldBeAnInstanceOf(${1});
+endsnippet
+
+snippet snbinstance "$this->shouldNotBeAnInstanceOf('Type')"
+$this->shouldNotBeAnInstanceOf(${1});
+endsnippet
+
+snippet simplement "$this->shouldImplement('Type')"
+$this->shouldImplement(${1});
+endsnippet
+
+snippet snimplement "$this->shouldNotImplement('Type')"
+$this->shouldNotImplement(${1});
+endsnippet
+
+# Object state matchers
+snippet sbstate "$this->shouldBeXYZ()"
+$this->shouldBe${1}();
+endsnippet
+
+snippet snbstate "$this->shouldNotBeXYZ()"
+$this->shouldNotBe${1}();
+endsnippet
+
+# Count matchers
+snippet scount "$this->XYZ()->shouldHaveCount(7)"
+$this->${1:method}()->shouldHaveCount(${2:7});
+endsnippet
+
+snippet sncount "$this->XYZ()->shouldNotHaveCount(7)"
+$this->${1:method}()->shouldNotHaveCount(${2:7});
+endsnippet
+
+# Scalar type matchers
+snippet sbscalar "$this->XYZ()->shouldBeString|Array|Bool()"
+$this->${1:method}()->shouldBe${2:String|Array|Bool}();
+endsnippet
+
+snippet snbscalar "$this->XYZ()->shouldNotBeString|Array|Bool()"
+$this->${1:method}()->shouldNotBe${2:String|Array|Bool}();
+endsnippet
+
+# Contain matcher
+snippet scontain "$this->XYZ()->shouldContain('value')"
+$this->${1:method}()->shouldContain(${2:'value'});
+endsnippet
+
+snippet sncontain "$this->XYZ()->shouldNotContain('value')"
+$this->${1:method}()->shouldNotContain(${2:'value'});
+endsnippet
+
+# Array matchers
+snippet skey "$this->XYZ()->shouldHaveKey('key')"
+$this->${1:method}()->shouldHaveKey(${2:'key'});
+endsnippet
+
+snippet snkey "$this->XYZ()->shouldNotHaveKey('key')"
+$this->${1:method}()->shouldNotHaveKey(${2:'key'});
+endsnippet
+
+snippet skeyvalue "$this->XYZ()->shouldHaveKeyWithValue('key', 'value')"
+$this->${1:method}()->shouldHaveKeyWithValue(${2:'key'}, ${3:'value'});
+endsnippet
+
+snippet snkeyvalue "$this->XYZ()->shouldNotHaveKeyWithValue('key', 'value')"
+$this->${1:method}()->shouldNotHaveKeyWithValue(${2:'key'}, ${3:'value'});
+endsnippet
+
+# String matchers
+snippet sstart "$this->XYZ()->shouldStartWith('string')"
+$this->${1:method}()->shouldStartWith(${2:'string'});
+endsnippet
+
+snippet snstart "$this->XYZ()->shouldNotStartWith('string')"
+$this->${1:method}()->shouldNotStartWith(${2:'string'});
+endsnippet
+
+snippet send "$this->XYZ()->shouldEndWith('string')"
+$this->${1:method}()->shouldEndWith(${2:'string'});
+endsnippet
+
+snippet snend "$this->XYZ()->shouldNotEndWith('string')"
+$this->${1:method}()->shouldNotEndWith(${2:'string'});
+endsnippet
+
+snippet smatch "$this->XYZ()->shouldMatch('/wizard/i')"
+$this->${1:method}()->shouldMatch(${2:'/wizard/i'});
+endsnippet
+
+snippet snmatch "$this->XYZ()->shouldNotMatch('/wizard/i')"
+$this->${1:method}()->shouldNotMatch(${2:'/wizard/i'});
+endsnippet

sources_non_forked/vim-snippets/UltiSnips/php-phpunit.snippets

@@ -1,40 +0,0 @@
-# suggestion? report bugs?
-# please go to https://github.com/chrisyue/vim-snippets/issues
-priority -50
-
-snippet test "phpunit test class" b
-<?php
-
-namespace `!p
-relpath = os.path.relpath(path)
-m = re.search(r'[A-Z].+(?=/)', relpath)
-if m:
-	snip.rv = m.group().replace('/', '\\')
-`;
-
-/**
- * @author `!v g:snips_author`
- */
-class `!p
-snip.rv = re.match(r'.*(?=\.)', fn).group()
-` extends \PHPUnit_Framework_TestCase
-{
-	public function test${1}()
-	{
-		${2}
-	}
-}
-endsnippet
-
-snippet exp "phpunit expects" i
-expects($this->${1:once}())
-	->method('${2}')
-	->with($this->equalTo(${3})${4})
-	->will($this->returnValue(${5}));
-endsnippet
-
-snippet testcmt "phpunit comment with group" b
-/**
-* @group ${1}
-*/
-endsnippet

sources_non_forked/vim-snippets/UltiSnips/php.snippets

@@ -3,127 +3,19 @@ priority -50
 ## Snippets from SnipMate, taken from
 ## https://github.com/scrooloose/snipmate-snippets.git
 
-snippet array "array"
+snippet gm "PHP Class Getter" b
-$${1:arrayName} = array('${2}' => ${3});${4}
-endsnippet
-
-snippet def "def"
-define('${1:VARIABLE_NAME}', ${2:'definition'});${3}
-endsnippet
-
-snippet wh "while"
-while (${1}) {
-	${0:${VISUAL}}
-}
-endsnippet
-
-snippet do "do"
-do {
-	${2:// code... }
-} while (${1:/* condition */});
-endsnippet
-
-snippet doc_f "doc_f"
-/**
- * $2
- * @return ${4:void}
- * @author ${5:`!v g:snips_author`}
- **/
-${1:public }function ${2:someFunc}(${3})
-{${6}
-}
-endsnippet
-
-snippet doc_i "doc_i"
-/**
- * $1
- * @package ${2:default}
- * @author ${3:`!v g:snips_author`}
- **/
-interface ${1:someClass}
-{${4}
-} // END interface $1"
-endsnippet
-
-snippet el "else"
-else {
-	${0:${VISUAL}}
-}
-endsnippet
-
-snippet for "for"
-for ($${2:i} = 0; $$2 < ${1:count}; $$2${3:++}) {
-	${4:// code...}
-}
-endsnippet
-
-snippet foreachk "foreachk"
-foreach ($${1:variable} as $${2:key} => $${3:value}) {
-	${4:// code...}
-}
-endsnippet
-
-snippet get "get"
-$_GET['${1}']${2}
-endsnippet
-
-snippet if "if"
-if (${1}) {
-	${0:${VISUAL}}
-}
-endsnippet
-
-snippet eif "elseif"
-elseif (${1}) {
-	${0:${VISUAL}}
-}
-endsnippet
-
-snippet inc "inc"
-include '${1:file}';${2}
-endsnippet
-
-snippet log "log"
-error_log(var_export(${1}, true));${2}
-endsnippet
-
-snippet post "post"
-$_POST['${1}']${2}
-endsnippet
-
-snippet req "req1"
-require_once '${1:file}';${2}
-endsnippet
-
-snippet req1 "req1"
-require_once '${1:file}';${2}
-endsnippet
-
-snippet session "session"
-$_SESSION['${1}']${2}
-endsnippet
-
-snippet t "t"
-$${1:retVal} = (${2:condition}) ? ${3:a} : ${4:b};${5}
-endsnippet
-
-snippet var "var"
-var_export(${1});${2}
-endsnippet
-
-snippet getter "PHP Class Getter" b
 /**
  * Getter for $1
  *
- * ${2:return string}
+ * @return ${2:string}
  */
 public function get${1/\w+\s*/\u$0/}()
 {
-    return $this->$1;$3
+    return $this->$1;
 }
 endsnippet
 
-snippet setter "PHP Class Setter" b
+snippet sm "PHP Class Setter" b
 /**
  * Setter for $1
  *
@@ -132,37 +24,35 @@ snippet setter "PHP Class Setter" b
  */
 public function set${1/\w+\s*/\u$0/}(${4:${2/(void|string|int|integer|double|float|object|boolear|null|mixed|number|resource)|(.*)/(?1::$2 )/}}$$1)
 {
-    $this->$1 = $$1;$5
+    $this->$1 = $$1;
 
-    ${6:return $this;}
+    ${5:return $this;}
 }
-$0
 endsnippet
 
 snippet gs "PHP Class Getter Setter" b
 /**
  * Getter for $1
  *
- * return ${2:string}
+ * @return ${2:string}
  */
 public function get${1/\w+\s*/\u$0/}()
 {
-    return $this->$1;$3
+    return $this->$1;
 }
 
 /**
  * Setter for $1
  *
  * @param $2 $$1
- * @return ${4:`!p snip.rv=snip.basename`}
+ * @return ${3:`!p snip.rv=snip.basename`}
  */
-public function set${1/\w+\s*/\u$0/}(${5:${2/(void|string|int|integer|double|float|object|boolear|null|mixed|number|resource)|(.*)/(?1::$2 )/}}$$1)
+public function set${1/\w+\s*/\u$0/}(${4:${2/(void|string|int|integer|double|float|object|boolear|null|mixed|number|resource)|(.*)/(?1::$2 )/}}$$1)
 {
-    $this->$1 = $$1;$6
+    $this->$1 = $$1;
 
-    ${7:return $this;}
+    ${5:return $this;}
 }
-$0
 endsnippet
 
 snippet pub "Public function" b
@@ -251,27 +141,11 @@ function ${1:name}(${2:$param})
 $0
 endsnippet
 
-snippet fore "Foreach loop"
-foreach ($${1:variable} as $${3:value}) {
-	${VISUAL}${4}
-}
-$0
-endsnippet
-
 snippet new "New class instance" b
 $${1:variableName} = new ${2:${1/\w+\s*/\u$0/}}($3);
 $0
 endsnippet
 
-snippet ife "if else"
-if (${1:/* condition */}) {
-	${2:// code...}
-} else {
-	${3:// code...}
-}
-$0
-endsnippet
-
 snippet ns "namespace declaration" b
 namespace ${1:`!p
 relpath = os.path.relpath(path)
@@ -349,18 +223,29 @@ public function __construct(${1:$dependencies})
 $0
 endsnippet
 
-snippet ve "Dumb debug helper in HTML"
+# PHPUnit snippets
-    echo '<pre>' . var_export($1, 1) . '</pre>';$0
+snippet testcase "class XYZTest extends \PHPUnit_Framework_TestCase { ... }"
-endsnippet
+<?php
 
-snippet pc "Dumb debug helper in cli"
+namespace `!p
-var_export($1);$0
+relpath = os.path.relpath(path)
-endsnippet
+m = re.search(r'[A-Z].+(?=/)', relpath)
+if m:
+	snip.rv = m.group().replace('/', '\\')
+`;
 
-snippet inheritdoc "@inheritdoc docblock"
 /**
- * {@inheritdoc}
+ * @author `!v g:snips_author`
  */
+class `!p
+snip.rv = re.match(r'.*(?=\.)', fn).group()
+` extends \PHPUnit_Framework_TestCase
+{
+	public function test${1}()
+	{
+		${0:${VISUAL}}
+	}
+}
 endsnippet
 
 # :vim:ft=snippets:

sources_non_forked/vim-snippets/UltiSnips/twig.snippets

@@ -1,53 +0,0 @@
-priority -50
-
-snippet bl "twig block" b
-{% block ${1} %}
-${2}
-{% endblock $1 %}
-endsnippet
-
-snippet js "twig javascripts" b
-{% javascripts '${1}' %}
-	<script src="{{ asset_url }}"></script>
-{% endjavascripts %}
-endsnippet
-
-snippet css "twig stylesheets" b
-{% stylesheets '${1}' %}
-	<link rel="stylesheet" href="{{ asset_url }}">
-{% endstylesheets %}
-endsnippet
-
-snippet if "twig if" b
-{% if ${1} %}
-${0:${VISUAL}}
-{% endif %}
-endsnippet
-
-snippet ife "twig if ... else" b
-{% if ${1} %}
-${2}
-{% else %}
-${0}
-{% endif %}
-endsnippet
-
-snippet el "twig else"
-{% else %}
-${0:${VISUAL}}
-endsnippet
-
-snippet eif "twig elseif"
-{% elseif ${1} %}
-${0:${VISUAL}}
-endsnippet
-
-snippet for "twig for" b
-{% for ${1} in ${2} %}
-${3}
-{% endfor %}
-endsnippet
-
-snippet ext "twig extends" b
-{% extends ${1} %}
-endsnippet

sources_non_forked/vim-snippets/snippets/_.snippets

@@ -7,6 +7,8 @@ snippet date
 	`strftime("%Y-%m-%d")`
 snippet ddate
 	`strftime("%B %d, %Y")`
+snippet diso
+	`strftime("%Y-%m-%dT%H:%M:%S")`
 snippet time
 	`strftime("%H:%M")`
 snippet datetime

sources_non_forked/vim-snippets/snippets/cpp.snippets

@@ -146,9 +146,9 @@ snippet itera
 ## Lambdas
 # lamda (one line)
 snippet ld
-	[${1}](${2}){${3}}
+	[${1}](${2}){${3}};
 # lambda (multi-line)
 snippet lld
 	[${1}](${2}){
 		${3}
-	}
+	};

sources_non_forked/vim-snippets/snippets/eelixir.snippets

@@ -1,3 +1,5 @@
+extends html
+
 snippet %
 	<% ${0} %>
 snippet =

sources_non_forked/vim-snippets/snippets/elixir.snippets

@@ -114,7 +114,7 @@ snippet testa
 	end
 snippet exunit
 	defmodule ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`} do
-		use ExUnit.Case
+		use ExUnit.Case, async: true
 
 		${0}
 	end
@@ -131,3 +131,6 @@ snippet qu
 	quote do
 		${1}
 	end
+snippet beh
+	@behaviour ${1:Mix.Task}
+	${0}

sources_non_forked/vim-snippets/snippets/elm.snippets

@@ -0,0 +1,50 @@
+snippet mod
+	module `substitute(substitute(expand('%:r'), '[/\\]','.','g'),'^\%(\l*\.\)\?','','')` exposing (${1})
+	${0}
+snippet imp
+	import ${0:List}
+snippet impe
+	import ${1:List} exposing (${0:map})
+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 fn0
+	${1:fn} : ${2:a}
+	$1 =
+		${0}
+snippet case
+	case ${1} of
+		${2} ->
+			${0}
+snippet -
+	${1} ->
+		${0}
+snippet let
+	let
+		${1} = ${2}
+	in
+		${0}
+snippet if
+	if ${1} then
+		${2}
+	else
+		${0}
+snippet ty
+	type ${1:Msg}
+		= ${0}
+snippet tya
+	type alias ${1:Model} =
+		${0}