Updated plugins

sources_non_forked/ack.vim/autoload/ack.vim

@@ -5,7 +5,7 @@ if exists('g:ack_use_dispatch')
   endif
 else
   let g:ack_use_dispatch = 0
-end
+endif
 
 "-----------------------------------------------------------------------------
 " Public API

sources_non_forked/ag.vim/README.md

@@ -21,13 +21,13 @@ Vim has various ways of installing plugins, the standard way is in [the document
   cd ~/.vim/bundle && git clone https://github.com/rking/ag.vim ag && echo "set runtimepath^=~/.vim/bundle/ag" >> ~/.vimrc
   ```
 
-  Then open vim and rum `:helptags ~/.vim/bundle/ag/doc`.
+  Then open vim and run `:helptags ~/.vim/bundle/ag/doc`.
 
 ### Configuration ###
 
 You can specify a custom ag name and path in your .vimrc like so:
 
-    let g:agprg="<custom-ag-path-goes-here> --vimgrep"
+    let g:ag_prg="<custom-ag-path-goes-here> --vimgrep"
 
 You can configure ag.vim to always start searching from your project root
 instead of the cwd

sources_non_forked/ag.vim/autoload/ag.vim

@@ -1,17 +1,26 @@
 " NOTE: You must, of course, install ag / the_silver_searcher
 
-" FIXME: Delete deprecated options below on or after 15-7 (6 months from when they were changed) {{{
+" FIXME: Delete deprecated options below on or after 2016-4 (6 months from when the deprecation warning was added) {{{
 
 if exists("g:agprg")
   let g:ag_prg = g:agprg
+  echohl WarningMsg
+  call input('g:agprg is deprecated and will be removed. Please use g:ag_prg')
+  echohl None
 endif
 
 if exists("g:aghighlight")
   let g:ag_highlight = g:aghighlight
+  echohl WarningMsg
+  call input('g:aghighlight is deprecated and will be removed. Please use g:ag_highlight')
+  echohl None
 endif
 
 if exists("g:agformat")
   let g:ag_format = g:agformat
+  echohl WarningMsg
+  call input('g:agformat is deprecated and will be removed. Please use g:ag_format')
+  echohl None
 endif
 
 " }}} FIXME: Delete the deprecated options above on or after 15-7 (6 months from when they were changed)
@@ -79,6 +88,11 @@ function! ag#Ag(cmd, args)
     let l:grepargs = a:args . join(a:000, ' ')
   end
 
+  if empty(l:grepargs)
+    echo "Usage: ':Ag {pattern}' (or just :Ag to search for the word under the cursor). See ':help :Ag' for more information."
+    return
+  endif
+
   " Format, used to manage column jump
   if a:cmd =~# '-g$'
     let s:ag_format_backup=g:ag_format
@@ -169,8 +183,12 @@ function! ag#Ag(cmd, args)
         echom "ag.vim keys: q=quit <cr>/e/t/h/v=enter/edit/tab/split/vsplit go/T/H/gv=preview versions of same"
       endif
     endif
-  else
+  else " Close the split window automatically:
+    cclose
+    lclose
+    echohl WarningMsg
     echom 'No matches for "'.a:args.'"'
+    echohl None
   endif
 endfunction
 

sources_non_forked/ctrlp.vim/readme.md

@@ -1,3 +1,6 @@
+#**This project is unmaintained** 
+**You should use [this fork](https://github.com/ctrlpvim/ctrlp.vim) instead.**
+
 # ctrlp.vim
 Full path fuzzy __file__, __buffer__, __mru__, __tag__, __...__ finder for Vim.
 

sources_non_forked/goyo.vim/autoload/goyo.vim

@@ -269,7 +269,9 @@ function! s:goyo_on(dim)
   if exists('g:goyo_callbacks[0]')
     call g:goyo_callbacks[0]()
   endif
-  silent! doautocmd User GoyoEnter
+  if exists('#User#GoyoEnter')
+    doautocmd User GoyoEnter
+  endif
 endfunction
 
 function! s:goyo_off()
@@ -344,6 +346,9 @@ function! s:goyo_off()
 
   if goyo_disabled_airline && !exists("#airline")
     AirlineToggle
+    " For some reason, Airline requires two refreshes to avoid display
+    " artifacts
+    silent! AirlineRefresh
     silent! AirlineRefresh
   endif
 
@@ -363,7 +368,9 @@ function! s:goyo_off()
   if exists('g:goyo_callbacks[1]')
     call g:goyo_callbacks[1]()
   endif
-  silent! doautocmd User GoyoLeave
+  if exists('#User#GoyoLeave')
+    doautocmd User GoyoLeave
+  endif
 endfunction
 
 function! s:relsz(expr, limit)
@@ -414,6 +421,10 @@ function! goyo#execute(bang, dim)
     if exists('#goyo') == 0
       call s:goyo_on(a:dim)
     elseif !empty(a:dim)
+      if winnr('$') < 5
+        call s:goyo_off()
+        return goyo#execute(a:bang, a:dim)
+      endif
       let dim = s:parse_arg(a:dim)
       if !empty(dim)
         let t:goyo_dim = dim

sources_non_forked/nerdtree/CHANGELOG

@@ -0,0 +1,153 @@
+Next
+    - Rename "primary" and "secondary" trees to "tab" and "window" trees.
+    - Move a bunch of buffer level variables into the NERDTree and UI classes.
+    - Display cascading dirs on one line to save vertical/horizontal space (@matt-gardner: brainstorming/testing)
+    - Remove the old style UI - Remove 'NERDTreeDirArrows' option.
+    - On windows default to + and ~ for expand/collapse directory symbols.
+    - Lots more refactoring. Move a bunch of b: level vars into b:NERDTree and friends.
+
+5.0.0
+    - Refactor the code significantly:
+        * Break the classes out into their own files.
+        * Make the majority of the code OO - previously large parts were
+          effectively a tangle of "global" methods.
+    - Add an API to assign flags to nodes. This allows VCS plugins like
+      https://github.com/Xuyuanp/nerdtree-git-plugin to exist. Thanks to
+      Xuyuanp for helping design/test/build said API.
+    - add 'scope' argument to the key map API see :help NERDTreeAddKeyMap()
+    - add magic [[dir]] and [[file]] flags to NERDTreeIgnore
+    - add support for custom path filters. See :help NERDTreeAddPathFilter()
+    - add path listener API. See :help NERDTreePathListenerAPI.
+    - expand the fs menu functionality to list file properties (PhilRunninger,
+      apbarrero, JESii)
+    - make bookmarks work with `~` home shortcuts (hiberabyss)
+    - show OSX specific fsmenu options in regular vim on mac (evindor)
+    - make dir arrow icons configurable (PickRelated)
+    - optimise node sorting performance when opening large dirs (vtsang)
+    - make the root note render prettier by truncating it at a path slash (gcmt)
+    - remove NERDChristmasTree option - its always christmas now
+    - add "cascade" open and closing for dirs containing only another single
+      dir. See :help NERDTreeCascadeOpenSingleChildDir (pendulm)
+
+    Many other fixes, doc updates and contributions from:
+    actionshrimp
+    SchDen
+    egalpin
+    cperl82 - many small fixes
+    toiffel
+    WoLpH
+    handcraftedbits
+    devmanhinton
+    xiaodili
+    zhangoose
+    gastropoda
+    mixvin
+    alvan
+    lucascaton
+    kelaban
+    shanesmith
+    staeff
+    pendulm
+    stephenprater
+    franksort
+    agrussellknives
+    AndrewRadev
+    Twinside
+
+4.2.0
+    - Add NERDTreeDirArrows option to make the UI use pretty arrow chars
+      instead of the old +~| chars to define the tree structure (sickill)
+    - shift the syntax highlighting out into its own syntax file (gnap)
+    - add some mac specific options to the filesystem menu - for macvim
+      only (andersonfreitas)
+    - Add NERDTreeMinimalUI option to remove some non functional parts of the
+      nerdtree ui (camthompson)
+    - tweak the behaviour of :NERDTreeFind - see :help :NERDTreeFind for the
+      new behaviour (benjamingeiger)
+    - if no name is given to :Bookmark, make it default to the name of the
+      target file/dir (minyoung)
+    - use 'file' completion when doing copying, create, and move
+      operations (EvanDotPro)
+    - lots of misc bug fixes (paddyoloughlin, sdewald, camthompson, Vitaly
+      Bogdanov, AndrewRadev, mathias, scottstvnsn, kml, wycats, me RAWR!)
+
+4.1.0
+    features:
+    - NERDTreeFind to reveal the node for the current buffer in the tree,
+      see |NERDTreeFind|. This effectively merges the FindInNERDTree plugin (by
+      Doug McInnes) into the script.
+    - make NERDTreeQuitOnOpen apply to the t/T keymaps too. Thanks to Stefan
+      Ritter and Rémi Prévost.
+    - truncate the root node if wider than the tree window. Thanks to Victor
+      Gonzalez.
+
+    bugfixes:
+    - really fix window state restoring
+    - fix some win32 path escaping issues. Thanks to Stephan Baumeister, Ricky,
+      jfilip1024, and Chris Chambers
+
+4.0.0
+    - add a new programmable menu system (see :help NERDTreeMenu).
+    - add new APIs to add menus/menu-items to the menu system as well as
+      custom key mappings to the NERD tree buffer (see :help NERDTreeAPI).
+    - removed the old API functions
+    - added a mapping to maximize/restore the size of nerd tree window, thanks
+      to Guillaume Duranceau for the patch. See :help NERDTree-A for details.
+
+    - fix a bug where secondary nerd trees (netrw hijacked trees) and
+      NERDTreeQuitOnOpen didnt play nicely, thanks to Curtis Harvey.
+    - fix a bug where the script ignored directories whose name ended in a dot,
+      thanks to Aggelos Orfanakos for the patch.
+    - fix a bug when using the x mapping on the tree root, thanks to Bryan
+      Venteicher for the patch.
+    - fix a bug where the cursor position/window size of the nerd tree buffer
+      wasnt being stored on closing the window, thanks to Richard Hart.
+    - fix a bug where NERDTreeMirror would mirror the wrong tree
+
+3.1.1
+    - fix a bug where a non-listed no-name buffer was getting created every
+      time the tree windows was created, thanks to Derek Wyatt and owen1
+    - make <CR> behave the same as the 'o' mapping
+    - some helptag fixes in the doc, thanks strull
+    - fix a bug when using :set nohidden and opening a file where the previous
+      buf was modified. Thanks iElectric
+    - other minor fixes
+
+3.1.0
+    New features:
+    - add mappings to open files in a vsplit, see :help NERDTree-s and :help
+      NERDTree-gs
+    - make the statusline for the nerd tree window default to something
+      hopefully more useful. See :help 'NERDTreeStatusline'
+    Bugfixes:
+    - make the hijack netrw functionality work when vim is started with "vim
+      <some dir>" (thanks to Alf Mikula for the patch).
+    - fix a bug where the CWD wasnt being changed for some operations even when
+      NERDTreeChDirMode==2 (thanks to Lucas S. Buchala)
+    - add -bar to all the nerd tree :commands so they can chain with other
+      :commands (thanks to tpope)
+    - fix bugs when ignorecase was set (thanks to nach)
+    - fix a bug with the relative path code (thanks to nach)
+    - fix a bug where doing a :cd would cause :NERDTreeToggle to fail (thanks nach)
+
+
+3.0.1
+    Bugfixes:
+    - fix bugs with :NERDTreeToggle and :NERDTreeMirror when 'hidden
+      was not set
+    - fix a bug where :NERDTree <path> would fail if <path> was relative and
+      didnt start with a ./ or ../  Thanks to James Kanze.
+    - make the q mapping work with secondary (:e <dir>  style) trees,
+      thanks to jamessan
+    - fix a bunch of small bugs with secondary trees
+
+    More insane refactoring.
+
+3.0.0
+    - hijack netrw so that doing an :edit <directory>  will put a NERD tree in
+      the window rather than a netrw browser. See :help 'NERDTreeHijackNetrw'
+    - allow sharing of trees across tabs, see :help :NERDTreeMirror
+    - remove "top" and "bottom" as valid settings for NERDTreeWinPos
+    - change the '<tab>' mapping to 'i'
+    - change the 'H' mapping to 'I'
+    - lots of refactoring

sources_non_forked/nerdtree/LICENCE

@@ -0,0 +1,13 @@
+           DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+                   Version 2, December 2004
+
+Copyright (C) 2004 Sam Hocevar <sam@hocevar.net>
+
+Everyone is permitted to copy and distribute verbatim or modified
+copies of this license document, and changing it is allowed as long
+as the name is changed.
+
+           DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+  TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. You just DO WHAT THE FUCK YOU WANT TO.

sources_non_forked/nerdtree/README.markdown

@@ -55,7 +55,7 @@ The following features and functionality are provided by the NERD tree:
 Installation
 ------------
 
-[pathogen.vim](https://github.com/tpope/vim-pathogen) is the recommended way to install nerdtree.
+####[pathogen.vim](https://github.com/tpope/vim-pathogen)
 
     cd ~/.vim/bundle
     git clone https://github.com/scrooloose/nerdtree.git
@@ -63,6 +63,12 @@ Installation
 Then reload vim, run `:Helptags`, and check out `:help NERD_tree.txt`.
 
 
+####[apt-vim](https://github.com/egalpin/apt-vim)
+
+    apt-vim install -y https://github.com/scrooloose/nerdtree.git
+
+
+
 Faq
 ---
 
@@ -85,11 +91,13 @@ Stick this in your vimrc: `autocmd vimenter * NERDTree`
 
 > How can I open a NERDTree automatically when vim starts up if no files were specified?
 
-Stick this in your vimrc
+Stick this in your vimrc:
 
     autocmd StdinReadPre * let s:std_in=1
     autocmd VimEnter * if argc() == 0 && !exists("s:std_in") | NERDTree | endif
 
+Note: Now start vim with plain `vim`, not `vim .`
+
 > How can I map a specific key or shortcut to open NERDTree?
 
 Stick this in your vimrc to open NERDTree with `Ctrl+n` (you can set whatever key you want):
@@ -100,8 +108,15 @@ Stick this in your vimrc to open NERDTree with `Ctrl+n` (you can set whatever ke
 
 Stick this in your vimrc:
 
-    autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTreeType") && b:NERDTreeType == "primary") | q | endif
+    autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTree") && b:NERDTree.isTabTree()) | q | endif
 
 > Can I have different highlighting for different file extensions?
 
 See here: https://github.com/scrooloose/nerdtree/issues/433#issuecomment-92590696
+
+> How can I change default arrows?
+
+Use these variables in your vimrc. Note that below are default arrow symbols
+
+    let g:NERDTreeDirArrowExpandable = '▸'
+    let g:NERDTreeDirArrowCollapsible = '▾'

sources_non_forked/nerdtree/autoload/nerdtree.vim

@@ -4,17 +4,17 @@ endif
 let g:loaded_nerdtree_autoload = 1
 
 function! nerdtree#version()
-    return '4.2.0'
+    return '5.0.0'
 endfunction
 
 " SECTION: General Functions {{{1
 "============================================================
 
 "FUNCTION: nerdtree#checkForBrowse(dir) {{{2
-"inits a secondary nerd tree in the current buffer if appropriate
+"inits a window tree in the current buffer if appropriate
 function! nerdtree#checkForBrowse(dir)
     if a:dir != '' && isdirectory(a:dir)
-        call g:NERDTreeCreator.CreateSecondary(a:dir)
+        call g:NERDTreeCreator.CreateWindowTree(a:dir)
     endif
 endfunction
 
@@ -94,7 +94,7 @@ endfunction
 
 " FUNCTION: nerdtree#postSourceActions() {{{2
 function! nerdtree#postSourceActions()
-    call g:NERDTreeBookmark.CacheBookmarks(0)
+    call g:NERDTreeBookmark.CacheBookmarks(1)
     call nerdtree#ui_glue#createDefaultBindings()
 
     "load all nerdtree plugins

sources_non_forked/nerdtree/autoload/nerdtree/ui_glue.vim

@@ -105,7 +105,7 @@ endfunction
 "FUNCTION: s:activateBookmark() {{{1
 "handle the user activating a bookmark
 function! s:activateBookmark(bm)
-    call a:bm.activate(!a:bm.path.isDirectory ? {'where': 'p'} : {})
+    call a:bm.activate(b:NERDTree, !a:bm.path.isDirectory ? {'where': 'p'} : {})
 endfunction
 
 " FUNCTION: nerdtree#ui_glue#bookmarkNode(name) {{{1
@@ -140,9 +140,7 @@ endfunction
 " FUNCTION: s:chRoot(node) {{{1
 " changes the current root to the selected one
 function! s:chRoot(node)
-    call a:node.makeRoot()
+    call b:NERDTree.changeRoot(a:node)
-    call b:NERDTree.render()
-    call b:NERDTreeRoot.putCursorHere(0, 0)
 endfunction
 
 " FUNCTION: s:nerdtree#ui_glue#chRootCwd() {{{1
@@ -157,7 +155,7 @@ function! nerdtree#ui_glue#chRootCwd()
     if cwd.str() == g:NERDTreeFileNode.GetRootForTab().path.str()
        return
     endif
-    call s:chRoot(g:NERDTreeDirNode.New(cwd))
+    call s:chRoot(g:NERDTreeDirNode.New(cwd, b:NERDTree))
 endfunction
 
 " FUNCTION: nnerdtree#ui_glue#clearBookmarks(bookmarks) {{{1
@@ -173,6 +171,7 @@ function! nerdtree#ui_glue#clearBookmarks(bookmarks)
             call bookmark.delete()
         endfor
     endif
+    call b:NERDTree.root.refresh()
     call b:NERDTree.render()
 endfunction
 
@@ -208,8 +207,8 @@ endfunction
 " FUNCTION: s:closeTreeWindow() {{{1
 " close the tree window
 function! s:closeTreeWindow()
-    if b:NERDTreeType ==# "secondary" && b:NERDTreePreviousBuf != -1
+    if b:NERDTree.isWinTree() && b:NERDTree.previousBuf() != -1
-        exec "buffer " . b:NERDTreePreviousBuf
+        exec "buffer " . b:NERDTree.previousBuf()
     else
         if winnr("$") > 1
             call g:NERDTree.Close()
@@ -227,6 +226,7 @@ function! s:deleteBookmark(bm)
     if  nr2char(getchar()) ==# 'y'
         try
             call a:bm.delete()
+            call b:NERDTree.root.refresh()
             call b:NERDTree.render()
             redraw
         catch /^NERDTree/
@@ -241,7 +241,7 @@ endfunction
 " FUNCTION: s:displayHelp() {{{1
 " toggles the help display
 function! s:displayHelp()
-    let b:treeShowHelp = b:treeShowHelp ? 0 : 1
+    call b:NERDTree.ui.toggleHelp()
     call b:NERDTree.render()
     call b:NERDTree.ui.centerView()
 endfunction
@@ -269,27 +269,29 @@ function! s:findAndRevealPath()
         endtry
 
         if p.isUnder(cwd)
-            call g:NERDTreeCreator.CreatePrimary(cwd.str())
+            call g:NERDTreeCreator.CreateTabTree(cwd.str())
         else
-            call g:NERDTreeCreator.CreatePrimary(p.getParent().str())
+            call g:NERDTreeCreator.CreateTabTree(p.getParent().str())
         endif
     else
         if !p.isUnder(g:NERDTreeFileNode.GetRootForTab().path)
             if !g:NERDTree.IsOpen()
-                call g:NERDTreeCreator.TogglePrimary('')
+                call g:NERDTreeCreator.ToggleTabTree('')
             else
                 call g:NERDTree.CursorToTreeWin()
             endif
-            let b:NERDTreeShowHidden = g:NERDTreeShowHidden
+            call b:NERDTree.setShowHidden(g:NERDTreeShowHidden)
-            call s:chRoot(g:NERDTreeDirNode.New(p.getParent()))
+            call s:chRoot(g:NERDTreeDirNode.New(p.getParent(), b:NERDTree))
         else
             if !g:NERDTree.IsOpen()
-                call g:NERDTreeCreator.TogglePrimary("")
+                call g:NERDTreeCreator.ToggleTabTree("")
             endif
         endif
     endif
     call g:NERDTree.CursorToTreeWin()
-    call b:NERDTreeRoot.reveal(p)
+    let node = b:NERDTree.root.reveal(p)
+    call b:NERDTree.render()
+    call node.putCursorHere(1,0)
 
     if p.isUnixHiddenFile()
         let g:NERDTreeShowHidden = showhidden
@@ -312,7 +314,7 @@ function! s:handleLeftClick()
         endfor
 
         if currentNode.path.isDirectory
-            if startToCur =~# g:NERDTreeUI.MarkupReg() && startToCur =~# '[+~▾▸] \?$'
+            if startToCur =~# g:NERDTreeUI.MarkupReg() && startToCur =~# '[+~'.g:NERDTreeDirArrowExpandable.g:NERDTreeDirArrowCollapsible.'] \?$'
                 call currentNode.activate()
                 return
             endif
@@ -409,7 +411,7 @@ endfunction
 " FUNCTION: s:jumpToRoot() {{{1
 " moves the cursor to the root node
 function! s:jumpToRoot()
-    call b:NERDTreeRoot.putCursorHere(1, 0)
+    call b:NERDTree.root.putCursorHere(1, 0)
     call b:NERDTree.ui.centerView()
 endfunction
 
@@ -442,13 +444,13 @@ endfunction
 " put the cursor on the given bookmark and, if its a file, open it
 function! nerdtree#ui_glue#openBookmark(name)
     try
-        let targetNode = g:NERDTreeBookmark.GetNodeForName(a:name, 0)
+        let targetNode = g:NERDTreeBookmark.GetNodeForName(a:name, 0, b:NERDTree)
         call targetNode.putCursorHere(0, 1)
         redraw!
     catch /^NERDTree.BookmarkedNodeNotFoundError/
         call nerdtree#echo("note - target node is not cached")
         let bookmark = g:NERDTreeBookmark.BookmarkFor(a:name)
-        let targetNode = g:NERDTreeFileNode.New(bookmark.path)
+        let targetNode = g:NERDTreeFileNode.New(bookmark.path, b:NERDTree)
     endtry
     if targetNode.path.isDirectory
         call targetNode.openExplorer()
@@ -510,7 +512,7 @@ endfunction
 " put the cursor on the node associate with the given name
 function! nerdtree#ui_glue#revealBookmark(name)
     try
-        let targetNode = g:NERDTreeBookmark.GetNodeForName(a:name, 0)
+        let targetNode = g:NERDTreeBookmark.GetNodeForName(a:name, 0, b:NERDTree)
         call targetNode.putCursorHere(0, 1)
     catch /^NERDTree.BookmarkNotFoundError/
         call nerdtree#echo("Bookmark isnt cached under the current root")
@@ -522,7 +524,7 @@ endfunction
 " will be reloaded.
 function! s:refreshRoot()
     call nerdtree#echo("Refreshing the root node. This could take a while...")
-    call b:NERDTreeRoot.refresh()
+    call b:NERDTree.root.refresh()
     call b:NERDTree.render()
     redraw
     call nerdtree#echo("Refreshing the root node. This could take a while... DONE")
@@ -545,10 +547,10 @@ endfunction
 
 " FUNCTION: nerdtree#ui_glue#setupCommands() {{{1
 function! nerdtree#ui_glue#setupCommands()
-    command! -n=? -complete=dir -bar NERDTree :call g:NERDTreeCreator.CreatePrimary('<args>')
+    command! -n=? -complete=dir -bar NERDTree :call g:NERDTreeCreator.CreateTabTree('<args>')
-    command! -n=? -complete=dir -bar NERDTreeToggle :call g:NERDTreeCreator.TogglePrimary('<args>')
+    command! -n=? -complete=dir -bar NERDTreeToggle :call g:NERDTreeCreator.ToggleTabTree('<args>')
     command! -n=0 -bar NERDTreeClose :call g:NERDTree.Close()
-    command! -n=1 -complete=customlist,nerdtree#completeBookmarks -bar NERDTreeFromBookmark call g:NERDTreeCreator.CreatePrimary('<args>')
+    command! -n=1 -complete=customlist,nerdtree#completeBookmarks -bar NERDTreeFromBookmark call g:NERDTreeCreator.CreateTabTree('<args>')
     command! -n=0 -bar NERDTreeMirror call g:NERDTreeCreator.CreateMirror()
     command! -n=0 -bar NERDTreeFind call s:findAndRevealPath()
     command! -n=0 -bar NERDTreeFocus call NERDTreeFocus()
@@ -602,28 +604,28 @@ endfunction
 "keepState: 1 if the current root should be left open when the tree is
 "re-rendered
 function! nerdtree#ui_glue#upDir(keepState)
-    let cwd = b:NERDTreeRoot.path.str({'format': 'UI'})
+    let cwd = b:NERDTree.root.path.str({'format': 'UI'})
     if cwd ==# "/" || cwd =~# '^[^/]..$'
         call nerdtree#echo("already at top dir")
     else
         if !a:keepState
-            call b:NERDTreeRoot.close()
+            call b:NERDTree.root.close()
         endif
 
-        let oldRoot = b:NERDTreeRoot
+        let oldRoot = b:NERDTree.root
 
-        if empty(b:NERDTreeRoot.parent)
+        if empty(b:NERDTree.root.parent)
-            let path = b:NERDTreeRoot.path.getParent()
+            let path = b:NERDTree.root.path.getParent()
-            let newRoot = g:NERDTreeDirNode.New(path)
+            let newRoot = g:NERDTreeDirNode.New(path, b:NERDTree)
             call newRoot.open()
-            call newRoot.transplantChild(b:NERDTreeRoot)
+            call newRoot.transplantChild(b:NERDTree.root)
-            let b:NERDTreeRoot = newRoot
+            let b:NERDTree.root = newRoot
         else
-            let b:NERDTreeRoot = b:NERDTreeRoot.parent
+            let b:NERDTree.root = b:NERDTree.root.parent
         endif
 
         if g:NERDTreeChDirMode ==# 2
-            call b:NERDTreeRoot.path.changeToDir()
+            call b:NERDTree.root.path.changeToDir()
         endif
 
         call b:NERDTree.render()

sources_non_forked/nerdtree/doc/NERD_tree.txt

@@ -37,9 +37,7 @@ CONTENTS                                                   *NERDTree-contents*
         4.3.Menu API..........................|NERDTreeAddPathFilter()|
         4.4.Path Listener API.................|NERDTreePathListenerAPI|
     5.About...................................|NERDTreeAbout|
-    6.Changelog...............................|NERDTreeChangelog|
+    6.License.................................|NERDTreeLicense|
-    7.Credits.................................|NERDTreeCredits|
-    8.License.................................|NERDTreeLicense|
 
 ==============================================================================
 1. Intro                                                            *NERDTree*
@@ -673,9 +671,6 @@ NERD tree. These options should be set in your vimrc.
 |'NERDTreeMinimalUI'|           Disables display of the 'Bookmarks' label and 
                                 'Press ? for help' text.
 
-|'NERDTreeDirArrows'|           Tells the NERD tree to use arrows instead of
-                                + ~ chars when displaying directories.
-
 |'NERDTreeCascadeOpenSingleChildDir'|
                                 Cascade open while selected directory has only
                                 one child that also is a directory.
@@ -778,13 +773,13 @@ Default: 1.
 If set to 1, doing a >
     :edit <some directory>
 <
-will open up a "secondary" NERD tree instead of a netrw in the target window.
+will open up a window level NERD tree instead of a netrw in the target window.
 
-Secondary NERD trees behaves slightly different from a regular trees in the
+Window level trees behaves slightly different from a regular trees in the
 following respects:
     1. 'o' will open the selected file in the same window as the tree,
        replacing it.
-    2. you can have as many secondary tree as you want in the same tab.
+    2. you can have one tree per window - instead of per tab.
 
 ------------------------------------------------------------------------------
                                                             *'NERDTreeIgnore'*
@@ -947,7 +942,7 @@ Other examples: >
 ------------------------------------------------------------------------------
                                                         *'NERDTreeStatusline'*
 Values: Any valid statusline setting.
-Default: %{b:NERDTreeRoot.path.strForOS(0)}
+Default: %{b:NERDTree.root.path.strForOS(0)}
 
 Tells the script what to use as the |'statusline'| setting for NERD tree
 windows.
@@ -988,19 +983,6 @@ of the following lines to set this option: >
     let NERDTreeMinimalUI=1
 <
 
-------------------------------------------------------------------------------
-                                                           *'NERDTreeDirArrows'*
-Values: 0 or 1
-Default: 0.
-
-This option is used to change the default look of directory nodes displayed in
-the tree. When set to 0 it shows old-school bars (|), + and ~ chars. If set to
-1 it shows right and down arrows.  Use one of the follow lines to set this
-option: >
-    let NERDTreeDirArrows=0
-    let NERDTreeDirArrows=1
-<
-
 ------------------------------------------------------------------------------
                                           *'NERDTreeCascadeOpenSingleChildDir'*
 Values: 0 or 1
@@ -1205,7 +1187,7 @@ Use this API if you want to run a callback for events on Path objects. E.G >
         "This function will be called whenever a Path object is created.
 
         "a:event is an object that contains a bunch of relevant info -
-        "including the path in question. See lib/event.vim for details.
+        "including the path in question. See lib/nerdtree/event.vim for details.
     endfunction
 <
 Current events supported:
@@ -1235,187 +1217,8 @@ The latest stable versions can be found at
 The latest dev versions are on github
     http://github.com/scrooloose/nerdtree
 
-
 ==============================================================================
-6. Changelog                                               *NERDTreeChangelog*
+6. License                                                   *NERDTreeLicense*
-
-Next
-    - add 'scope' argument to the key map API
-    - add NERDTreeCustomIgnoreFilter hook - needs doc
-    - add magic [[dir]] and [[file]] flags to NERDTreeIgnore
-    - add support for custom path filters. See :help NERDTreeAddPathFilter()
-    - add path listener API. See :help NERDTreePathListenerAPI.
-
-4.2.0
-    - Add NERDTreeDirArrows option to make the UI use pretty arrow chars
-      instead of the old +~| chars to define the tree structure (sickill)
-    - shift the syntax highlighting out into its own syntax file (gnap)
-    - add some mac specific options to the filesystem menu - for macvim
-      only (andersonfreitas)
-    - Add NERDTreeMinimalUI option to remove some non functional parts of the
-      nerdtree ui (camthompson)
-    - tweak the behaviour of :NERDTreeFind - see :help :NERDTreeFind for the
-      new behaviour (benjamingeiger)
-    - if no name is given to :Bookmark, make it default to the name of the
-      target file/dir (minyoung)
-    - use 'file' completion when doing copying, create, and move
-      operations (EvanDotPro)
-    - lots of misc bug fixes (paddyoloughlin, sdewald, camthompson, Vitaly
-      Bogdanov, AndrewRadev, mathias, scottstvnsn, kml, wycats, me RAWR!)
-
-4.1.0
-    features:
-    - NERDTreeFind to reveal the node for the current buffer in the tree,
-      see |NERDTreeFind|. This effectively merges the FindInNERDTree plugin (by
-      Doug McInnes) into the script.
-    - make NERDTreeQuitOnOpen apply to the t/T keymaps too. Thanks to Stefan
-      Ritter and Rémi Prévost.
-    - truncate the root node if wider than the tree window. Thanks to Victor
-      Gonzalez.
-
-    bugfixes:
-    - really fix window state restoring
-    - fix some win32 path escaping issues. Thanks to Stephan Baumeister, Ricky,
-      jfilip1024, and Chris Chambers
-
-4.0.0
-    - add a new programmable menu system (see :help NERDTreeMenu).
-    - add new APIs to add menus/menu-items to the menu system as well as
-      custom key mappings to the NERD tree buffer (see :help NERDTreeAPI).
-    - removed the old API functions
-    - added a mapping to maximize/restore the size of nerd tree window, thanks
-      to Guillaume Duranceau for the patch. See :help NERDTree-A for details.
-
-    - fix a bug where secondary nerd trees (netrw hijacked trees) and
-      NERDTreeQuitOnOpen didnt play nicely, thanks to Curtis Harvey.
-    - fix a bug where the script ignored directories whose name ended in a dot,
-      thanks to Aggelos Orfanakos for the patch.
-    - fix a bug when using the x mapping on the tree root, thanks to Bryan
-      Venteicher for the patch.
-    - fix a bug where the cursor position/window size of the nerd tree buffer
-      wasnt being stored on closing the window, thanks to Richard Hart.
-    - fix a bug where NERDTreeMirror would mirror the wrong tree
-
-3.1.1
-    - fix a bug where a non-listed no-name buffer was getting created every
-      time the tree windows was created, thanks to Derek Wyatt and owen1
-    - make <CR> behave the same as the 'o' mapping
-    - some helptag fixes in the doc, thanks strull
-    - fix a bug when using :set nohidden and opening a file where the previous
-      buf was modified. Thanks iElectric
-    - other minor fixes
-
-3.1.0
-    New features:
-    - add mappings to open files in a vsplit, see :help NERDTree-s and :help
-      NERDTree-gs
-    - make the statusline for the nerd tree window default to something
-      hopefully more useful. See :help 'NERDTreeStatusline'
-    Bugfixes:
-    - make the hijack netrw functionality work when vim is started with "vim
-      <some dir>" (thanks to Alf Mikula for the patch).
-    - fix a bug where the CWD wasnt being changed for some operations even when
-      NERDTreeChDirMode==2 (thanks to Lucas S. Buchala)
-    - add -bar to all the nerd tree :commands so they can chain with other
-      :commands (thanks to tpope)
-    - fix bugs when ignorecase was set (thanks to nach)
-    - fix a bug with the relative path code (thanks to nach)
-    - fix a bug where doing a :cd would cause :NERDTreeToggle to fail (thanks nach)
-
-
-3.0.1
-    Bugfixes:
-    - fix bugs with :NERDTreeToggle and :NERDTreeMirror when 'hidden
-      was not set
-    - fix a bug where :NERDTree <path> would fail if <path> was relative and
-      didnt start with a ./ or ../  Thanks to James Kanze.
-    - make the q mapping work with secondary (:e <dir>  style) trees,
-      thanks to jamessan
-    - fix a bunch of small bugs with secondary trees
-
-    More insane refactoring.
-
-3.0.0
-    - hijack netrw so that doing an :edit <directory>  will put a NERD tree in
-      the window rather than a netrw browser. See :help 'NERDTreeHijackNetrw'
-    - allow sharing of trees across tabs, see :help :NERDTreeMirror
-    - remove "top" and "bottom" as valid settings for NERDTreeWinPos
-    - change the '<tab>' mapping to 'i'
-    - change the 'H' mapping to 'I'
-    - lots of refactoring
-
-==============================================================================
-7. Credits                                                   *NERDTreeCredits*
-
-Thanks to the following people for testing, bug reports, ideas etc. Without
-you I probably would have got bored of the hacking the NERD tree and
-just downloaded pr0n instead.
-
-    Tim Carey-Smith (halorgium)
-    Vigil
-    Nick Brettell
-    Thomas Scott Urban
-    Terrance Cohen
-    Yegappan Lakshmanan
-    Jason Mills
-    Michael Geddes (frogonwheels)
-    Yu Jun
-    Michael Madsen
-    AOYAMA Shotaro
-    Zhang Weiwu
-    Niels Aan de Brugh
-    Olivier Yiptong
-    Zhang Shuhan
-    Cory Echols
-    Piotr Czachur
-    Yuan Jiang
-    Matan Nassau
-    Maxim Kim
-    Charlton Wang
-    Matt Wozniski (godlygeek)
-    knekk
-    Sean Chou
-    Ryan Penn
-    Simon Peter Nicholls
-    Michael Foobar
-    Tomasz Chomiuk
-    Denis Pokataev
-    Tim Pope (tpope)
-    James Kanze
-    James Vega (jamessan)
-    Frederic Chanal (nach)
-    Alf Mikula
-    Lucas S. Buchala
-    Curtis Harvey
-    Guillaume Duranceau
-    Richard Hart (hates)
-    Doug McInnes
-    Stefan Ritter
-    Rémi Prévost
-    Victor Gonzalez
-    Stephan Baumeister
-    Ricky
-    jfilip1024
-    Chris Chambers
-    Vitaly Bogdanov
-    Patrick O'Loughlin (paddyoloughlin)
-    Cam Thompson (camthompson)
-    Marcin Kulik (sickill)
-    Steve DeWald (sdewald)
-    Ivan Necas (iNecas)
-    George Ang (gnap)
-    Evan Coury (EvanDotPro)
-    Andrew Radev (AndrewRadev)
-    Matt Gauger (mathias)
-    Scott Stevenson (scottstvnsn)
-    Anderson Freitas (andersonfreitas)
-    Kamil K. Lemański (kml)
-    Yehuda Katz (wycats)
-    Min-Young Wu (minyoung)
-    Benjamin Geiger (benjamingeiger)
-
-==============================================================================
-8. License                                                   *NERDTreeLicense*
 
 The NERD tree is released under the wtfpl.
 See http://sam.zoy.org/wtfpl/COPYING.

sources_non_forked/nerdtree/lib/nerdtree/bookmark.vim

@@ -3,9 +3,9 @@
 let s:Bookmark = {}
 let g:NERDTreeBookmark = s:Bookmark
 
-" FUNCTION: Bookmark.activate() {{{1
+" FUNCTION: Bookmark.activate(nerdtree) {{{1
-function! s:Bookmark.activate(...)
+function! s:Bookmark.activate(nerdtree, ...)
-    call self.open(a:0 ? a:1 : {})
+    call self.open(a:nerdtree, a:0 ? a:1 : {})
 endfunction
 
 " FUNCTION: Bookmark.AddBookmark(name, path) {{{1
@@ -87,6 +87,7 @@ function! s:Bookmark.CacheBookmarks(silent)
 
                 let name = substitute(i, '^\(.\{-}\) .*$', '\1', '')
                 let path = substitute(i, '^.\{-} \(.*\)$', '\1', '')
+                let path = fnamemodify(path, ':p')
 
                 try
                     let bookmark = s:Bookmark.New(name, g:NERDTreePath.New(path))
@@ -127,26 +128,18 @@ endfunction
 " Delete this bookmark. If the node for this bookmark is under the current
 " root, then recache bookmarks for its Path object
 function! s:Bookmark.delete()
-    let node = {}
-    try
-        let node = self.getNode(1)
-    catch /^NERDTree.BookmarkedNodeNotFoundError/
-    endtry
     call remove(s:Bookmark.Bookmarks(), index(s:Bookmark.Bookmarks(), self))
-    if !empty(node)
-        call node.path.cacheDisplayString()
-    endif
     call s:Bookmark.Write()
 endfunction
 
-" FUNCTION: Bookmark.getNode(searchFromAbsoluteRoot) {{{1
+" FUNCTION: Bookmark.getNode(nerdtree, searchFromAbsoluteRoot) {{{1
 " Gets the treenode for this bookmark
 "
 " Args:
 " searchFromAbsoluteRoot: specifies whether we should search from the current
 " tree root, or the highest cached node
-function! s:Bookmark.getNode(searchFromAbsoluteRoot)
+function! s:Bookmark.getNode(nerdtree, searchFromAbsoluteRoot)
-    let searchRoot = a:searchFromAbsoluteRoot ? g:NERDTreeDirNode.AbsoluteTreeRoot() : b:NERDTreeRoot
+    let searchRoot = a:searchFromAbsoluteRoot ? a:nerdtree.root.AbsoluteTreeRoot() : a:nerdtree.root
     let targetNode = searchRoot.findNode(self.path)
     if empty(targetNode)
         throw "NERDTree.BookmarkedNodeNotFoundError: no node was found for bookmark: " . self.name
@@ -154,12 +147,12 @@ function! s:Bookmark.getNode(searchFromAbsoluteRoot)
     return targetNode
 endfunction
 
-" FUNCTION: Bookmark.GetNodeForName(name, searchFromAbsoluteRoot) {{{1
+" FUNCTION: Bookmark.GetNodeForName(name, searchFromAbsoluteRoot, nerdtree) {{{1
 " Class method that finds the bookmark with the given name and returns the
 " treenode for it.
-function! s:Bookmark.GetNodeForName(name, searchFromAbsoluteRoot)
+function! s:Bookmark.GetNodeForName(name, searchFromAbsoluteRoot, nerdtree)
     let bookmark = s:Bookmark.BookmarkFor(a:name)
-    return bookmark.getNode(a:searchFromAbsoluteRoot)
+    return bookmark.getNode(nerdtree, a:searchFromAbsoluteRoot)
 endfunction
 
 " FUNCTION: Bookmark.GetSelected() {{{1
@@ -209,8 +202,11 @@ function! s:Bookmark.New(name, path)
     return newBookmark
 endfunction
 
-" FUNCTION: Bookmark.open([options]) {{{1
+" FUNCTION: Bookmark.open(nerdtree, [options]) {{{1
 "Args:
+"
+"nerdtree: the tree to load open the bookmark in
+"
 "A dictionary containing the following keys (all optional):
 "  'where': Specifies whether the node should be opened in new split/tab or in
 "           the previous window. Can be either 'v' (vertical split), 'h'
@@ -219,11 +215,11 @@ endfunction
 "  'keepopen': dont close the tree window
 "  'stay': open the file, but keep the cursor in the tree win
 "
-function! s:Bookmark.open(...)
+function! s:Bookmark.open(nerdtree, ...)
     let opts = a:0 ? a:1 : {}
 
     if self.path.isDirectory && !has_key(opts, 'where')
-        call self.toRoot()
+        call self.toRoot(a:nerdtree)
     else
         let opener = g:NERDTreeOpener.New(self.path, opts)
         call opener.open(self)
@@ -265,26 +261,24 @@ function! s:Bookmark.str()
     return '>' . self.name . ' ' . pathStr
 endfunction
 
-" FUNCTION: Bookmark.toRoot() {{{1
+" FUNCTION: Bookmark.toRoot(nerdtree) {{{1
 " Make the node for this bookmark the new tree root
-function! s:Bookmark.toRoot()
+function! s:Bookmark.toRoot(nerdtree)
     if self.validate()
         try
-            let targetNode = self.getNode(1)
+            let targetNode = self.getNode(a:nerdtree, 1)
         catch /^NERDTree.BookmarkedNodeNotFoundError/
-            let targetNode = g:NERDTreeFileNode.New(s:Bookmark.BookmarkFor(self.name).path)
+            let targetNode = g:NERDTreeFileNode.New(s:Bookmark.BookmarkFor(self.name).path, a:nerdtree)
         endtry
-        call targetNode.makeRoot()
+        call a:nerdtree.changeRoot(targetNode)
-        call b:NERDTree.render()
-        call targetNode.putCursorHere(0, 0)
     endif
 endfunction
 
-" FUNCTION: Bookmark.ToRoot(name) {{{1
+" FUNCTION: Bookmark.ToRoot(name, nerdtree) {{{1
 " Make the node for this bookmark the new tree root
-function! s:Bookmark.ToRoot(name)
+function! s:Bookmark.ToRoot(name, nerdtree)
     let bookmark = s:Bookmark.BookmarkFor(a:name)
-    call bookmark.toRoot()
+    call bookmark.toRoot(a:nerdtree)
 endfunction
 
 " FUNCTION: Bookmark.validate() {{{1
@@ -293,7 +287,6 @@ function! s:Bookmark.validate()
         return 1
     else
         call s:Bookmark.CacheBookmarks(1)
-        call b:NERDTree.render()
         call nerdtree#echo(self.name . "now points to an invalid location. See :help NERDTreeInvalidBookmarks for info.")
         return 0
     endif
@@ -304,7 +297,7 @@ endfunction
 function! s:Bookmark.Write()
     let bookmarkStrings = []
     for i in s:Bookmark.Bookmarks()
-        call add(bookmarkStrings, i.name . ' ' . i.path.str())
+        call add(bookmarkStrings, i.name . ' ' . fnamemodify(i.path.str(), ':~'))
     endfor
 
     "add a blank line before the invalid ones

sources_non_forked/nerdtree/lib/nerdtree/creator.vim

@@ -1,5 +1,5 @@
 "CLASS: Creator
-"Creates primary/secondary/mirror nerdtree windows. Sets up all the window and
+"Creates tab/window/mirror nerdtree windows. Sets up all the window and
 "buffer options and key mappings etc.
 "============================================================
 let s:Creator = {}
@@ -16,7 +16,7 @@ function! s:Creator._bindMappings()
     command! -buffer -complete=customlist,nerdtree#completeBookmarks -nargs=1 RevealBookmark :call nerdtree#ui_glue#revealBookmark('<args>')
     command! -buffer -complete=customlist,nerdtree#completeBookmarks -nargs=1 OpenBookmark :call nerdtree#ui_glue#openBookmark('<args>')
     command! -buffer -complete=customlist,nerdtree#completeBookmarks -nargs=* ClearBookmarks call nerdtree#ui_glue#clearBookmarks('<args>')
-    command! -buffer -complete=customlist,nerdtree#completeBookmarks -nargs=+ BookmarkToRoot call g:NERDTreeBookmark.ToRoot('<args>')
+    command! -buffer -complete=customlist,nerdtree#completeBookmarks -nargs=+ BookmarkToRoot call g:NERDTreeBookmark.ToRoot('<args>', b:NERDTree)
     command! -buffer -nargs=0 ClearAllBookmarks call g:NERDTreeBookmark.ClearAll() <bar> call b:NERDTree.render()
     command! -buffer -nargs=0 ReadBookmarks call g:NERDTreeBookmark.CacheBookmarks(0) <bar> call b:NERDTree.render()
     command! -buffer -nargs=0 WriteBookmarks call g:NERDTreeBookmark.Write()
@@ -32,15 +32,15 @@ function! s:Creator.BufNamePrefix()
     return 'NERD_tree_'
 endfunction
 
-"FUNCTION: s:Creator.CreatePrimary(a:name) {{{1
+"FUNCTION: s:Creator.CreateTabTree(a:name) {{{1
-function! s:Creator.CreatePrimary(name)
+function! s:Creator.CreateTabTree(name)
     let creator = s:Creator.New()
-    call creator.createPrimary(a:name)
+    call creator.createTabTree(a:name)
 endfunction
 
-"FUNCTION: s:Creator.createPrimary(a:name) {{{1
+"FUNCTION: s:Creator.createTabTree(a:name) {{{1
 "name: the name of a bookmark or a directory
-function! s:Creator.createPrimary(name)
+function! s:Creator.createTabTree(name)
     let path = self._pathForString(a:name)
 
     "abort if exception was thrown (bookmark/dir doesn't exist)
@@ -48,6 +48,10 @@ function! s:Creator.createPrimary(name)
         return
     endif
 
+    if path == {}
+        return
+    endif
+
     "if instructed to, then change the vim CWD to the dir the NERDTree is
     "inited in
     if g:NERDTreeChDirMode != 0
@@ -58,32 +62,26 @@ function! s:Creator.createPrimary(name)
         if g:NERDTree.IsOpen()
             call g:NERDTree.Close()
         endif
-        unlet t:NERDTreeBufName
+
+        call self._removeTreeBufForTab()
     endif
 
     call self._createTreeWin()
-    call self._createNERDTree(path)
+    call self._createNERDTree(path, "tab")
-    let b:NERDTreeType = "primary"
-    let b:treeShowHelp = 0
-    let b:NERDTreeIgnoreEnabled = 1
-    let b:NERDTreeShowFiles = g:NERDTreeShowFiles
-    let b:NERDTreeShowHidden = g:NERDTreeShowHidden
-    let b:NERDTreeShowBookmarks = g:NERDTreeShowBookmarks
-
     call b:NERDTree.render()
-    call b:NERDTreeRoot.putCursorHere(0, 0)
+    call b:NERDTree.root.putCursorHere(0, 0)
 
     call self._broadcastInitEvent()
 endfunction
 
-"FUNCTION: s:Creator.CreateSecondary(dir) {{{1
+"FUNCTION: s:Creator.CreateWindowTree(dir) {{{1
-function! s:Creator.CreateSecondary(dir)
+function! s:Creator.CreateWindowTree(dir)
     let creator = s:Creator.New()
-    call creator.createSecondary(a:dir)
+    call creator.createWindowTree(a:dir)
 endfunction
 
-"FUNCTION: s:Creator.createSecondary(dir) {{{1
+"FUNCTION: s:Creator.createWindowTree(dir) {{{1
-function! s:Creator.createSecondary(dir)
+function! s:Creator.createWindowTree(dir)
     try
         let path = g:NERDTreePath.New(a:dir)
     catch /^NERDTree.InvalidArgumentsError/
@@ -96,14 +94,13 @@ function! s:Creator.createSecondary(dir)
 
     let previousBuf = expand("#")
 
-    "we need a unique name for each secondary tree buffer to ensure they are
+    "we need a unique name for each window tree buffer to ensure they are
     "all independent
     exec "silent edit " . self._nextBufferName()
 
-    let b:NERDTreePreviousBuf = bufnr(previousBuf)
+    call self._createNERDTree(path, "window")
-    call self._createNERDTree(path)
+    let b:NERDTree._previousBuf = bufnr(previousBuf)
     call self._setCommonBufOptions()
-    let b:NERDTreeType = "secondary"
 
     call b:NERDTree.render()
 
@@ -111,8 +108,8 @@ function! s:Creator.createSecondary(dir)
 endfunction
 
 " FUNCTION: s:Creator._createNERDTree(path) {{{1
-function! s:Creator._createNERDTree(path)
+function! s:Creator._createNERDTree(path, type)
-    let b:NERDTree = g:NERDTree.New(a:path)
+    let b:NERDTree = g:NERDTree.New(a:path, a:type)
     "TODO: This is kept for compatability only since many things use
     "b:NERDTreeRoot instead of the new NERDTree.root
     "Remove this one day
@@ -145,7 +142,7 @@ function! s:Creator.createMirror()
     let i = 0
     while i < len(treeBufNames)
         let bufName = treeBufNames[i]
-        let treeRoot = getbufvar(bufName, "NERDTreeRoot")
+        let treeRoot = getbufvar(bufName, "NERDTree").root
         let options[i+1 . '. ' . treeRoot.path.str() . '  (buf name: ' . bufName . ')'] = bufName
         let i = i + 1
     endwhile
@@ -201,6 +198,15 @@ function! s:Creator._createTreeWin()
     call self._setCommonBufOptions()
 endfunction
 
+"FUNCTION: s:Creator._isBufHidden(nr) {{{1
+function! s:Creator._isBufHidden(nr)
+    redir => bufs
+    silent ls!
+    redir END
+
+    return bufs =~ a:nr . '..h'
+endfunction
+
 "FUNCTION: s:Creator.New() {{{1
 function! s:Creator.New()
     let newCreator = copy(self)
@@ -245,7 +251,7 @@ function! s:Creator._pathForString(str)
             let path = g:NERDTreePath.New(dir)
         catch /^NERDTree.InvalidArgumentsError/
             call nerdtree#echo("No bookmark or directory found for: " . a:str)
-            return
+            return {}
         endtry
     endif
     if !path.isDirectory
@@ -255,6 +261,23 @@ function! s:Creator._pathForString(str)
     return path
 endfunction
 
+" Function: s:Creator._removeTreeBufForTab()   {{{1
+function! s:Creator._removeTreeBufForTab()
+    let buf = bufnr(t:NERDTreeBufName)
+
+    "if &hidden is not set then it will already be gone
+    if buf != -1
+
+        "nerdtree buf may be mirrored/displayed elsewhere
+        if self._isBufHidden(buf)
+            exec "bwipeout " . buf
+        endif
+
+    endif
+
+    unlet t:NERDTreeBufName
+endfunction
+
 "FUNCTION: s:Creator._setCommonBufOptions() {{{1
 function! s:Creator._setCommonBufOptions()
     "throwaway buffer options
@@ -283,12 +306,6 @@ function! s:Creator._setCommonBufOptions()
     endif
 
     call self._setupStatusline()
-
-    let b:treeShowHelp = 0
-    let b:NERDTreeIgnoreEnabled = 1
-    let b:NERDTreeShowFiles = g:NERDTreeShowFiles
-    let b:NERDTreeShowHidden = g:NERDTreeShowHidden
-    let b:NERDTreeShowBookmarks = g:NERDTreeShowBookmarks
     call self._bindMappings()
     setlocal filetype=nerdtree
 endfunction
@@ -318,20 +335,20 @@ function! s:Creator._tabpagevar(tabnr, var)
     return v
 endfunction
 
-"FUNCTION: s:Creator.TogglePrimary(dir) {{{1
+"FUNCTION: s:Creator.ToggleTabTree(dir) {{{1
-function! s:Creator.TogglePrimary(dir)
+function! s:Creator.ToggleTabTree(dir)
     let creator = s:Creator.New()
-    call creator.togglePrimary(a:dir)
+    call creator.toggleTabTree(a:dir)
 endfunction
 
-"FUNCTION: s:Creator.togglePrimary(dir) {{{1
+"FUNCTION: s:Creator.toggleTabTree(dir) {{{1
 "Toggles the NERD tree. I.e the NERD tree is open, it is closed, if it is
 "closed it is restored or initialized (if it doesnt exist)
 "
 "Args:
 "dir: the full path for the root node (is only used if the NERD tree is being
 "initialized.
-function! s:Creator.togglePrimary(dir)
+function! s:Creator.toggleTabTree(dir)
     if g:NERDTree.ExistsForTab()
         if !g:NERDTree.IsOpen()
             call self._createTreeWin()
@@ -343,7 +360,7 @@ function! s:Creator.togglePrimary(dir)
             call g:NERDTree.Close()
         endif
     else
-        call self.createPrimary(a:dir)
+        call self.createTabTree(a:dir)
     endif
 endfunction
 

sources_non_forked/nerdtree/lib/nerdtree/nerdtree.vim

@@ -8,8 +8,30 @@ function! s:NERDTree.AddPathFilter(callback)
     call add(s:NERDTree.PathFilters(), a:callback)
 endfunction
 
+"FUNCTION: s:NERDTree.changeRoot(node) {{{1
+function! s:NERDTree.changeRoot(node)
+    if a:node.path.isDirectory
+        let self.root = a:node
+    else
+        call a:node.cacheParent()
+        let self.root = a:node.parent
+    endif
+
+    call self.root.open()
+
+    "change dir to the dir of the new root if instructed to
+    if g:NERDTreeChDirMode ==# 2
+        exec "cd " . self.root.path.str({'format': 'Edit'})
+    endif
+
+    call self.render()
+    call self.root.putCursorHere(0, 0)
+
+    silent doautocmd User NERDTreeNewRoot
+endfunction
+
 "FUNCTION: s:NERDTree.Close() {{{1
-"Closes the primary NERD tree window for this tab
+"Closes the tab tree window for this tab
 function! s:NERDTree.Close()
     if !s:NERDTree.IsOpen()
         return
@@ -43,7 +65,7 @@ endfunction
 "FUNCTION: s:NERDTree.CursorToBookmarkTable(){{{1
 "Places the cursor at the top of the bookmarks table
 function! s:NERDTree.CursorToBookmarkTable()
-    if !b:NERDTreeShowBookmarks
+    if !b:NERDTree.ui.getShowBookmarks()
         throw "NERDTree.IllegalOperationError: cant find bookmark table, bookmarks arent active"
     endif
 
@@ -73,13 +95,18 @@ endfunction
 " Function: s:NERDTree.ExistsForBuffer()   {{{1
 " Returns 1 if a nerd tree root exists in the current buffer
 function! s:NERDTree.ExistsForBuf()
-    return exists("b:NERDTreeRoot")
+    return exists("b:NERDTree")
 endfunction
 
 " Function: s:NERDTree.ExistsForTab()   {{{1
 " Returns 1 if a nerd tree root exists in the current tab
 function! s:NERDTree.ExistsForTab()
-    return exists("t:NERDTreeBufName")
+    if !exists("t:NERDTreeBufName")
+        return
+    end
+
+    "check b:NERDTree is still there and hasn't been e.g. :bdeleted
+    return !empty(getbufvar(bufnr(t:NERDTreeBufName), 'NERDTree'))
 endfunction
 
 function! s:NERDTree.ForCurrentBuf()
@@ -90,14 +117,29 @@ function! s:NERDTree.ForCurrentBuf()
     endif
 endfunction
 
+"FUNCTION: s:NERDTree.ForCurrentTab() {{{1
+function! s:NERDTree.ForCurrentTab()
+    if !s:NERDTree.ExistsForTab()
+        return
+    endif
+
+    let bufnr = bufnr(t:NERDTreeBufName)
+    return getbufvar(bufnr, "NERDTree")
+endfunction
+
+"FUNCTION: s:NERDTree.getRoot() {{{1
+function! s:NERDTree.getRoot()
+    return self.root
+endfunction
+
 "FUNCTION: s:NERDTree.GetWinNum() {{{1
 "gets the nerd tree window number for this tab
 function! s:NERDTree.GetWinNum()
     if exists("t:NERDTreeBufName")
         return bufwinnr(t:NERDTreeBufName)
-    else
-        return -1
     endif
+
+    return -1
 endfunction
 
 "FUNCTION: s:NERDTree.IsOpen() {{{1
@@ -105,6 +147,16 @@ function! s:NERDTree.IsOpen()
     return s:NERDTree.GetWinNum() != -1
 endfunction
 
+"FUNCTION: s:NERDTree.isTabTree() {{{1
+function! s:NERDTree.isTabTree()
+    return self._type == "tab"
+endfunction
+
+"FUNCTION: s:NERDTree.isWinTree() {{{1
+function! s:NERDTree.isWinTree()
+    return self._type == "window"
+endfunction
+
 "FUNCTION: s:NERDTree.MustBeOpen() {{{1
 function! s:NERDTree.MustBeOpen()
     if !s:NERDTree.IsOpen()
@@ -113,11 +165,11 @@ function! s:NERDTree.MustBeOpen()
 endfunction
 
 "FUNCTION: s:NERDTree.New() {{{1
-function! s:NERDTree.New(path)
+function! s:NERDTree.New(path, type)
     let newObj = copy(self)
     let newObj.ui = g:NERDTreeUI.New(newObj)
-    let newObj.root = g:NERDTreeDirNode.New(a:path)
+    let newObj.root = g:NERDTreeDirNode.New(a:path, newObj)
-
+    let newObj._type = a:type
     return newObj
 endfunction
 
@@ -129,6 +181,10 @@ function! s:NERDTree.PathFilters()
     return s:NERDTree._PathFilters
 endfunction
 
+"FUNCTION: s:NERDTree.previousBuf() {{{1
+function! s:NERDTree.previousBuf()
+    return self._previousBuf
+endfunction
 
 "FUNCTION: s:NERDTree.render() {{{1
 "A convenience function - since this is called often

sources_non_forked/nerdtree/lib/nerdtree/notifier.vim

@@ -11,8 +11,8 @@ function! s:Notifier.AddListener(event, funcname)
     call add(listeners, a:funcname)
 endfunction
 
-function! s:Notifier.NotifyListeners(event, path, params)
+function! s:Notifier.NotifyListeners(event, path, nerdtree, params)
-    let event = g:NERDTreeEvent.New(b:NERDTree, a:path, a:event, a:params)
+    let event = g:NERDTreeEvent.New(a:nerdtree, a:path, a:event, a:params)
 
     for listener in s:Notifier.GetListenersForEvent(a:event)
         call {listener}(event)

sources_non_forked/nerdtree/lib/nerdtree/opener.vim

@@ -64,7 +64,7 @@ endfunction
 
 "FUNCTION: Opener._gotoTargetWin() {{{1
 function! s:Opener._gotoTargetWin()
-    if b:NERDTreeType ==# "secondary"
+    if b:NERDTree.isWinTree()
         if self._where == 'v'
             vsplit
         elseif self._where == 'h'
@@ -149,7 +149,7 @@ function! s:Opener.New(path, opts)
 
     let newObj._keepopen = nerdtree#has_opt(a:opts, 'keepopen')
     let newObj._where = has_key(a:opts, 'where') ? a:opts['where'] : ''
-    let newObj._treetype = b:NERDTreeType
+    let newObj._nerdtree = b:NERDTree
     call newObj._saveCursorPos()
 
     return newObj
@@ -247,34 +247,25 @@ function! s:Opener._openFile()
     endif
 
     call self._gotoTargetWin()
-
-    if self._treetype ==# "secondary"
     call self._path.edit()
-    else
-        call self._path.edit()
-
-
     if self._stay
         call self._restoreCursorPos()
     endif
-    endif
 endfunction
 
 "FUNCTION: Opener._openDirectory(node) {{{1
 function! s:Opener._openDirectory(node)
-    if self._treetype ==# "secondary"
+    if self._nerdtree.isWinTree()
         call self._gotoTargetWin()
-        call g:NERDTreeCreator.CreateSecondary(a:node.path.str())
+        call g:NERDTreeCreator.CreateWindow(a:node.path.str())
     else
         call self._gotoTargetWin()
         if empty(self._where)
-            call a:node.makeRoot()
+            call b:NERDTree.changeRoot(a:node)
-            call b:NERDTree.render()
-            call a:node.putCursorHere(0, 0)
         elseif self._where == 't'
-            call g:NERDTreeCreator.CreatePrimary(a:node.path.str())
+            call g:NERDTreeCreator.CreateTabTree(a:node.path.str())
         else
-            call g:NERDTreeCreator.CreateSecondary(a:node.path.str())
+            call g:NERDTreeCreator.CreateWindowTree(a:node.path.str())
         endif
     endif
 

sources_non_forked/nerdtree/lib/nerdtree/path.vim

@@ -40,9 +40,7 @@ endfunction
 
 "FUNCTION: Path.cacheDisplayString() {{{1
 function! s:Path.cacheDisplayString() abort
-    let self.cachedDisplayString = self.flagSet.renderToString()
+    let self.cachedDisplayString = self.getLastPathComponent(1)
-
-    let self.cachedDisplayString .= self.getLastPathComponent(1)
 
     if self.isExecutable
         let self.cachedDisplayString = self.cachedDisplayString . '*'
@@ -406,11 +404,11 @@ function! s:Path.isUnixHiddenPath()
     endif
 endfunction
 
-"FUNCTION: Path.ignore() {{{1
+"FUNCTION: Path.ignore(nerdtree) {{{1
 "returns true if this path should be ignored
-function! s:Path.ignore()
+function! s:Path.ignore(nerdtree)
     "filter out the user specified paths to ignore
-    if b:NERDTreeIgnoreEnabled
+    if a:nerdtree.ui.isIgnoreFilterEnabled()
         for i in g:NERDTreeIgnore
             if self._ignorePatternMatches(i)
                 return 1
@@ -418,18 +416,18 @@ function! s:Path.ignore()
         endfor
 
         for callback in g:NERDTree.PathFilters()
-            if {callback}({'path': self, 'nerdtree': b:NERDTree})
+            if {callback}({'path': self, 'nerdtree': a:nerdtree})
                 return 1
             endif
         endfor
     endif
 
     "dont show hidden files unless instructed to
-    if b:NERDTreeShowHidden ==# 0 && self.isUnixHiddenFile()
+    if !a:nerdtree.ui.getShowHidden() && self.isUnixHiddenFile()
         return 1
     endif
 
-    if b:NERDTreeShowFiles ==# 0 && self.isDirectory ==# 0
+    if a:nerdtree.ui.getShowFiles() ==# 0 && self.isDirectory ==# 0
         return 1
     endif
 
@@ -455,10 +453,22 @@ function! s:Path._ignorePatternMatches(pattern)
     return self.getLastPathComponent(0) =~# pat
 endfunction
 
-"FUNCTION: Path.isUnder(path) {{{1
+"FUNCTION: Path.isAncestor(path) {{{1
-"return 1 if this path is somewhere under the given path in the filesystem.
+"return 1 if this path is somewhere above the given path in the filesystem.
 "
 "a:path should be a dir
+function! s:Path.isAncestor(path)
+    if !self.isDirectory
+        return 0
+    endif
+
+    let this = self.str()
+    let that = a:path.str()
+    return stridx(that, this) == 0
+endfunction
+
+"FUNCTION: Path.isUnder(path) {{{1
+"return 1 if this path is somewhere under the given path in the filesystem.
 function! s:Path.isUnder(path)
     if a:path.isDirectory == 0
         return 0
@@ -572,16 +582,16 @@ function! s:Path.readInfoFromDisk(fullpath)
     endif
 endfunction
 
-"FUNCTION: Path.refresh() {{{1
+"FUNCTION: Path.refresh(nerdtree) {{{1
-function! s:Path.refresh()
+function! s:Path.refresh(nerdtree)
     call self.readInfoFromDisk(self.str())
-    call g:NERDTreePathNotifier.NotifyListeners('refresh', self, {})
+    call g:NERDTreePathNotifier.NotifyListeners('refresh', self, a:nerdtree, {})
     call self.cacheDisplayString()
 endfunction
 
-"FUNCTION: Path.refreshFlags() {{{1
+"FUNCTION: Path.refreshFlags(nerdtree) {{{1
-function! s:Path.refreshFlags()
+function! s:Path.refreshFlags(nerdtree)
-    call g:NERDTreePathNotifier.NotifyListeners('refreshFlags', self, {})
+    call g:NERDTreePathNotifier.NotifyListeners('refreshFlags', self, a:nerdtree, {})
     call self.cacheDisplayString()
 endfunction
 

sources_non_forked/nerdtree/lib/nerdtree/tree_dir_node.vim

@@ -9,7 +9,7 @@ let g:NERDTreeDirNode = s:TreeDirNode
 "FUNCTION: TreeDirNode.AbsoluteTreeRoot(){{{1
 "class method that returns the highest cached ancestor of the current root
 function! s:TreeDirNode.AbsoluteTreeRoot()
-    let currentNode = b:NERDTreeRoot
+    let currentNode = b:NERDTree.root
     while currentNode.parent != {}
         let currentNode = currentNode.parent
     endwhile
@@ -21,7 +21,7 @@ unlet s:TreeDirNode.activate
 function! s:TreeDirNode.activate(...)
     let opts = a:0 ? a:1 : {}
     call self.toggleOpen(opts)
-    call b:NERDTree.render()
+    call self.getNerdtree().render()
     call self.putCursorHere(0, 0)
 endfunction
 
@@ -68,11 +68,27 @@ endfunction
 "Returns:
 "the newly created node
 function! s:TreeDirNode.createChild(path, inOrder)
-    let newTreeNode = g:NERDTreeFileNode.New(a:path)
+    let newTreeNode = g:NERDTreeFileNode.New(a:path, self.getNerdtree())
     call self.addChild(newTreeNode, a:inOrder)
     return newTreeNode
 endfunction
 
+"FUNCTION: TreeDirNode.displayString() {{{1
+unlet s:TreeDirNode.displayString
+function! s:TreeDirNode.displayString()
+    let cascade = self.getCascade()
+    let rv = ""
+    for node in cascade
+        let rv = rv . node.path.displayString()
+    endfor
+
+    let sym = cascade[-1].isOpen ? g:NERDTreeDirArrowCollapsible : g:NERDTreeDirArrowExpandable
+
+    let flags = cascade[-1].path.flagSet.renderToString()
+
+    return sym . ' ' . flags . rv
+endfunction
+
 "FUNCTION: TreeDirNode.findNode(path) {{{1
 "Will find one of the children (recursively) that has the given path
 "
@@ -98,6 +114,33 @@ function! s:TreeDirNode.findNode(path)
     return {}
 endfunction
 
+"FUNCTION: TreeDirNode.getCascade() {{{1
+"Return an array of dir nodes (starting from self) that can be cascade opened.
+function! s:TreeDirNode.getCascade()
+
+    let rv = [self]
+    let node = self
+
+    while 1
+        let vc = node.getVisibleChildren()
+        if len(vc) != 1
+            break
+        endif
+
+        let visChild = vc[0]
+
+        "TODO: optimize
+        if !visChild.path.isDirectory
+            break
+        endif
+
+        call add(rv, visChild)
+        let node = visChild
+    endwhile
+
+    return rv
+endfunction
+
 "FUNCTION: TreeDirNode.getChildCount() {{{1
 "Returns the number of children this node has
 function! s:TreeDirNode.getChildCount()
@@ -171,6 +214,12 @@ function! s:TreeDirNode.getChildIndex(path)
     return -1
 endfunction
 
+"FUNCTION: TreeDirNode.getDirChildren() {{{1
+"Get all children that are directories
+function! s:TreeDirNode.getDirChildren()
+    return filter(self.children, 'v:val.path.isDirectory == 1')
+endfunction
+
 "FUNCTION: TreeDirNode.GetSelected() {{{1
 "Returns the current node if it is a dir node, or else returns the current
 "nodes parent
@@ -199,7 +248,7 @@ endfunction
 function! s:TreeDirNode.getVisibleChildren()
     let toReturn = []
     for i in self.children
-        if i.path.ignore() ==# 0
+        if i.path.ignore(self.getNerdtree()) ==# 0
             call add(toReturn, i)
         endif
     endfor
@@ -212,6 +261,13 @@ function! s:TreeDirNode.hasVisibleChildren()
     return self.getVisibleChildCount() != 0
 endfunction
 
+"FUNCTION: TreeDirNode.isCascadable() {{{1
+"true if this dir has only one visible child - which is also a dir
+function! s:TreeDirNode.isCascadable()
+    let c = self.getVisibleChildren()
+    return len(c) == 1 && c[0].path.isDirectory
+endfunction
+
 "FUNCTION: TreeDirNode._initChildren() {{{1
 "Removes all childen from this node and re-reads them
 "
@@ -244,19 +300,15 @@ function! s:TreeDirNode._initChildren(silent)
     for i in files
 
         "filter out the .. and . directories
-        "Note: we must match .. AND ../ cos sometimes the globpath returns
+        "Note: we must match .. AND ../ since sometimes the globpath returns
         "../ for path with strange chars (eg $)
-"        if i !~# '\/\.\.\/\?$' && i !~# '\/\.\/\?$'
-"
-        " Regular expression is too expensive. Use simply string comparison
-        " instead
         if i[len(i)-3:2] != ".." && i[len(i)-2:2] != ".." &&
          \ i[len(i)-2:1] != "." && i[len(i)-1] != "."
             "put the next file in a new node and attach it
             try
                 let path = g:NERDTreePath.New(i)
                 call self.createChild(path, 0)
-                call g:NERDTreePathNotifier.NotifyListeners('init', path, {})
+                call g:NERDTreePathNotifier.NotifyListeners('init', path, self.getNerdtree(), {})
             catch /^NERDTree.\(InvalidArguments\|InvalidFiletype\)Error/
                 let invalidFilesFound += 1
             endtry
@@ -275,13 +327,13 @@ function! s:TreeDirNode._initChildren(silent)
     return self.getChildCount()
 endfunction
 
-"FUNCTION: TreeDirNode.New(path) {{{1
+"FUNCTION: TreeDirNode.New(path, nerdtree) {{{1
 "Returns a new TreeNode object with the given path and parent
 "
 "Args:
-"path: a path object representing the full filesystem path to the file/dir that the node represents
+"path: dir that the node represents
-unlet s:TreeDirNode.New
+"nerdtree: the tree the node belongs to
-function! s:TreeDirNode.New(path)
+function! s:TreeDirNode.New(path, nerdtree)
     if a:path.isDirectory != 1
         throw "NERDTree.InvalidArgumentsError: A TreeDirNode object must be instantiated with a directory Path object."
     endif
@@ -293,6 +345,7 @@ function! s:TreeDirNode.New(path)
     let newTreeNode.children = []
 
     let newTreeNode.parent = {}
+    let newTreeNode._nerdtree = a:nerdtree
 
     return newTreeNode
 endfunction
@@ -356,7 +409,7 @@ endfunction
 "FUNCTION: TreeDirNode._openInNewTab() {{{1
 function! s:TreeDirNode._openInNewTab()
     tabnew
-    call g:NERDTreeCreator.CreatePrimary(self.path.str())
+    call g:NERDTreeCreator.CreateTabTree(self.path.str())
 endfunction
 
 "FUNCTION: TreeDirNode.openRecursively() {{{1
@@ -377,7 +430,7 @@ endfunction
 "Args:
 "forceOpen: 1 if this node should be opened regardless of file filters
 function! s:TreeDirNode._openRecursively2(forceOpen)
-    if self.path.ignore() ==# 0 || a:forceOpen
+    if self.path.ignore(self.getNerdtree()) ==# 0 || a:forceOpen
         let self.isOpen = 1
         if self.children ==# []
             call self._initChildren(1)
@@ -394,7 +447,7 @@ endfunction
 "FUNCTION: TreeDirNode.refresh() {{{1
 unlet s:TreeDirNode.refresh
 function! s:TreeDirNode.refresh()
-    call self.path.refresh()
+    call self.path.refresh(self.getNerdtree())
 
     "if this node was ever opened, refresh its children
     if self.isOpen || !empty(self.children)
@@ -425,7 +478,7 @@ function! s:TreeDirNode.refresh()
 
                     "the node doesnt exist so create it
                     else
-                        let newNode = g:NERDTreeFileNode.New(path)
+                        let newNode = g:NERDTreeFileNode.New(path, self.getNerdtree())
                         let newNode.parent = self
                         call add(newChildNodes, newNode)
                     endif
@@ -450,7 +503,7 @@ endfunction
 "FUNCTION: TreeDirNode.refreshFlags() {{{1
 unlet s:TreeDirNode.refreshFlags
 function! s:TreeDirNode.refreshFlags()
-    call self.path.refreshFlags()
+    call self.path.refreshFlags(self.getNerdtree())
     for i in self.children
         call i.refreshFlags()
     endfor
@@ -458,13 +511,16 @@ endfunction
 
 "FUNCTION: TreeDirNode.refreshDirFlags() {{{1
 function! s:TreeDirNode.refreshDirFlags()
-    call self.path.refreshFlags()
+    call self.path.refreshFlags(self.getNerdtree())
 endfunction
 
 "FUNCTION: TreeDirNode.reveal(path) {{{1
 "reveal the given path, i.e. cache and open all treenodes needed to display it
 "in the UI
-function! s:TreeDirNode.reveal(path)
+"Returns the revealed node
+function! s:TreeDirNode.reveal(path, ...)
+    let opts = a:0 ? a:1 : {}
+
     if !a:path.isUnder(self.path)
         throw "NERDTree.InvalidArgumentsError: " . a:path.str() . " should be under " . self.path.str()
     endif
@@ -473,9 +529,10 @@ function! s:TreeDirNode.reveal(path)
 
     if self.path.equals(a:path.getParent())
         let n = self.findNode(a:path)
-        call b:NERDTree.render()
+        if has_key(opts, "open")
-        call n.putCursorHere(1,0)
+            call n.open()
-        return
+        endif
+        return n
     endif
 
     let p = a:path
@@ -484,7 +541,7 @@ function! s:TreeDirNode.reveal(path)
     endwhile
 
     let n = self.findNode(p)
-    call n.reveal(a:path)
+    return n.reveal(a:path, opts)
 endfunction
 
 "FUNCTION: TreeDirNode.removeChild(treenode) {{{1

sources_non_forked/nerdtree/lib/nerdtree/tree_file_node.vim

@@ -19,7 +19,7 @@ function! s:TreeFileNode.bookmark(name)
     "it so we can update its display string
     let oldMarkedNode = {}
     try
-        let oldMarkedNode = g:NERDTreeBookmark.GetNodeForName(a:name, 1)
+        let oldMarkedNode = g:NERDTreeBookmark.GetNodeForName(a:name, 1, self.getNerdtree())
     catch /^NERDTree.BookmarkNotFoundError/
     catch /^NERDTree.BookmarkedNodeNotFoundError/
     endtry
@@ -41,7 +41,7 @@ function! s:TreeFileNode.cacheParent()
         if parentPath.equals(self.path)
             throw "NERDTree.CannotCacheParentError: already at root"
         endif
-        let self.parent = s:TreeFileNode.New(parentPath)
+        let self.parent = s:TreeFileNode.New(parentPath, self.getNerdtree())
     endif
 endfunction
 
@@ -59,7 +59,7 @@ endfunction
 function! s:TreeFileNode.copy(dest)
     call self.path.copy(a:dest)
     let newPath = g:NERDTreePath.New(a:dest)
-    let parent = b:NERDTreeRoot.findNode(newPath.getParent())
+    let parent = self.getNerdtree().root.findNode(newPath.getParent())
     if !empty(parent)
         call parent.refresh()
         return parent.findNode(newPath)
@@ -83,7 +83,7 @@ endfunction
 "Return:
 "a string that can be used in the view to represent this node
 function! s:TreeFileNode.displayString()
-    return self.path.displayString()
+    return self.path.flagSet.renderToString() . self.path.displayString()
 endfunction
 
 "FUNCTION: TreeFileNode.equals(treenode) {{{1
@@ -165,7 +165,7 @@ function! s:TreeFileNode.findSibling(direction)
 
                 "if the next node is not an ignored node (i.e. wont show up in the
                 "view) then return it
-                if self.parent.children[siblingIndx].path.ignore() ==# 0
+                if self.parent.children[siblingIndx].path.ignore(self.getNerdtree()) ==# 0
                     return self.parent.children[siblingIndx]
                 endif
 
@@ -178,11 +178,16 @@ function! s:TreeFileNode.findSibling(direction)
     return {}
 endfunction
 
+"FUNCTION: TreeFileNode.getNerdtree(){{{1
+function! s:TreeFileNode.getNerdtree()
+    return self._nerdtree
+endfunction
+
 "FUNCTION: TreeFileNode.GetRootForTab(){{{1
 "get the root node for this tab
 function! s:TreeFileNode.GetRootForTab()
     if g:NERDTree.ExistsForTab()
-        return getbufvar(t:NERDTreeBufName, 'NERDTreeRoot')
+        return getbufvar(t:NERDTreeBufName, 'NERDTree').root
     end
     return {}
 endfunction
@@ -195,7 +200,7 @@ function! s:TreeFileNode.GetSelected()
         if path ==# {}
             return {}
         endif
-        return b:NERDTreeRoot.findNode(path)
+        return b:NERDTree.root.findNode(path)
     catch /^NERDTree/
         return {}
     endtry
@@ -205,51 +210,32 @@ endfunction
 "returns 1 if this node should be visible according to the tree filters and
 "hidden file filters (and their on/off status)
 function! s:TreeFileNode.isVisible()
-    return !self.path.ignore()
+    return !self.path.ignore(self.getNerdtree())
 endfunction
 
 "FUNCTION: TreeFileNode.isRoot() {{{1
-"returns 1 if this node is b:NERDTreeRoot
 function! s:TreeFileNode.isRoot()
     if !g:NERDTree.ExistsForBuf()
         throw "NERDTree.NoTreeError: No tree exists for the current buffer"
     endif
 
-    return self.equals(b:NERDTreeRoot)
+    return self.equals(self.getNerdtree().root)
 endfunction
 
-"FUNCTION: TreeFileNode.makeRoot() {{{1
+"FUNCTION: TreeFileNode.New(path, nerdtree) {{{1
-"Make this node the root of the tree
-function! s:TreeFileNode.makeRoot()
-    if self.path.isDirectory
-        let b:NERDTreeRoot = self
-    else
-        call self.cacheParent()
-        let b:NERDTreeRoot = self.parent
-    endif
-
-    call b:NERDTreeRoot.open()
-
-    "change dir to the dir of the new root if instructed to
-    if g:NERDTreeChDirMode ==# 2
-        exec "cd " . b:NERDTreeRoot.path.str({'format': 'Edit'})
-    endif
-
-    silent doautocmd User NERDTreeNewRoot
-endfunction
-
-"FUNCTION: TreeFileNode.New(path) {{{1
 "Returns a new TreeNode object with the given path and parent
 "
 "Args:
-"path: a path object representing the full filesystem path to the file/dir that the node represents
+"path: file/dir that the node represents
-function! s:TreeFileNode.New(path)
+"nerdtree: the tree the node belongs to
+function! s:TreeFileNode.New(path, nerdtree)
     if a:path.isDirectory
-        return g:NERDTreeDirNode.New(a:path)
+        return g:NERDTreeDirNode.New(a:path, a:nerdtree)
     else
         let newTreeNode = copy(self)
         let newTreeNode.path = a:path
         let newTreeNode.parent = {}
+        let newTreeNode._nerdtree = a:nerdtree
         return newTreeNode
     endif
 endfunction
@@ -289,7 +275,7 @@ endfunction
 "recurseUpward: try to put the cursor on the parent if the this node isnt
 "visible
 function! s:TreeFileNode.putCursorHere(isJump, recurseUpward)
-    let ln = b:NERDTree.ui.getLineNum(self)
+    let ln = self.getNerdtree().ui.getLineNum(self)
     if ln != -1
         if a:isJump
             mark '
@@ -298,11 +284,11 @@ function! s:TreeFileNode.putCursorHere(isJump, recurseUpward)
     else
         if a:recurseUpward
             let node = self
-            while node != {} && b:NERDTree.ui.getLineNum(node) ==# -1
+            while node != {} && self.getNerdtree().ui.getLineNum(node) ==# -1
                 let node = node.parent
                 call node.open()
             endwhile
-            call b:NERDTree.render()
+            call self._nerdtree.render()
             call node.putCursorHere(a:isJump, 0)
         endif
     endif
@@ -310,12 +296,12 @@ endfunction
 
 "FUNCTION: TreeFileNode.refresh() {{{1
 function! s:TreeFileNode.refresh()
-    call self.path.refresh()
+    call self.path.refresh(self.getNerdtree())
 endfunction
 
 "FUNCTION: TreeFileNode.refreshFlags() {{{1
 function! s:TreeFileNode.refreshFlags()
-    call self.path.refreshFlags()
+    call self.path.refreshFlags(self.getNerdtree())
 endfunction
 
 "FUNCTION: TreeFileNode.rename() {{{1
@@ -326,7 +312,7 @@ function! s:TreeFileNode.rename(newName)
     call self.parent.removeChild(self)
 
     let parentPath = self.path.getParent()
-    let newParent = b:NERDTreeRoot.findNode(parentPath)
+    let newParent = self.getNerdtree().root.findNode(parentPath)
 
     if newParent != {}
         call newParent.createChild(self.path, 1)
@@ -337,70 +323,24 @@ endfunction
 "FUNCTION: TreeFileNode.renderToString {{{1
 "returns a string representation for this tree to be rendered in the view
 function! s:TreeFileNode.renderToString()
-    return self._renderToString(0, 0, [], self.getChildCount() ==# 1)
+    return self._renderToString(0, 0)
 endfunction
 
 "Args:
 "depth: the current depth in the tree for this call
 "drawText: 1 if we should actually draw the line for this node (if 0 then the
 "child nodes are rendered only)
-"vertMap: a binary array that indicates whether a vertical bar should be draw
 "for each depth in the tree
-"isLastChild:true if this curNode is the last child of its parent
+function! s:TreeFileNode._renderToString(depth, drawText)
-function! s:TreeFileNode._renderToString(depth, drawText, vertMap, isLastChild)
     let output = ""
     if a:drawText ==# 1
 
-        let treeParts = ''
+        let treeParts = repeat('  ', a:depth - 1)
 
-        "get all the leading spaces and vertical tree parts for this line
+        if !self.path.isDirectory
-        if a:depth > 1
-            for j in a:vertMap[0:-2]
-                if g:NERDTreeDirArrows
-                    let treeParts = treeParts . '  '
-                else
-                    if j ==# 1
-                        let treeParts = treeParts . '| '
-                    else
             let treeParts = treeParts . '  '
         endif
-                endif
-            endfor
-        endif
 
-        "get the last vertical tree part for this line which will be different
-        "if this node is the last child of its parent
-        if !g:NERDTreeDirArrows
-            if a:isLastChild
-                let treeParts = treeParts . '`'
-            else
-                let treeParts = treeParts . '|'
-            endif
-        endif
-
-        "smack the appropriate dir/file symbol on the line before the file/dir
-        "name itself
-        if self.path.isDirectory
-            if self.isOpen
-                if g:NERDTreeDirArrows
-                    let treeParts = treeParts . '▾ '
-                else
-                    let treeParts = treeParts . '~'
-                endif
-            else
-                if g:NERDTreeDirArrows
-                    let treeParts = treeParts . '▸ '
-                else
-                    let treeParts = treeParts . '+'
-                endif
-            endif
-        else
-            if g:NERDTreeDirArrows
-                let treeParts = treeParts . '  '
-            else
-                let treeParts = treeParts . '-'
-            endif
-        endif
         let line = treeParts . self.displayString()
 
         let output = output . line . "\n"
@@ -410,19 +350,16 @@ function! s:TreeFileNode._renderToString(depth, drawText, vertMap, isLastChild)
     if self.path.isDirectory ==# 1 && self.isOpen ==# 1
 
         let childNodesToDraw = self.getVisibleChildren()
-        if len(childNodesToDraw) > 0
 
-            "draw all the nodes children except the last
+        if self.isCascadable() && a:depth > 0
-            let lastIndx = len(childNodesToDraw)-1
+
-            if lastIndx > 0
+            let output = output . childNodesToDraw[0]._renderToString(a:depth, 0)
-                for i in childNodesToDraw[0:lastIndx-1]
+
-                    let output = output . i._renderToString(a:depth + 1, 1, add(copy(a:vertMap), 1), 0)
+        elseif len(childNodesToDraw) > 0
+            for i in childNodesToDraw
+                let output = output . i._renderToString(a:depth + 1, 1)
             endfor
         endif
-
-            "draw the last child, indicating that it IS the last
-            let output = output . childNodesToDraw[lastIndx]._renderToString(a:depth + 1, 1, add(copy(a:vertMap), 0), 1)
-        endif
     endif
 
     return output

sources_non_forked/nerdtree/lib/nerdtree/ui.vim

@@ -21,18 +21,18 @@ endfunction
 "prints out the quick help
 function! s:UI._dumpHelp()
     let old_h = @h
-    if b:treeShowHelp ==# 1
+    if self.getShowHelp()
         let @h=   "\" NERD tree (" . nerdtree#version() . ") quickhelp~\n"
         let @h=@h."\" ============================\n"
         let @h=@h."\" File node mappings~\n"
         let @h=@h."\" ". (g:NERDTreeMouseMode ==# 3 ? "single" : "double") ."-click,\n"
         let @h=@h."\" <CR>,\n"
-        if b:NERDTreeType ==# "primary"
+        if self.nerdtree.isTabTree()
             let @h=@h."\" ". g:NERDTreeMapActivateNode .": open in prev window\n"
         else
             let @h=@h."\" ". g:NERDTreeMapActivateNode .": open in current window\n"
         endif
-        if b:NERDTreeType ==# "primary"
+        if self.nerdtree.isTabTree()
             let @h=@h."\" ". g:NERDTreeMapPreview .": preview\n"
         endif
         let @h=@h."\" ". g:NERDTreeMapOpenInTab.": open in new tab\n"
@@ -87,10 +87,10 @@ function! s:UI._dumpHelp()
 
         let @h=@h."\"\n\" ----------------------------\n"
         let @h=@h."\" Tree filtering mappings~\n"
-        let @h=@h."\" ". g:NERDTreeMapToggleHidden .": hidden files (" . (b:NERDTreeShowHidden ? "on" : "off") . ")\n"
+        let @h=@h."\" ". g:NERDTreeMapToggleHidden .": hidden files (" . (self.getShowHidden() ? "on" : "off") . ")\n"
-        let @h=@h."\" ". g:NERDTreeMapToggleFilters .": file filters (" . (b:NERDTreeIgnoreEnabled ? "on" : "off") . ")\n"
+        let @h=@h."\" ". g:NERDTreeMapToggleFilters .": file filters (" . (self.isIgnoreFilterEnabled() ? "on" : "off") . ")\n"
-        let @h=@h."\" ". g:NERDTreeMapToggleFiles .": files (" . (b:NERDTreeShowFiles ? "on" : "off") . ")\n"
+        let @h=@h."\" ". g:NERDTreeMapToggleFiles .": files (" . (self.getShowFiles() ? "on" : "off") . ")\n"
-        let @h=@h."\" ". g:NERDTreeMapToggleBookmarks .": bookmarks (" . (b:NERDTreeShowBookmarks ? "on" : "off") . ")\n"
+        let @h=@h."\" ". g:NERDTreeMapToggleBookmarks .": bookmarks (" . (self.getShowBookmarks() ? "on" : "off") . ")\n"
 
         "add quickhelp entries for each custom key map
         let @h=@h."\"\n\" ----------------------------\n"
@@ -116,7 +116,7 @@ function! s:UI._dumpHelp()
         let @h=@h."\" :ClearBookmarks [<names>]\n"
         let @h=@h."\" :ClearAllBookmarks\n"
         silent! put h
-    elseif g:NERDTreeMinimalUI == 0
+    elseif !self.isMinimal()
         let @h="\" Press ". g:NERDTreeMapHelp ." for help\n"
         silent! put h
     endif
@@ -129,6 +129,12 @@ endfunction
 function! s:UI.New(nerdtree)
     let newObj = copy(self)
     let newObj.nerdtree = a:nerdtree
+    let newObj._showHelp = 0
+    let newObj._ignoreEnabled = 1
+    let newObj._showFiles = g:NERDTreeShowFiles
+    let newObj._showHidden = g:NERDTreeShowHidden
+    let newObj._showBookmarks = g:NERDTreeShowBookmarks
+
     return newObj
 endfunction
 
@@ -149,18 +155,11 @@ function! s:UI.getPath(ln)
 
     "check to see if we have the root node
     if a:ln == rootLine
-        return b:NERDTreeRoot.path
+        return self.nerdtree.root.path
-    endif
-
-    if !g:NERDTreeDirArrows
-        " in case called from outside the tree
-        if line !~# '^ *[|`▸▾ ]' || line =~# '^$'
-            return {}
-        endif
     endif
 
     if line ==# s:UI.UpDirLine()
-        return b:NERDTreeRoot.path.getParent()
+        return self.nerdtree.root.path.getParent()
     endif
 
     let indent = self._indentLevelFor(line)
@@ -183,7 +182,7 @@ function! s:UI.getPath(ln)
 
         "have we reached the top of the tree?
         if lnum == rootLine
-            let dir = b:NERDTreeRoot.path.str({'format': 'UI'}) . dir
+            let dir = self.nerdtree.root.path.str({'format': 'UI'}) . dir
             break
         endif
         if curLineStripped =~# '/$'
@@ -196,7 +195,7 @@ function! s:UI.getPath(ln)
             endif
         endif
     endwhile
-    let curFile = b:NERDTreeRoot.path.drive . dir . curFile
+    let curFile = self.nerdtree.root.path.drive . dir . curFile
     let toReturn = g:NERDTreePath.New(curFile)
     return toReturn
 endfunction
@@ -206,19 +205,19 @@ endfunction
 function! s:UI.getLineNum(file_node)
     "if the node is the root then return the root line no.
     if a:file_node.isRoot()
-        return b:NERDTree.ui.getRootLineNum()
+        return self.getRootLineNum()
     endif
 
     let totalLines = line("$")
 
     "the path components we have matched so far
-    let pathcomponents = [substitute(b:NERDTreeRoot.path.str({'format': 'UI'}), '/ *$', '', '')]
+    let pathcomponents = [substitute(self.nerdtree.root.path.str({'format': 'UI'}), '/ *$', '', '')]
     "the index of the component we are searching for
     let curPathComponent = 1
 
     let fullpath = a:file_node.path.str({'format': 'UI'})
 
-    let lnum = b:NERDTree.ui.getRootLineNum()
+    let lnum = self.getRootLineNum()
     while lnum > 0
         let lnum = lnum + 1
         "have we reached the bottom of the tree?
@@ -259,15 +258,33 @@ function! s:UI.getRootLineNum()
     return rootLine
 endfunction
 
+"FUNCTION: s:UI.getShowBookmarks() {{{1
+function! s:UI.getShowBookmarks()
+    return self._showBookmarks
+endfunction
+
+"FUNCTION: s:UI.getShowFiles() {{{1
+function! s:UI.getShowFiles()
+    return self._showFiles
+endfunction
+
+"FUNCTION: s:UI.getShowHelp() {{{1
+function! s:UI.getShowHelp()
+    return self._showHelp
+endfunction
+
+"FUNCTION: s:UI.getShowHidden() {{{1
+function! s:UI.getShowHidden()
+    return self._showHidden
+endfunction
+
 "FUNCTION: s:UI._indentLevelFor(line) {{{1
 function! s:UI._indentLevelFor(line)
-    let level = match(a:line, '[^ \-+~▸▾`|]') / s:UI.IndentWid()
+    "have to do this work around because match() returns bytes, not chars
-    " check if line includes arrows
+    let numLeadBytes = match(a:line, '\M\[^ '.g:NERDTreeDirArrowExpandable.g:NERDTreeDirArrowCollapsible.']')
-    if match(a:line, '[▸▾]') > -1
+    let leadChars = strchars(a:line[0:numLeadBytes-1])
-        " decrement level as arrow uses 3 ascii chars
+
-        let level = level - 1
+    return leadChars / s:UI.IndentWid()
-    endif
-    return level
 endfunction
 
 "FUNCTION: s:UI.IndentWid() {{{1
@@ -275,19 +292,25 @@ function! s:UI.IndentWid()
     return 2
 endfunction
 
+"FUNCTION: s:UI.isIgnoreFilterEnabled() {{{1
+function! s:UI.isIgnoreFilterEnabled()
+    return self._ignoreEnabled == 1
+endfunction
+
+"FUNCTION: s:UI.isMinimal() {{{1
+function! s:UI.isMinimal()
+    return g:NERDTreeMinimalUI
+endfunction
+
 "FUNCTION: s:UI.MarkupReg() {{{1
 function! s:UI.MarkupReg()
-    if g:NERDTreeDirArrows
+    return '^\(['.g:NERDTreeDirArrowExpandable.g:NERDTreeDirArrowCollapsible.'] \| \+['.g:NERDTreeDirArrowExpandable.g:NERDTreeDirArrowCollapsible.'] \| \+\)'
-        return '^\([▾▸] \| \+[▾▸] \| \+\)'
-    endif
-
-    return '^[ `|]*[\-+~]'
 endfunction
 
 "FUNCTION: s:UI._renderBookmarks {{{1
 function! s:UI._renderBookmarks()
 
-    if g:NERDTreeMinimalUI == 0
+    if !self.isMinimal()
         call setline(line(".")+1, ">----------Bookmarks----------")
         call cursor(line(".")+1, col("."))
     endif
@@ -334,6 +357,11 @@ function! s:UI.saveScreenState()
     call nerdtree#exec(win . "wincmd w")
 endfunction
 
+"FUNCTION: s:UI.setShowHidden(val) {{{1
+function! s:UI.setShowHidden(val)
+    let self._showHidden = a:val
+endfunction
+
 "FUNCTION: s:UI._stripMarkup(line, removeLeadingSpaces){{{1
 "returns the given line with all the tree parts stripped off
 "
@@ -390,29 +418,29 @@ function! s:UI.render()
     call self._dumpHelp()
 
     "delete the blank line before the help and add one after it
-    if g:NERDTreeMinimalUI == 0
+    if !self.isMinimal()
         call setline(line(".")+1, "")
         call cursor(line(".")+1, col("."))
     endif
 
-    if b:NERDTreeShowBookmarks
+    if self.getShowBookmarks()
         call self._renderBookmarks()
     endif
 
     "add the 'up a dir' line
-    if !g:NERDTreeMinimalUI
+    if !self.isMinimal()
         call setline(line(".")+1, s:UI.UpDirLine())
         call cursor(line(".")+1, col("."))
     endif
 
     "draw the header line
-    let header = b:NERDTreeRoot.path.str({'format': 'UI', 'truncateTo': winwidth(0)})
+    let header = self.nerdtree.root.path.str({'format': 'UI', 'truncateTo': winwidth(0)})
     call setline(line(".")+1, header)
     call cursor(line(".")+1, col("."))
 
     "draw the tree
     let old_o = @o
-    let @o = b:NERDTreeRoot.renderToString()
+    let @o = self.nerdtree.root.renderToString()
     silent put o
     let @o = old_o
 
@@ -443,47 +471,52 @@ function! s:UI.renderViewSavingPosition()
         let currentNode = currentNode.parent
     endwhile
 
-    call b:NERDTree.render()
+    call self.render()
 
     if currentNode != {}
         call currentNode.putCursorHere(0, 0)
     endif
 endfunction
 
+"FUNCTION: s:UI.toggleHelp() {{{1
+function! s:UI.toggleHelp()
+    let self._showHelp = !self._showHelp
+endfunction
+
 " FUNCTION: s:UI.toggleIgnoreFilter() {{{1
 " toggles the use of the NERDTreeIgnore option
 function! s:UI.toggleIgnoreFilter()
-    let b:NERDTreeIgnoreEnabled = !b:NERDTreeIgnoreEnabled
+    let self._ignoreEnabled = !self._ignoreEnabled
-    call b:NERDTree.ui.renderViewSavingPosition()
+    call self.renderViewSavingPosition()
-    call b:NERDTree.ui.centerView()
+    call self.centerView()
 endfunction
 
 " FUNCTION: s:UI.toggleShowBookmarks() {{{1
 " toggles the display of bookmarks
 function! s:UI.toggleShowBookmarks()
-    let b:NERDTreeShowBookmarks = !b:NERDTreeShowBookmarks
+    let self._showBookmarks = !self._showBookmarks
-    if b:NERDTreeShowBookmarks
+    if self.getShowBookmarks()
-        call b:NERDTree.render()
+        call self.nerdtree.render()
         call g:NERDTree.CursorToBookmarkTable()
     else
-        call b:NERDTree.ui.renderViewSavingPosition()
+        call self.renderViewSavingPosition()
     endif
-    call b:NERDTree.ui.centerView()
+    call self.centerView()
 endfunction
 
 " FUNCTION: s:UI.toggleShowFiles() {{{1
 " toggles the display of hidden files
 function! s:UI.toggleShowFiles()
-    let b:NERDTreeShowFiles = !b:NERDTreeShowFiles
+    let self._showFiles = !self._showFiles
-    call b:NERDTree.ui.renderViewSavingPosition()
+    call self.renderViewSavingPosition()
-    call b:NERDTree.ui.centerView()
+    call self.centerView()
 endfunction
 
 " FUNCTION: s:UI.toggleShowHidden() {{{1
 " toggles the display of hidden files
 function! s:UI.toggleShowHidden()
-    let b:NERDTreeShowHidden = !b:NERDTreeShowHidden
+    let self._showHidden = !self._showHidden
-    call b:NERDTree.ui.renderViewSavingPosition()
+    call self.renderViewSavingPosition()
     call self.centerView()
 endfunction
 

sources_non_forked/nerdtree/nerdtree_plugin/exec_menuitem.vim

@@ -2,7 +2,6 @@
 " File:        exec_menuitem.vim
 " Description: plugin for NERD Tree that provides an execute file menu item
 " Maintainer:  Martin Grenfell <martin.grenfell at gmail dot com>
-" Last Change: 22 July, 2009
 " 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

sources_non_forked/nerdtree/nerdtree_plugin/fs_menu.vim

@@ -2,7 +2,6 @@
 " File:        fs_menu.vim
 " Description: plugin for the NERD Tree that provides a file system menu
 " Maintainer:  Martin Grenfell <martin.grenfell at gmail dot com>
-" Last Change: 17 July, 2009
 " 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
@@ -24,7 +23,7 @@ call NERDTreeAddMenuItem({'text': '(a)dd a childnode', 'shortcut': 'a', 'callbac
 call NERDTreeAddMenuItem({'text': '(m)ove the current node', 'shortcut': 'm', 'callback': 'NERDTreeMoveNode'})
 call NERDTreeAddMenuItem({'text': '(d)elete the current node', 'shortcut': 'd', 'callback': 'NERDTreeDeleteNode'})
 
-if has("gui_mac") || has("gui_macvim")
+if has("gui_mac") || has("gui_macvim") || has("mac")
     call NERDTreeAddMenuItem({'text': '(r)eveal in Finder the current node', 'shortcut': 'r', 'callback': 'NERDTreeRevealInFinder'})
     call NERDTreeAddMenuItem({'text': '(o)pen the current node with system editor', 'shortcut': 'o', 'callback': 'NERDTreeExecuteFile'})
     call NERDTreeAddMenuItem({'text': '(q)uicklook the current node', 'shortcut': 'q', 'callback': 'NERDTreeQuickLook'})
@@ -34,18 +33,11 @@ if g:NERDTreePath.CopyingSupported()
     call NERDTreeAddMenuItem({'text': '(c)opy the current node', 'shortcut': 'c', 'callback': 'NERDTreeCopyNode'})
 endif
 
-"FUNCTION: s:echo(msg){{{1
+if has("unix") || has("osx")
-function! s:echo(msg)
+    call NERDTreeAddMenuItem({'text': '(l)ist the current node', 'shortcut': 'l', 'callback': 'NERDTreeListNode'})
-    redraw
+else
-    echomsg "NERDTree: " . a:msg
+    call NERDTreeAddMenuItem({'text': '(l)ist the current node', 'shortcut': 'l', 'callback': 'NERDTreeListNodeWin32'})
-endfunction
+endif
-
-"FUNCTION: s:echoWarning(msg){{{1
-function! s:echoWarning(msg)
-    echohl warningmsg
-    call s:echo(a:msg)
-    echohl normal
-endfunction
 
 "FUNCTION: s:promptToDelBuffer(bufnum, msg){{{1
 "prints out the given msg and, if the user responds by pushing 'y' then the
@@ -107,17 +99,17 @@ function! NERDTreeAddNode()
                           \ "", curDirNode.path.str() . g:NERDTreePath.Slash(), "file")
 
     if newNodeName ==# ''
-        call s:echo("Node Creation Aborted.")
+        call nerdtree#echo("Node Creation Aborted.")
         return
     endif
 
     try
         let newPath = g:NERDTreePath.Create(newNodeName)
-        let parentNode = b:NERDTreeRoot.findNode(newPath.getParent())
+        let parentNode = b:NERDTree.root.findNode(newPath.getParent())
 
-        let newTreeNode = g:NERDTreeFileNode.New(newPath)
+        let newTreeNode = g:NERDTreeFileNode.New(newPath, b:NERDTree)
         if empty(parentNode)
-            call b:NERDTreeRoot.refresh()
+            call b:NERDTree.root.refresh()
             call b:NERDTree.render()
         elseif parentNode.isOpen || !empty(parentNode.children)
             call parentNode.addChild(newTreeNode, 1)
@@ -125,7 +117,7 @@ function! NERDTreeAddNode()
             call newTreeNode.putCursorHere(1, 0)
         endif
     catch /^NERDTree/
-        call s:echoWarning("Node Not Created.")
+        call nerdtree#echoWarning("Node Not Created.")
     endtry
 endfunction
 
@@ -138,7 +130,7 @@ function! NERDTreeMoveNode()
                           \ "", curNode.path.str(), "file")
 
     if newNodePath ==# ''
-        call s:echo("Node Renaming Aborted.")
+        call nerdtree#echo("Node Renaming Aborted.")
         return
     endif
 
@@ -159,7 +151,7 @@ function! NERDTreeMoveNode()
 
         redraw
     catch /^NERDTree/
-        call s:echoWarning("Node Not Renamed.")
+        call nerdtree#echoWarning("Node Not Renamed.")
     endtry
 endfunction
 
@@ -199,10 +191,33 @@ function! NERDTreeDeleteNode()
 
             redraw
         catch /^NERDTree/
-            call s:echoWarning("Could not remove node")
+            call nerdtree#echoWarning("Could not remove node")
         endtry
     else
-        call s:echo("delete aborted")
+        call nerdtree#echo("delete aborted")
+    endif
+
+endfunction
+
+" FUNCTION: NERDTreeListNode() {{{1
+function! NERDTreeListNode()
+    let treenode = g:NERDTreeFileNode.GetSelected()
+    if treenode != {}
+        let metadata = split(system('ls -ld ' . shellescape(treenode.path.str())), '\n')
+        call nerdtree#echo(metadata[0])
+    else
+        call nerdtree#echo("No information avaialable")
+    endif
+endfunction
+
+" FUNCTION: NERDTreeListNodeWin32() {{{1
+function! NERDTreeListNodeWin32()
+    let treenode = g:NERDTreeFileNode.GetSelected()
+    if treenode != {}
+        let metadata = split(system('DIR /Q ' . shellescape(treenode.path.str()) . ' | FINDSTR "^[012][0-9]/[0-3][0-9]/[12][0-9][0-9][0-9]"'), '\n')
+        call nerdtree#echo(metadata[0])
+    else
+        call nerdtree#echo("No information avaialable")
     endif
 
 endfunction
@@ -221,7 +236,7 @@ function! NERDTreeCopyNode()
 
         let confirmed = 1
         if currentNode.path.copyingWillOverwrite(newNodePath)
-            call s:echo("Warning: copying may overwrite files! Continue? (yN)")
+            call nerdtree#echo("Warning: copying may overwrite files! Continue? (yN)")
             let choice = nr2char(getchar())
             let confirmed = choice ==# 'y'
         endif
@@ -230,22 +245,23 @@ function! NERDTreeCopyNode()
             try
                 let newNode = currentNode.copy(newNodePath)
                 if empty(newNode)
-                    call b:NERDTreeRoot.refresh()
+                    call b:NERDTree.root.refresh()
                     call b:NERDTree.render()
                 else
                     call NERDTreeRender()
                     call newNode.putCursorHere(0, 0)
                 endif
             catch /^NERDTree/
-                call s:echoWarning("Could not copy node")
+                call nerdtree#echoWarning("Could not copy node")
             endtry
         endif
     else
-        call s:echo("Copy aborted.")
+        call nerdtree#echo("Copy aborted.")
     endif
     redraw
 endfunction
 
+" FUNCTION: NERDTreeQuickLook() {{{1
 function! NERDTreeQuickLook()
     let treenode = g:NERDTreeFileNode.GetSelected()
     if treenode != {}
@@ -253,18 +269,19 @@ function! NERDTreeQuickLook()
     endif
 endfunction
 
+" FUNCTION: NERDTreeRevealInFinder() {{{1
 function! NERDTreeRevealInFinder()
     let treenode = g:NERDTreeFileNode.GetSelected()
     if treenode != {}
-        let x = system("open -R '" . treenode.path.str() . "'")
+        call system("open -R '" . treenode.path.str() . "'")
     endif
 endfunction
 
+" FUNCTION: NERDTreeExecuteFile() {{{1
 function! NERDTreeExecuteFile()
     let treenode = g:NERDTreeFileNode.GetSelected()
     if treenode != {}
-        let x = system("open '" . treenode.path.str() . "'")
+        call system("open '" . treenode.path.str() . "'")
     endif
 endfunction
-
 " vim: set sw=4 sts=4 et fdm=marker:

sources_non_forked/nerdtree/plugin/NERD_tree.vim

@@ -1,8 +1,6 @@
 " ============================================================================
 " File:        NERD_tree.vim
-" Description: vim global plugin that provides a nice tree explorer
 " Maintainer:  Martin Grenfell <martin.grenfell at gmail dot com>
-" Last Change: 28 December, 2011
 " 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
@@ -67,7 +65,14 @@ call s:initVariable("g:NERDTreeShowFiles", 1)
 call s:initVariable("g:NERDTreeShowHidden", 0)
 call s:initVariable("g:NERDTreeShowLineNumbers", 0)
 call s:initVariable("g:NERDTreeSortDirs", 1)
-call s:initVariable("g:NERDTreeDirArrows", !nerdtree#runningWindows())
+
+if !nerdtree#runningWindows()
+    call s:initVariable("g:NERDTreeDirArrowExpandable", "▸")
+    call s:initVariable("g:NERDTreeDirArrowCollapsible", "▾")
+else
+    call s:initVariable("g:NERDTreeDirArrowExpandable", "+")
+    call s:initVariable("g:NERDTreeDirArrowCollapsible", "~")
+endif
 call s:initVariable("g:NERDTreeCascadeOpenSingleChildDir", 1)
 
 if !exists("g:NERDTreeSortOrder")
@@ -83,8 +88,8 @@ if !exists('g:NERDTreeStatusline')
 
     "the exists() crap here is a hack to stop vim spazzing out when
     "loading a session that was created with an open nerd tree. It spazzes
-    "because it doesnt store b:NERDTreeRoot (its a b: var, and its a hash)
+    "because it doesnt store b:NERDTree(its a b: var, and its a hash)
-    let g:NERDTreeStatusline = "%{exists('b:NERDTreeRoot')?b:NERDTreeRoot.path.str():''}"
+    let g:NERDTreeStatusline = "%{exists('b:NERDTree')?b:NERDTree.root.path.str():''}"
 
 endif
 call s:initVariable("g:NERDTreeWinPos", "left")
@@ -188,7 +193,7 @@ function! NERDTreeFocus()
     if g:NERDTree.IsOpen()
         call g:NERDTree.CursorToTreeWin()
     else
-        call g:NERDTreeCreator.TogglePrimary("")
+        call g:NERDTreeCreator.ToggleTabTree("")
     endif
 endfunction
 

sources_non_forked/nerdtree/syntax/nerdtree.vim

@@ -22,42 +22,19 @@ syn match NERDTreeLinkDir #.*/ ->#me=e-3 containedin=NERDTreeDir
 "highlighing for directory nodes and file nodes
 syn match NERDTreeDirSlash #/# containedin=NERDTreeDir
 
-if g:NERDTreeDirArrows
+exec 'syn match NERDTreeClosable #'.escape(g:NERDTreeDirArrowCollapsible, '~').'# containedin=NERDTreeDir,NERDTreeFile'
-    syn match NERDTreeClosable #▾# containedin=NERDTreeDir,NERDTreeFile
+exec 'syn match NERDTreeOpenable #'.escape(g:NERDTreeDirArrowExpandable, '~').'# containedin=NERDTreeDir,NERDTreeFile'
-    syn match NERDTreeOpenable #▸# containedin=NERDTreeDir,NERDTreeFile
 
-    syn match NERDTreeDir #[^▾▸ ].*/#
+let s:dirArrows = escape(g:NERDTreeDirArrowCollapsible, '~').escape(g:NERDTreeDirArrowExpandable, '~')
+exec 'syn match NERDTreeDir #[^'.s:dirArrows.' ].*/#'
 syn match NERDTreeExecFile  #^ .*\*\($\| \)# contains=NERDTreeRO,NERDTreeBookmark
-    syn match NERDTreeFile  #^[^"\.▾▸] *[^▾▸]*# contains=NERDTreeLink,NERDTreeRO,NERDTreeBookmark,NERDTreeExecFile
+exec 'syn match NERDTreeFile  #^[^"\.'.s:dirArrows.'] *[^'.s:dirArrows.']*# contains=NERDTreeLink,NERDTreeRO,NERDTreeBookmark,NERDTreeExecFile'
 
 "highlighting for readonly files
 syn match NERDTreeRO # *\zs.*\ze \[RO\]# contains=NERDTreeIgnore,NERDTreeBookmark,NERDTreeFile
 
-    syn match NERDTreeFlags #^ *\zs\[.\]# containedin=NERDTreeFile
+syn match NERDTreeFlags #^ *\zs\[.\]# containedin=NERDTreeFile,NERDTreeExecFile
 syn match NERDTreeFlags #\[.\]# containedin=NERDTreeDir
-else
-    "highlighting for the ~/+ symbols for the directory nodes
-    syn match NERDTreeClosable #\~\<#
-    syn match NERDTreeClosable #\~\.#
-    syn match NERDTreeOpenable #+\<#
-    syn match NERDTreeOpenable #+\.#he=e-1
-
-    "highlighting for the tree structural parts
-    syn match NERDTreePart #|#
-    syn match NERDTreePart #`#
-    syn match NERDTreePartFile #[|`]-#hs=s+1 contains=NERDTreePart
-
-    syn match NERDTreeDir #[^-| `].*/# contains=NERDTreeLink,NERDTreeOpenable,NERDTreeClosable
-    syn match NERDTreeExecFile  #[|` ].*\*\($\| \)# contains=NERDTreeLink,NERDTreePart,NERDTreePartFile,NERDTreeBookmark
-    syn match NERDTreeFile  #|-.*# contains=NERDTreeLink,NERDTreePart,NERDTreePartFile,NERDTreeBookmark,NERDTreeExecFile
-    syn match NERDTreeFile  #`-.*# contains=NERDTreeLink,NERDTreePart,NERDTreePartFile,NERDTreeBookmark,NERDTreeExecFile
-
-    "highlighting for readonly files
-    syn match NERDTreeRO #|-.*\[RO\]#he=e-5 contains=NERDTreeIgnore,NERDTreeBookmark,NERDTreePart,NERDTreePartFile
-
-    syn match NERDTreeFlags #-\[.\]# containedin=NERDTreeFile,NERDTreePartFile
-    syn match NERDTreeFlags #[+~]\zs\[.\]# containedin=NERDTreeDir
-endif
 
 syn match NERDTreeCWD #^[</].*$#
 

sources_non_forked/syntastic/CONTRIBUTING.md

@@ -40,8 +40,8 @@ too:
 
 Before you consider adding features to syntastic, _please_ spend a few
 minutes (re-)reading the latest version of the [manual][1].  Syntastic
-is changing rapidly at times, and it's quite possible that some of the
+is changing rapidly at times, and it's quite possible that some features
-features you want to add exist already.
+you want to add exist already.
 
 To submit a patch:
 
@@ -54,7 +54,7 @@ Small, focused patches are preferred.
 Large changes to the code should be discussed with the core team first.
 Create an issue and explain your plan and see what we say.
 
-Also make sure to update the manual whenever applicable.  Nobody can use
+Also, make sure to update the manual whenever applicable.  Nobody can use
 features that aren't documented.
 
 <a name="generalstyle"></a>

sources_non_forked/syntastic/README.markdown

@@ -35,7 +35,7 @@
 4.8. [How can I pass additional arguments to a checker?](#faqargs)  
 4.9. [Syntastic supports several checkers for my filetype - how do I tell which one(s) to use?](#faqcheckers)  
 4.10. [What is the difference between syntax checkers and style checkers?](#faqstyle)  
-4.11. [I have enabled multiple checkers for the current filetype.  How can I display all of the errors from all of the checkers together?](#faqaggregate)  
+4.11. [I have enabled multiple checkers for the current filetype.  How can I display all errors from all checkers together?](#faqaggregate)  
 4.12. [How can I jump between the different errors without using the location list at the bottom of the window?](#faqlnext)  
 4.13. [The error window is closed automatically when I :quit the current buffer but not when I :bdelete it?](#faqbdelete)  
 5. [Resources](#otherresources)  
@@ -53,22 +53,23 @@ 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, API Blueprint, AppleScript, AsciiDoc, ASM, BEMHTML, Bro, Bourne shell, C,
+Ada, Ansible configurations, API Blueprint, AppleScript, AsciiDoc, ASM,
-C++, C#, Cabal, Chef, CoffeeScript, Coco, Coq, CSS, Cucumber, CUDA, D, Dart,
+BEMHTML, Bro, Bourne shell, C, C++, C#, Cabal, Chef, CoffeeScript, Coco, Coq,
-DocBook, Dust, Elixir, Erlang, eRuby, Fortran, Gentoo metadata, GLSL, Go, Haml,
+CSS, Cucumber, CUDA, D, Dart, DocBook, Dockerfile, Dust, Elixir, Erlang,
-Haskell, Haxe, Handlebars, HSS, HTML, Java, JavaScript, JSON, JSX, LESS, Lex,
+eRuby, Fortran, Gentoo metadata, GLSL, Go, Haml, Haskell, Haxe, Handlebars,
-Limbo, LISP, LLVM intermediate language, Lua, Markdown, MATLAB, Mercury, NASM,
+HSS, HTML, Jade, Java, JavaScript, JSON, JSX, LESS, Lex, Limbo, LISP, LLVM
-Nix, Objective-C, Objective-C++, OCaml, Perl, Perl POD, PHP, gettext Portable
+intermediate language, Lua, Markdown, MATLAB, Mercury, NASM, Nix, Objective-C,
-Object, OS X and iOS property lists, Puppet, Python, R, Racket, Relax NG,
+Objective-C++, OCaml, Perl, Perl POD, PHP, gettext Portable Object, OS X and
-reStructuredText, RPM spec, Ruby, SASS/SCSS, Scala, Slim, SML, Sphinx, Tcl,
+iOS property lists, Puppet, Python, QML, R, Racket, Relax NG, reStructuredText,
-TeX, Texinfo, Twig, TypeScript, Vala, Verilog, VHDL, VimL, xHtml, XML, XSLT,
+RPM spec, Ruby, SASS/SCSS, Scala, Slim, SML, Sphinx, SQL, Stylus, Tcl, TeX,
+Texinfo, Twig, TypeScript, Vala, Verilog, VHDL, VimL, xHtml, XML, XSLT, XQuery,
 YACC, YAML, z80, Zope page templates, and zsh.  See the [wiki][3] for details
 about the corresponding supported checkers.
 
 A number of third-party Vim plugins also provide checkers for syntastic,
-for example: [omnisharp-vim][25], [rust.vim][12], [syntastic-extras][26],
+for example: [merlin][30], [omnisharp-vim][25], [rust.vim][12],
-[syntastic-more][27], [vim-crystal][29], [vim-eastwood][28], and
+[syntastic-extras][26], [syntastic-more][27], [vim-crystal][29],
-[vim-swift][24].
+[vim-eastwood][28], and [vim-swift][24].
 
 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
@@ -159,10 +160,10 @@ following:
 
 ## 3\. Recommended settings
 
-Syntastic has a large number of options that can be configured, and the
+Syntastic has numerous options that can be configured, and the defaults
-defaults are not particularly well suitable for new users.  It is recommended
+are not particularly well suitable for new users.  It is recommended
-that you start by adding the following lines to your `vimrc` file, and return
+that you start by adding the following lines to your `vimrc` file, and
-to them after reading the manual (see `:help syntastic` in Vim):
+return to them after reading the manual (see `:help syntastic` in Vim):
 ```vim
 set statusline+=%#warningmsg#
 set statusline+=%{SyntasticStatuslineFlag()}
@@ -380,7 +381,7 @@ See `:help syntastic_quiet_messages` for details.
 <a name="faqaggregate"></a>
 
 __4.11. Q. I have enabled multiple checkers for the current filetype.  How can I
-display all of the errors from all of the checkers together?__
+display all errors from all checkers together?__
 
 A. Set `g:syntastic_aggregate_errors` to 1 in your `vimrc`:
 ```vim
@@ -427,7 +428,8 @@ There are also a dedicated [google group][5], and a
 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 [jedi-vim][7], [python-mode][8], or [YouCompleteMe][9].
+a look at [ghcmod-vim][31], [jedi-vim][7], [python-mode][8], [vim-go][32], or
+[YouCompleteMe][9].
 
 [0]: https://github.com/scrooloose/syntastic/raw/master/_assets/screenshot_1.png
 [1]: https://github.com/tpope/vim-pathogen
@@ -459,6 +461,9 @@ a look at [jedi-vim][7], [python-mode][8], or [YouCompleteMe][9].
 [27]: https://github.com/roktas/syntastic-more
 [28]: https://github.com/venantius/vim-eastwood
 [29]: https://github.com/rhysd/vim-crystal
+[30]: https://github.com/the-lambda-church/merlin
+[31]: https://github.com/eagletmt/ghcmod-vim
+[32]: https://github.com/fatih/vim-go
 
 <!--
 vim:tw=79:sw=4:

sources_non_forked/syntastic/autoload/syntastic/c.vim

@@ -223,10 +223,15 @@ function! s:_get_cflags(ft, ck, opts) abort " {{{2
 
     " check if the user manually set some cflags
     let b_cflags = s:_get_checker_var('b', a:ft, a:ck, 'cflags', '')
-    if b_cflags ==# ''
+    if b_cflags !=# ''
-        if a:ft ==# 'c' || a:ft ==# 'cpp'
+        let flags .= ' ' . b_cflags
-            " check whether to search for include files at all
+    endif
-            if !s:_get_checker_var('g', a:ft, a:ck, 'no_include_search', 0)
+
+    " add optional config file parameters
+    let config_file = s:_get_checker_var('g', a:ft, a:ck, 'config_file', '.syntastic_' . a:ft . '_config')
+    let flags .= ' ' . syntastic#c#ReadConfig(config_file)
+
+    if b_cflags ==# '' && (a:ft ==# 'c' || a:ft ==# 'cpp') && !s:_get_checker_var('g', a:ft, a:ck, 'no_include_search', 0)
         " refresh the include file search if desired
         if s:_get_checker_var('g', a:ft, a:ck, 'auto_refresh_includes', 0)
             let flags .= ' ' . s:_search_headers()
@@ -238,15 +243,6 @@ function! s:_get_cflags(ft, ck, opts) abort " {{{2
             let flags .= ' ' . b:syntastic_{a:ft}_includes
         endif
     endif
-        endif
-    else
-        " user-defined cflags
-        let flags .= ' ' . b_cflags
-    endif
-
-    " add optional config file parameters
-    let config_file = s:_get_checker_var('g', a:ft, a:ck, 'config_file', '.syntastic_' . a:ft . '_config')
-    let flags .= ' ' . syntastic#c#ReadConfig(config_file)
 
     return flags
 endfunction " }}}2

sources_non_forked/syntastic/autoload/syntastic/preprocess.vim

@@ -59,27 +59,51 @@ function! syntastic#preprocess#cppcheck(errors) abort " {{{2
     return map(copy(a:errors), 'substitute(v:val, ''\v^\[[^]]+\]\zs( -\> \[[^]]+\])+\ze:'', "", "")')
 endfunction " }}}2
 
-" @vimlint(EVL102, 1, l:true)
+function! syntastic#preprocess#dockerfile_lint(errors) abort " {{{2
-" @vimlint(EVL102, 1, l:false)
+    let out = []
-" @vimlint(EVL102, 1, l:null)
+    let json = s:_decode_JSON(join(a:errors, ''))
-function! syntastic#preprocess#flow(errors) abort " {{{2
-    " JSON artifacts
-    let true = 1
-    let false = 0
-    let null = ''
 
+    if type(json) == type({})
+        try
+            let data = json['error']['data'] + json['warn']['data'] + json['info']['data']
+            for e in data
+                let type = toupper(e['level'][0])
+                if type ==# 'I'
+                    let type = 'W'
+                    let style = 1
+                else
+                    let style = 0
+                endif
+
+                let line = get(e, 'line', 1)
+                let message = e['message']
+                if has_key(e, 'description') && e['description'] !=# 'None'
+                    let message = message . '. ' . e['description']
+                endif
+
+                let msg =
+                    \ type . ':' .
+                    \ style . ':' .
+                    \ line . ':' .
+                    \ message
+                call add(out, msg)
+            endfor
+        catch /\m^Vim\%((\a\+)\)\=:E716/
+            call syntastic#log#warn('checker dockerfile/dockerfile_lint: unrecognized error format')
+            let out = []
+        endtry
+    else
+        call syntastic#log#warn('checker dockerfile/dockerfile_lint: unrecognized error format')
+    endif
+    return out
+endfunction " }}}2
+
+function! syntastic#preprocess#flow(errors) abort " {{{2
     let idx = 0
-    while idx < len(a:errors) && a:errors[idx][0] != '{'
+    while idx < len(a:errors) && a:errors[idx][0] !=# '{'
         let idx += 1
     endwhile
-
+    let errs = s:_decode_JSON(join(a:errors[idx :], ''))
-    " A hat tip to Marc Weber for this trick
-    " http://stackoverflow.com/questions/17751186/iterating-over-a-string-in-vimscript-or-parse-a-json-file/19105763#19105763
-    try
-        let errs = eval(join(a:errors[idx :], ''))
-    catch
-        let errs = {}
-    endtry
 
     let out = []
     if type(errs) == type({}) && has_key(errs, 'errors') && type(errs['errors']) == type([])
@@ -108,29 +132,26 @@ function! syntastic#preprocess#flow(errors) abort " {{{2
 
                     call add(out, msg)
                 catch /\m^Vim\%((\a\+)\)\=:E716/
-                    call syntastic#log#warn('checker javascript/flow: unknown error format')
+                    call syntastic#log#warn('checker javascript/flow: unrecognized error format')
                     let out = []
                     break
                 endtry
             else
-                call syntastic#log#warn('checker javascript/flow: unknown error format')
+                call syntastic#log#warn('checker javascript/flow: unrecognized error format')
                 let out = []
                 break
             endif
         endfor
     else
-        call syntastic#log#warn('checker javascript/flow: unknown error format')
+        call syntastic#log#warn('checker javascript/flow: unrecognized error format')
     endif
 
     return out
 endfunction " }}}2
-" @vimlint(EVL102, 0, l:true)
-" @vimlint(EVL102, 0, l:false)
-" @vimlint(EVL102, 0, l:null)
 
 function! syntastic#preprocess#iconv(errors) abort " {{{2
     return
-        \ (has('iconv') || has('iconv/dyn')) && &encoding !=# '' && &encoding !=# 'utf-8' ?
+        \ has('iconv') && &encoding !=# '' && &encoding !=# 'utf-8' ?
         \       map(a:errors, 'iconv(v:val, "utf-8", &encoding)') :
         \       a:errors
 endfunction " }}}2
@@ -152,22 +173,8 @@ function! syntastic#preprocess#perl(errors) abort " {{{2
     return syntastic#util#unique(out)
 endfunction " }}}2
 
-" @vimlint(EVL102, 1, l:true)
-" @vimlint(EVL102, 1, l:false)
-" @vimlint(EVL102, 1, l:null)
 function! syntastic#preprocess#prospector(errors) abort " {{{2
-    " JSON artifacts
+    let errs = s:_decode_JSON(join(a:errors, ''))
-    let true = 1
-    let false = 0
-    let null = ''
-
-    " A hat tip to Marc Weber for this trick
-    " http://stackoverflow.com/questions/17751186/iterating-over-a-string-in-vimscript-or-parse-a-json-file/19105763#19105763
-    try
-        let errs = eval(join(a:errors, ''))
-    catch
-        let errs = {}
-    endtry
 
     let out = []
     if type(errs) == type({}) && has_key(errs, 'messages')
@@ -189,26 +196,23 @@ function! syntastic#preprocess#prospector(errors) abort " {{{2
 
                         call add(out, msg)
                     catch /\m^Vim\%((\a\+)\)\=:E716/
-                        call syntastic#log#warn('checker python/prospector: unknown error format')
+                        call syntastic#log#warn('checker python/prospector: unrecognized error format')
                         let out = []
                         break
                     endtry
                 else
-                    call syntastic#log#warn('checker python/prospector: unknown error format')
+                    call syntastic#log#warn('checker python/prospector: unrecognized error format')
                     let out = []
                     break
                 endif
             endfor
         else
-            call syntastic#log#warn('checker python/prospector: unknown error format')
+            call syntastic#log#warn('checker python/prospector: unrecognized error format')
         endif
     endif
 
     return out
 endfunction " }}}2
-" @vimlint(EVL102, 0, l:true)
-" @vimlint(EVL102, 0, l:false)
-" @vimlint(EVL102, 0, l:null)
 
 function! syntastic#preprocess#rparse(errors) abort " {{{2
     let errlist = copy(a:errors)
@@ -249,6 +253,42 @@ function! syntastic#preprocess#rparse(errors) abort " {{{2
     return out
 endfunction " }}}2
 
+function! syntastic#preprocess#stylelint(errors) abort " {{{2
+    let out = []
+
+    " CssSyntaxError: /path/to/file.css:2:11: Missed semicolon
+    let parts = matchlist(a:errors[0], '\v^CssSyntaxError: (.{-1,}):(\d+):(\d+): (.+)')
+    if len(parts) > 4
+        call add(out, 'E:' . join(parts[1:4], ':'))
+    else
+        let errs = s:_decode_JSON(join(a:errors, ''))
+
+        let out = []
+        if type(errs) == type([]) && len(errs) == 1 && type(errs[0]) == type({}) &&
+            \ has_key(errs[0], 'source') && has_key(errs[0], 'warnings') && type(errs[0]['warnings']) == type([])
+
+            for e in errs[0]['warnings']
+                try
+                    let msg =
+                        \ ['W', 'E'][e['severity']-1] . ':' .
+                        \ errs[0]['source'] . ':' .
+                        \ e['line'] . ':' .
+                        \ e['column'] . ':' .
+                        \ e['text']
+                    call add(out, msg)
+                catch /\m^Vim\%((\a\+)\)\=:E716/
+                    call syntastic#log#warn('checker css/stylelint: unrecognized error format')
+                    let out = []
+                    break
+                endtry
+            endfor
+        else
+            call syntastic#log#warn('checker css/stylelint: unrecognized error format')
+        endif
+    endif
+    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
@@ -268,22 +308,8 @@ function! syntastic#preprocess#validator(errors) abort " {{{2
     return out
 endfunction " }}}2
 
-" @vimlint(EVL102, 1, l:true)
-" @vimlint(EVL102, 1, l:false)
-" @vimlint(EVL102, 1, l:null)
 function! syntastic#preprocess#vint(errors) abort " {{{2
-    " JSON artifacts
+    let errs = s:_decode_JSON(join(a:errors, ''))
-    let true = 1
-    let false = 0
-    let null = ''
-
-    " A hat tip to Marc Weber for this trick
-    " http://stackoverflow.com/questions/17751186/iterating-over-a-string-in-vimscript-or-parse-a-json-file/19105763#19105763
-    try
-        let errs = eval(join(a:errors, ''))
-    catch
-        let errs = []
-    endtry
 
     let out = []
     if type(errs) == type([])
@@ -300,22 +326,166 @@ function! syntastic#preprocess#vint(errors) abort " {{{2
 
                     call add(out, msg)
                 catch /\m^Vim\%((\a\+)\)\=:E716/
-                    call syntastic#log#warn('checker vim/vint: unknown error format')
+                    call syntastic#log#warn('checker vim/vint: unrecognized error format')
                     let out = []
                     break
                 endtry
             else
-                call syntastic#log#warn('checker vim/vint: unknown error format')
+                call syntastic#log#warn('checker vim/vint: unrecognized error format')
                 let out = []
                 break
             endif
         endfor
     else
-        call syntastic#log#warn('checker vim/vint: unknown error format')
+        call syntastic#log#warn('checker vim/vint: unrecognized error format')
     endif
 
     return out
 endfunction " }}}2
+
+" }}}1
+
+" Workarounds {{{1
+
+" In errorformat, \ or % following %f make it depend on isfname.  The default
+" setting of isfname is crafted to work with completion, rather than general
+" filename matching.  The result for syntastic is that filenames containing
+" spaces (or a few other special characters) can't be matched.
+"
+" Fixing isfname to address this problem would depend on the set of legal
+" characters for filenames on the filesystem the project's files lives on.
+" Inferring the kind of filesystem a file lives on, in advance to parsing the
+" file's name, is an interesting problem (think f.i. a file loaded from a VFAT
+" partition, mounted on Linux).  A problem syntastic is not prepared to solve.
+"
+" As a result, the functions below exist for the only reason to avoid using
+" things like %f\, in errorformat.
+"
+" References:
+" https://groups.google.com/forum/#!topic/vim_dev/pTKmZmouhio
+" https://vimhelp.appspot.com/quickfix.txt.html#error-file-format
+
+function! syntastic#preprocess#basex(errors) abort " {{{2
+    let out = []
+    let idx = 0
+    while idx < len(a:errors)
+        let parts = matchlist(a:errors[idx], '\v^\[\S+\] Stopped at (.+), (\d+)/(\d+):')
+        if len(parts) > 3
+            let err = parts[1] . ':' . parts[2] . ':' . parts[3] . ':'
+            let parts = matchlist(a:errors[idx+1], '\v^\[(.)\D+(\d+)\] (.+)')
+            if len(parts) > 3
+                let err .= (parts[1] ==? 'W' || parts[1] ==? 'E' ? parts[1] : 'E') . ':' . parts[2] . ':' . parts[3]
+                call add(out, err)
+                let idx +=1
+            endif
+        elseif a:errors[idx] =~# '\m^\['
+            " unparseable errors
+            call add(out, a:errors[idx])
+        endif
+        let idx +=1
+    endwhile
+    return out
+endfunction " }}}2
+
+function! syntastic#preprocess#bro(errors) abort " {{{2
+    let out = []
+    for e in a:errors
+        let parts = matchlist(e, '\v^%(fatal )?(error|warning) in (.{-1,}), line (\d+): (.+)')
+        if len(parts) > 4
+            let parts[1] = parts[1][0]
+            call add(out, join(parts[1:4], ':'))
+        endif
+    endfor
+    return out
+endfunction " }}}2
+
+function! syntastic#preprocess#coffeelint(errors) abort " {{{2
+    let out = []
+    for e in a:errors
+        let parts = matchlist(e, '\v^(.{-1,}),(\d+)%(,\d*)?,(error|warn),(.+)')
+        if len(parts) > 4
+            let parts[3] = parts[3][0]
+            call add(out, join(parts[1:4], ':'))
+        endif
+    endfor
+    return out
+endfunction " }}}2
+
+function! syntastic#preprocess#mypy(errors) abort " {{{2
+    let out = []
+    for e in a:errors
+        " new format
+        let parts = matchlist(e, '\v^(.{-1,}):(\d+): error: (.+)')
+        if len(parts) > 3
+            call add(out, join(parts[1:3], ':'))
+            continue
+        endif
+
+        " old format
+        let parts = matchlist(e, '\v^(.{-1,}), line (\d+): (.+)')
+        if len(parts) > 3
+            call add(out, join(parts[1:3], ':'))
+        endif
+    endfor
+    return out
+endfunction " }}}2
+
+function! syntastic#preprocess#nix(errors) abort " {{{2
+    let out = []
+    for e in a:errors
+        let parts = matchlist(e, '\v^(.{-1,}), at (.{-1,}):(\d+):(\d+)$')
+        if len(parts) > 4
+            call add(out, join(parts[2:4], ':') . ':' . parts[1])
+            continue
+        endif
+
+        let parts = matchlist(e, '\v^(.{-1,}) at (.{-1,}), line (\d+):')
+        if len(parts) > 3
+            call add(out, parts[2] . ':' . parts[3] . ':' . parts[1])
+            continue
+        endif
+
+        let parts = matchlist(e, '\v^error: (.{-1,}), in (.{-1,})$')
+        if len(parts) > 2
+            call add(out, parts[2] . ':' . parts[1])
+        endif
+    endfor
+    return out
+endfunction " }}}2
+
+" }}}1
+
+" Private functions {{{1
+
+" @vimlint(EVL102, 1, l:true)
+" @vimlint(EVL102, 1, l:false)
+" @vimlint(EVL102, 1, l:null)
+function! s:_decode_JSON(json) abort " {{{2
+    if a:json ==# ''
+        return []
+    endif
+
+    " The following is inspired by https://github.com/MarcWeber/vim-addon-manager and
+    " http://stackoverflow.com/questions/17751186/iterating-over-a-string-in-vimscript-or-parse-a-json-file/19105763#19105763
+    " A hat tip to Marc Weber for this trick
+    if substitute(a:json, '\v\"%(\\.|[^"\\])*\"|true|false|null|[+-]?\d+%(\.\d+%([Ee][+-]?\d+)?)?', '', 'g') !~# "[^,:{}[\\] \t]"
+        " JSON artifacts
+        let true = 1
+        let false = 0
+        let null = ''
+
+        try
+            let object = eval(a:json)
+        catch
+            " malformed JSON
+            let object = ''
+        endtry
+    else
+        let object = ''
+    endif
+
+    return object
+endfunction " }}}2
 " @vimlint(EVL102, 0, l:true)
 " @vimlint(EVL102, 0, l:false)
 " @vimlint(EVL102, 0, l:null)

sources_non_forked/syntastic/autoload/syntastic/util.vim

@@ -107,7 +107,7 @@ function! syntastic#util#rmrf(what) abort " {{{2
     endif
 endfunction " }}}2
 
-"search the first 5 lines of the file for a magic number and return a map
+" Search the first 5 lines of the file for a magic number and return a map
 " containing the args and the executable
 "
 " e.g.
@@ -183,7 +183,7 @@ function! syntastic#util#screenWidth(str, tabstop) abort " {{{2
     return width
 endfunction " }}}2
 
-"print as much of a:msg as possible without "Press Enter" prompt appearing
+" Print as much of a:msg as possible without "Press Enter" prompt appearing
 function! syntastic#util#wideMsg(msg) abort " {{{2
     let old_ruler = &ruler
     let old_showcmd = &showcmd
@@ -226,7 +226,7 @@ function! syntastic#util#bufIsActive(buffer) abort " {{{2
     return 0
 endfunction " }}}2
 
-" start in directory a:where and walk up the parent folders until it finds a
+" Start in directory a:where and walk up the parent folders until it finds a
 " file named a:what; return path to that file
 function! syntastic#util#findFileInParent(what, where) abort " {{{2
     let old_suffixesadd = &suffixesadd
@@ -236,7 +236,7 @@ function! syntastic#util#findFileInParent(what, where) abort " {{{2
     return file
 endfunction " }}}2
 
-" start in directory a:where and walk up the parent folders until it finds a
+" Start in directory a:where and walk up the parent folders until it finds a
 " file matching a:what; return path to that file
 function! syntastic#util#findGlobInParent(what, where) abort " {{{2
     let here = fnamemodify(a:where, ':p')
@@ -303,7 +303,7 @@ function! syntastic#util#argsescape(opt) abort " {{{2
     return []
 endfunction " }}}2
 
-" decode XML entities
+" Decode XML entities
 function! syntastic#util#decodeXMLEntities(string) abort " {{{2
     let str = a:string
     let str = substitute(str, '\m&lt;', '<', 'g')
@@ -339,6 +339,87 @@ function! syntastic#util#stamp() abort " {{{2
     return split( split(reltimestr(reltime(g:_SYNTASTIC_START)))[0], '\.' )
 endfunction " }}}2
 
+let s:_wid_base = 'syntastic_' . getpid() . '_' . reltimestr(g:_SYNTASTIC_START) . '_'
+let s:_wid_pool = 0
+
+" Add unique IDs to windows
+function! syntastic#util#setWids() abort " {{{2
+    for tab in range(1, tabpagenr('$'))
+        for win in range(1, tabpagewinnr(tab, '$'))
+            if gettabwinvar(tab, win, 'syntastic_wid') ==# ''
+                call settabwinvar(tab, win, 'syntastic_wid', s:_wid_base . s:_wid_pool)
+                let s:_wid_pool += 1
+            endif
+        endfor
+    endfor
+endfunction " }}}2
+
+let s:_str2float = function(exists('*str2float') ? 'str2float' : 'str2nr')
+lockvar s:_str2float
+
+function! syntastic#util#str2float(val) abort " {{{2
+    return s:_str2float(a:val)
+endfunction " }}}2
+
+function! syntastic#util#float2str(val) abort " {{{2
+    return s:_float2str(a:val)
+endfunction " }}}2
+
+" Crude printf()-like width formatter.  Handles wide characters.
+function! syntastic#util#wformat(format, str) abort " {{{2
+    if a:format ==# ''
+        return a:str
+    endif
+
+ echomsg string(a:format) . ', ' . string(a:str)
+    let specs = matchlist(a:format, '\v^(-?)(0?)(%([1-9]\d*))?%(\.(\d+))?$')
+    if len(specs) < 5
+        return a:str
+    endif
+
+    let flushleft = specs[1] ==# '-'
+    let lpad = specs[2] ==# '0' ? '0' : ' '
+    let minlen = str2nr(specs[3])
+    let maxlen = str2nr(specs[4])
+    let out = substitute(a:str, "\t", ' ', 'g')
+
+    if maxlen && s:_width(out) > maxlen
+        let chars = filter(split(out, '\zs\ze', 1), 'v:val !=# ""')
+        let out = ''
+
+        if flushleft
+            for c in chars
+                if s:_width(out . c) < maxlen
+                    let out .= c
+                else
+                    let out .= &encoding ==# 'utf-8' && &termencoding ==# 'utf-8' ? "\u2026" : '>'
+                    break
+                endif
+            endfor
+        else
+            call reverse(chars)
+            for c in chars
+                if s:_width(c . out) < maxlen
+                    let out = c . out
+                else
+                    let out = (&encoding ==# 'utf-8' && &termencoding ==# 'utf-8' ? "\u2026" : '<') . out
+                    break
+                endif
+            endfor
+        endif
+    endif
+
+    if minlen && s:_width(out) < minlen
+        if flushleft
+            let out .= repeat(' ', minlen - s:_width(out))
+        else
+            let out = repeat(lpad, minlen - s:_width(out)) . out
+        endif
+    endif
+
+    return out
+endfunction " }}}2
+
 " }}}1
 
 " Private functions {{{1
@@ -416,6 +497,17 @@ function! s:_rmrf(what) abort " {{{2
     endif
 endfunction " }}}2
 
+function! s:_float2str_smart(val) abort " {{{2
+    return printf('%.1f', a:val)
+endfunction " }}}2
+
+function! s:_float2str_dumb(val) abort " {{{2
+    return a:val
+endfunction " }}}2
+
+let s:_float2str = function(has('float') ? 's:_float2str_smart' : 's:_float2str_dumb')
+lockvar s:_float2str
+
 " }}}1
 
 let &cpo = s:save_cpo

sources_non_forked/syntastic/doc/syntastic.txt

@@ -54,7 +54,7 @@ CONTENTS                                                  *syntastic-contents*
         7.10.vim-go................................|syntastic-vim-go|
         7.11.vim-virtualenv........................|syntastic-vim-virtualenv|
         7.12.YouCompleteMe.........................|syntastic-ycm|
-        7.13.The zsh shell and rvm.................|syntastic-zsh|
+        7.13.The zsh shell and MacVim..............|syntastic-zsh|
     8.About........................................|syntastic-about|
     9.License......................................|syntastic-license|
 
@@ -86,7 +86,7 @@ checker integrations, see the guide on the GitHub wiki:
 1.1. Quick start                                        *syntastic-quickstart*
 
 Syntastic comes preconfigured with a default list of enabled checkers per
-filetype. This list is kept reasonably short to prevent slowing down Vim or
+|filetype|. This list is kept reasonably short to prevent slowing down Vim or
 trying to use conflicting checkers.
 
 You can see the list of checkers available for the current filetype with the
@@ -110,10 +110,10 @@ these commands, or perhaps install a plugin such as Tim Pope's 'unimpaired'
 ------------------------------------------------------------------------------
 1.2. Recommended settings                              *syntastic-recommended*
 
-Syntastic has a large number of options that can be configured, and the
+Syntastic has numerous options that can be configured, and the defaults are
-defaults are not particularly well suitable for new users. It is recommended
+not particularly well suitable for new users. It is recommended that you start
-that you start by adding the following lines to your vimrc, and return to them
+by adding the following lines to your vimrc, and return to them later as
-later as needed: >
+needed: >
     set statusline+=%#warningmsg#
     set statusline+=%{SyntasticStatuslineFlag()}
     set statusline+=%*
@@ -161,13 +161,13 @@ is derived from the |syntastic_stl_format| option.
 ------------------------------------------------------------------------------
 2.2. Error signs                                       *syntastic-error-signs*
 
-Syntastic uses the |:sign| commands to mark lines with errors and warnings in
+Syntastic uses the |:sign| commands (provided that the |+signs| feature is
-the sign column. To enable this feature, use the |'syntastic_enable_signs'|
+compiled in) to mark lines with errors and warnings in the sign column. To
-option.
+enable this feature, use the |'syntastic_enable_signs'| option.
 
-Signs are colored using the Error and Todo syntax highlight groups by default.
+Signs are colored using the Error and Todo syntax highlight groups by default
-If you wish to customize the colors for the signs, you can use the following
+(see |group-name|). If you wish to customize the colors for the signs, you
-groups:
+can use the following groups:
     SyntasticErrorSign - For syntax errors, links to 'error' by default
     SyntasticWarningSign - For syntax warnings, links to 'todo' by default
     SyntasticStyleErrorSign - For style errors, links to 'SyntasticErrorSign'
@@ -194,17 +194,13 @@ Example: >
 You can use the |:Errors| command to display the errors for the current buffer
 in the |location-list|.
 
-Note that when you use |:Errors| the current location list is overwritten with
-Syntastic's own location list. The location list is also overwritten when
-|syntastic_auto_jump| is non-zero and the cursor has to jump to an issue.
-
 By default syntastic doesn't fill the |location-list| with the errors found by
 the checkers, in order to reduce clashes with other plugins. Consequently, if
-you run |:lopen| or |:lwindow| rather than |:Errors| to open the error window you
+you run |:lopen| or |:lwindow| rather than |:Errors| to open the error window
-wouldn't see syntastic's list of errors. If you insist on using |:lopen| or
+you wouldn't see syntastic's list of errors. If you insist on using |:lopen|
-|:lwindow| you should either run |:SyntasticSetLoclist| after running the checks,
+or |:lwindow| you should either run |:SyntasticSetLoclist| after running the
-or set |syntastic_always_populate_loc_list| which tells syntastic to update the
+checks, or set |syntastic_always_populate_loc_list| which tells syntastic to
-|location-list| automatically.
+update the |location-list| automatically.
 
 ------------------------------------------------------------------------------
 2.4. Error highlighting                               *syntastic-highlighting*
@@ -251,7 +247,8 @@ You can selectively disable some of the errors found by checkers either
 using |'syntastic_quiet_messages'|, or by specifying a list of patterns in
 |'syntastic_ignore_files'|.
 
-See also: |'syntastic_<filetype>_<checker>_quiet_messages'|.
+See also: |'syntastic_<filetype>_<checker>_quiet_messages'| and
+|'b:syntastic_skip_checks'|.
 
 ==============================================================================
 3. Commands                                               *syntastic-commands*
@@ -273,15 +270,15 @@ for more info.
 
 Manually cause a syntax check to be done.  By default the checkers in the
 |'g:syntastic_<filetype>_checkers'| or |'b:syntastic_checkers'| lists are run,
-cf. |syntastic-filetype-checkers|.  If |syntastic_aggregate_errors| is unset
+cf. |syntastic-filetype-checkers|.  If |'syntastic_aggregate_errors'| is unset
 (which is the default), checking stops the first time a checker reports any
-errors; if |syntastic_aggregate_errors| is set, all checkers that apply are run
+errors; if |'syntastic_aggregate_errors'| is set, all checkers that apply are
-in turn, and all errors found are aggregated in a single list.
+run in turn, and all errors found are aggregated in a single list.
 
 The command may be followed by a (space separated) list of checkers.  In this
 case |'g:syntastic_<filetype>_checkers'| and |'b:syntastic_checkers'| are
 ignored, and the checkers named by the command's arguments are run instead, in
-the order specified.  The rules of |syntastic_aggregate_errors| still apply.
+the order specified.  The set by |'syntastic_aggregate_errors'| still apply.
 
 Example: >
     :SyntasticCheck flake8 pylint
@@ -307,18 +304,17 @@ the location list explicitly.
 ==============================================================================
 4. Global Options                                   *syntastic-global-options*
 
-
                                                    *'syntastic_check_on_open'*
 Default: 0
-If enabled, syntastic will do syntax checks when buffers are first loaded as
+If this variable is enabled, syntastic in active mode will run syntax checks
-well as on saving >
+when buffers are first loaded, as well as on saving: >
     let g:syntastic_check_on_open = 1
 <
                                                      *'syntastic_check_on_wq'*
 Default: 1
-Normally syntastic runs syntax checks whenever buffers are written to disk.
+In active mode syntax checks are normally run whenever buffers are written to
-If you want to skip these checks when you issue |:wq|, |:x|, and |:ZZ|, set this
+disk, even when the writes happen just before quitting Vim.  If you want to
-variable to 0. >
+skip checks when you issue |:wq|, |:x|, and |:ZZ|, set this variable to 0: >
     let g:syntastic_check_on_wq = 0
 <
                                                 *'syntastic_aggregate_errors'*
@@ -332,36 +328,37 @@ time a checker finds any errors. >
                                                      *'syntastic_id_checkers'*
 Default: 1
 When results from multiple checkers are aggregated in a single error list
-(that is either when |syntastic_aggregate_errors| is enabled, or when checking
+(that is either when |'syntastic_aggregate_errors'| is enabled, or when
-a file with a composite filetype), it might not be immediately obvious which
+checking a file with a composite filetype), it might not be immediately
-checker has produced a given error message. This variable instructs syntastic
+obvious which checker has produced a given error message. This variable
-to label error messages with the names of the checkers that created them. >
+instructs syntastic to label error messages with the names of the checkers
+that created them. >
     let g:syntastic_id_checkers = 0
 <
                                           *'syntastic_sort_aggregated_errors'*
 Default: 1
 By default, when results from multiple checkers are aggregated in a single
-error list (that is either when |syntastic_aggregate_errors| is enabled, or
+error list (that is either when |'syntastic_aggregate_errors'| is enabled,
-when checking a file with a composite filetype), errors are grouped by file,
+or when checking a file with a composite filetype), errors are grouped by
-then sorted by line number, then grouped by type (namely errors take precedence
+file, then sorted by line number, then grouped by type (namely errors take
-over warnings), then they are sorted by column number.  If you want to leave
+precedence over warnings), then they are sorted by column number.  If you want
-messages grouped by checker output, set this variable to 0. >
+to leave messages grouped by checker output, set this variable to 0: >
     let g:syntastic_sort_aggregated_errors = 0
 <
                                               *'syntastic_echo_current_error'*
 Default: 1
 If enabled, syntastic will echo current error to the command window. If
-multiple errors are found on the same line, |syntastic_cursor_columns| is used
+multiple errors are found on the same line, |'syntastic_cursor_columns'| is
-to decide which one is shown. >
+used to decide which one is shown. >
     let g:syntastic_echo_current_error = 1
 <
                                                   *'syntastic_cursor_columns'*
 Default: 1
 This option controls which errors are echoed to the command window if
-|syntastic_echo_current_error| is set and multiple errors are found on the same
+|'syntastic_echo_current_error'| is set and multiple errors are found on the
-line. When the option is enabled, the first error corresponding to the current
+same line. When the option is enabled, the first error corresponding to the
-column is show. Otherwise, the first error on the current line is echoed,
+current column is shown. Otherwise, the first error on the current line is
-regardless of the cursor position on the current line.
+echoed, regardless of the cursor position on the current line.
 
 When dealing with very large lists of errors, disabling this option can speed
 up navigation significantly: >
@@ -402,10 +399,17 @@ errors (where possible). Highlighting can be turned off with the following >
 <
                                         *'syntastic_always_populate_loc_list'*
 Default: 0
-Enable this option to tell syntastic to always stick any detected errors into
+By default syntastic doesn't fill the |location-list| with the errors found
-the |location-list|: >
+by the checkers, in order to reduce clashes with other plugins. Enable this
+option to tell syntastic to always stick any detected errors into the
+|location-list|: >
     let g:syntastic_always_populate_loc_list = 1
 <
+Please note that if |'syntastic_auto_jump'| is set to a non-zero value the
+location list is overwritten with Syntastic's own list when taking a jump,
+regardless of the value of |'syntastic_always_populate_loc_list'|.  The
+location list is also overwritten when running the |:Errors| command.
+
                                                        *'syntastic_auto_jump'*
 Default: 0
 Enable this option if you want the cursor to jump to the first detected issue
@@ -426,6 +430,10 @@ When set to 3 the cursor will jump to the first error detected, if any. If
 all issues detected are warnings, the cursor won't jump. >
     let g:syntastic_auto_jump = 3
 <
+Please note that in either situation taking the jump also has the side effect
+of the location list being overwritten with Syntastic's own location list,
+regardless of the value of |'syntastic_always_populate_loc_list'|.
+
                                                    *'syntastic_auto_loc_list'*
 Default: 2
 Use this option to tell syntastic to automatically open and/or close the
@@ -452,8 +460,8 @@ opens. >
 Default: []
 Use this option to specify files that syntastic should never check.  It's a
 list of |regular-expression| patterns.  The full paths of files (see |::p|) are
-matched against these patterns, and the matches are case sensitive. Use |\c|
+matched against these patterns, and the matches are case-sensitive. Use |\c|
-to specify case insensitive patterns.  Example: >
+to specify case-insensitive patterns.  Example: >
     let g:syntastic_ignore_files = ['\m^/usr/include/', '\m\c\.h$']
 <
                                                     *'syntastic_filetype_map'*
@@ -528,10 +536,10 @@ overriding filters, cf. |filter-overrides|).
 
     "level" - takes one of two values, "warnings" or "errors"
     "type"  - can be either "syntax" or "style"
-    "regex" - is matched against the messages' text as a case insensitive
+    "regex" - is matched against the messages' text as a case-insensitive
               |regular-expression|
     "file"  - is matched against the filenames the messages refer to, as a
-              case sensitive |regular-expression|.
+              case-sensitive |regular-expression|.
 
 If a key is prefixed by an exclamation mark "!", the corresponding filter is
 negated (i.e. the above example silences all messages that are NOT errors).
@@ -568,10 +576,23 @@ magic flags are available to insert information:
     %e  - number of errors
     %w  - number of warnings
     %t  - total number of warnings and errors
+    %ne - filename of file containing first error
+    %nw - filename of file containing first warning
+    %N  - filename of file containing first warning or error
+    %pe - filename with path of file containing first error
+    %pw - filename with path of file containing first warning
+    %P  - filename with path of file containing first warning or error
     %fe - line number of first error
     %fw - line number of first warning
     %F  - line number of first warning or error
 
+These flags accept width and alignment controls similar to the ones used by
+|'statusline'| flags:
+    %-0{minwid}.{maxwid}{flag}
+
+All fields except {flag} are optional. A single percent sign can be given as
+"%%".
+
 Several additional flags are available to hide text under certain conditions:
     %E{...} - hide the text in the brackets unless there are errors
     %W{...} - hide the text in the brackets unless there are warnings
@@ -612,7 +633,6 @@ The above variable can be used to disable exit code checks in syntastic.
 
                                                            *'syntastic_shell'*
 Default: Vim's 'shell'
-
 This is the (full path to) the shell syntastic will use to run the checkers.
 On UNIX and Mac OS-X this shell must accept Bourne-compatible syntax for
 file "stdout" and "stderr" redirections ">file" and "2>file".  Examples of
@@ -624,6 +644,13 @@ operations.  It must take care to initialize all environment variables needed
 by the checkers you're using.  Example: >
     let g:syntastic_shell = "/bin/sh"
 <
+                                             *'syntastic_nested_autocommands'*
+Default: 0
+Controls whether syntastic's autocommands |BufReadPost| and |BufWritePost|
+are called from other |BufReadPost| and |BufWritePost| autocommands (see
+|autocmd-nested|).  This is known to trigger interoperability problems with
+other plugins, so only enable it if you actually need that functionality.
+
                                                            *'syntastic_debug'*
 Default: 0
 Set this to the sum of one or more of the following flags to enable
@@ -780,7 +807,7 @@ this variable, that takes precedence over it in the buffers where it is
 defined.
 
 For aggregated lists (see |syntastic-aggregating-errors|) these variables are
-ignored if |syntastic_sort_aggregated_errors| is set (which is the default).
+ignored if |'syntastic_sort_aggregated_errors'| is set (which is the default).
 
 ==============================================================================
 6. Notes                                                     *syntastic-notes*
@@ -792,7 +819,7 @@ Some Vim plugins use composite filetypes, such as "django.python" or
 "handlebars.html". Normally, syntastic deals with this situation by splitting
 the filetype in its simple components, and calling all checkers that apply.
 If this behaviour is not desirable, you can disable it by mapping the
-composite filetypes to a simple ones using |syntastic_filetype_map|, e.g.: >
+composite filetypes to simple ones using |'syntastic_filetype_map'|, e.g.: >
     let g:syntastic_filetype_map = { "handlebars.html": "handlebars" }
 <
 ------------------------------------------------------------------------------
@@ -809,7 +836,7 @@ checkers, without any translation or conversion.
 The 'shellslash' option is relevant only on Windows systems.  This option
 determines (among other things) the rules for quoting command lines, and there
 is no easy way for syntastic to make sure its state is appropriate for your
-shell.  It should be turned off if your 'shell' (or |g:syntastic_shell|) is
+shell.  It should be turned off if your 'shell' (or |'syntastic_shell'|) is
 "cmd.exe", and on for shells that expect an UNIX-like syntax, such as Cygwin's
 "sh".  Most checkers will stop working if 'shellslash' is set to the wrong
 value.
@@ -832,7 +859,7 @@ quickfix windows.
 
 The "csh" and "tcsh" shells are mostly compatible with syntastic.  However,
 some checkers assume Bourne shell syntax for redirecting "stderr".  For this
-reason, you should point |g:syntastic_shell| to a Bourne-compatible shell,
+reason, you should point |'syntastic_shell'| to a Bourne-compatible shell,
 such as "zsh", "bash", "ksh", or even the original Bourne "sh": >
     let g:syntastic_shell = "/bin/sh"
 <
@@ -854,7 +881,7 @@ details.
 
 At the time of this writing the "fish" shell (see http://fishshell.com/)
 doesn't support the standard UNIX syntax for file redirections, and thus it
-can't be used together with syntastic. You can however set |g:syntastic_shell|
+can't be used together with syntastic. You can however set |'syntastic_shell'|
 to a more traditional shell, such as "zsh", "bash", "ksh", or even the
 original Bourne "sh": >
     let g:syntastic_shell = "/bin/sh"
@@ -915,9 +942,9 @@ Syntastic can be used along with the "python-mode" Vim plugin (see
 https://github.com/klen/python-mode). However, they both run syntax checks by
 default when you save buffers to disk, and this is probably not what you want.
 To avoid both plugins opening error windows, you can either set passive mode
-for python in syntastic (see |syntastic_mode_map|), or disable lint checks in
+for python in syntastic (see |'syntastic_mode_map'|), or disable lint checks in
-"python-mode", by setting |pymode_lint_write| to 0. E.g.: >
+"python-mode", by setting |pymode_lint_on_write| to 0. E.g.: >
-    let g:pymode_lint_write = 0
+    let g:pymode_lint_on_write = 0
 <
 ------------------------------------------------------------------------------
 7.9. vim-auto-save                                   *syntastic-vim-auto-save*
@@ -955,20 +982,19 @@ http://valloric.github.io/YouCompleteMe/).  However, by default "YouCompleteMe"
 disables syntastic's checkers for the "c", "cpp", "objc", and "objcpp"
 filetypes, in order to allow its own checkers to run.  If you want to use YCM's
 identifier completer but still run syntastic's checkers for those filetypes you
-have to set |ycm_show_diagnostics_ui| to 0. E.g.: >
+have to set |g:ycm_show_diagnostics_ui| to 0. E.g.: >
     let g:ycm_show_diagnostics_ui = 0
 <
 ------------------------------------------------------------------------------
-7.13 The zsh shell and rvm                                     *syntastic-zsh*
+7.13 The zsh shell and MacVim                                  *syntastic-zsh*
 
 If you're running MacVim together with the "zsh" shell (http://www.zsh.org/)
-and "rvm" (https://rvm.io/), you need to be aware that MacVim does not source
+you need to be aware that MacVim does not source your .zshrc file, but will
-the .zshrc file, but will source a .zshenv file.  Consequently you have to
+source a .zshenv file.  Consequently you have to move any setup steps relevant
-either source the "rvm" scripts from within .zshenv, or just change your shell
+to the checkers you're using from .zshrc to .zshenv, otherwise your checkers
-to something else: >
+will misbehave when run by syntastic.  This is particularly important for
-    set shell=/bin/sh
+programs such as "rvm" (https://rvm.io/) or "rbenv" (http://rbenv.org/), that
-<
+rely on setting environment variables.
-Of course, you'll have to make sure "rvm" still works in the new shell.
 
 ==============================================================================
 8. About                                                     *syntastic-about*

sources_non_forked/syntastic/plugin/syntastic.vim

@@ -9,7 +9,7 @@
 "
 "============================================================================
 
-if exists('g:loaded_syntastic_plugin')
+if exists('g:loaded_syntastic_plugin') || &compatible
     finish
 endif
 let g:loaded_syntastic_plugin = 1
@@ -19,11 +19,16 @@ if has('reltime')
     lockvar! g:_SYNTASTIC_START
 endif
 
-let g:_SYNTASTIC_VERSION = '3.6.0-122'
+let g:_SYNTASTIC_VERSION = '3.7.0-55'
 lockvar g:_SYNTASTIC_VERSION
 
 " Sanity checks {{{1
 
+if v:version < 700 || (v:version == 700 && !has('patch175'))
+    call syntastic#log#error('need Vim version 7.0.175 or later')
+    finish
+endif
+
 for s:feature in [
             \ 'autocmd',
             \ 'eval',
@@ -87,6 +92,7 @@ let g:_SYNTASTIC_DEFAULTS = {
         \ 'ignore_extensions':        '\c\v^([gx]?z|lzma|bz2)$',
         \ 'ignore_files':             [],
         \ 'loc_list_height':          10,
+        \ 'nested_autocommands':      0,
         \ 'quiet_messages':           {},
         \ 'reuse_loc_lists':          0,
         \ 'shell':                    &shell,
@@ -130,7 +136,7 @@ let s:_DEBUG_DUMP_OPTIONS = [
         \ 'shelltemp',
         \ 'shellxquote'
     \ ]
-if v:version > 703 || (v:version == 703 && has('patch446'))
+if exists('+shellxescape')
     call add(s:_DEBUG_DUMP_OPTIONS, 'shellxescape')
 endif
 lockvar! s:_DEBUG_DUMP_OPTIONS
@@ -157,6 +163,8 @@ let s:registry = g:SyntasticRegistry.Instance()
 let s:notifiers = g:SyntasticNotifiers.Instance()
 let s:modemap = g:SyntasticModeMap.Instance()
 
+let s:_quit_pre = []
+
 " Commands {{{1
 
 " @vimlint(EVL103, 1, a:cursorPos)
@@ -184,12 +192,15 @@ endfunction " }}}2
 " @vimlint(EVL103, 0, a:cmdLine)
 " @vimlint(EVL103, 0, a:argLead)
 
-command! -nargs=* -complete=custom,s:CompleteCheckerName SyntasticCheck call SyntasticCheck(<f-args>)
+command! -bar -nargs=* -complete=custom,s:CompleteCheckerName SyntasticCheck call SyntasticCheck(<f-args>)
-command! -nargs=? -complete=custom,s:CompleteFiletypes   SyntasticInfo  call SyntasticInfo(<f-args>)
+command! -bar -nargs=? -complete=custom,s:CompleteFiletypes   SyntasticInfo  call SyntasticInfo(<f-args>)
-command! Errors              call SyntasticErrors()
+command! -bar Errors              call SyntasticErrors()
-command! SyntasticReset      call SyntasticReset()
+command! -bar SyntasticReset      call SyntasticReset()
-command! SyntasticToggleMode call SyntasticToggleMode()
+command! -bar SyntasticToggleMode call SyntasticToggleMode()
-command! SyntasticSetLoclist call SyntasticSetLoclist()
+command! -bar SyntasticSetLoclist call SyntasticSetLoclist()
+
+command! SyntasticJavacEditClasspath runtime! syntax_checkers/java/*.vim | SyntasticJavacEditClasspath
+command! SyntasticJavacEditConfig    runtime! syntax_checkers/java/*.vim | SyntasticJavacEditConfig
 
 " }}}1
 
@@ -231,15 +242,26 @@ endfunction " }}}2
 " Autocommands {{{1
 
 augroup syntastic
-    autocmd BufReadPost  * call s:BufReadPostHook()
+    autocmd!
-    autocmd BufWritePost * call s:BufWritePostHook()
     autocmd BufEnter * call s:BufEnterHook()
 augroup END
 
-if v:version > 703 || (v:version == 703 && has('patch544'))
+if g:syntastic_nested_autocommands
+    augroup syntastic
+        autocmd BufReadPost  * nested call s:BufReadPostHook()
+        autocmd BufWritePost * nested call s:BufWritePostHook()
+    augroup END
+else
+    augroup syntastic
+        autocmd BufReadPost  * call s:BufReadPostHook()
+        autocmd BufWritePost * call s:BufWritePostHook()
+    augroup END
+endif
+
+if exists('##QuitPre')
     " QuitPre was added in Vim 7.3.544
     augroup syntastic
-        autocmd QuitPre * call s:QuitPreHook()
+        autocmd QuitPre * call s:QuitPreHook(expand('<amatch>', 1))
     augroup END
 endif
 
@@ -276,10 +298,15 @@ function! s:BufEnterHook() abort " {{{2
     endif
 endfunction " }}}2
 
-function! s:QuitPreHook() abort " {{{2
+function! s:QuitPreHook(fname) abort " {{{2
-    call syntastic#log#debug(g:_SYNTASTIC_DEBUG_AUTOCOMMANDS,
+    let buf = bufnr(fnameescape(a:fname))
-        \ 'autocmd: QuitPre, buffer ' . bufnr('') . ' = ' . string(bufname(str2nr(bufnr('')))))
+    call syntastic#log#debug(g:_SYNTASTIC_DEBUG_AUTOCOMMANDS, 'autocmd: QuitPre, buffer ' . buf . ' = ' . string(a:fname))
-    let b:syntastic_skip_checks = get(b:, 'syntastic_skip_checks', 0) || !syntastic#util#var('check_on_wq')
+
+    if !syntastic#util#var('check_on_wq')
+        call syntastic#util#setWids()
+        call add(s:_quit_pre, buf . '_' . getbufvar(buf, 'changetick') . '_' . w:syntastic_wid)
+    endif
+
     if get(w:, 'syntastic_loclist_set', 0)
         call SyntasticLoclistHide()
     endif
@@ -296,17 +323,23 @@ function! s:UpdateErrors(auto_invoked, checker_names) abort " {{{2
     call syntastic#log#debugDump(g:_SYNTASTIC_DEBUG_VARIABLES)
     call syntastic#log#debug(g:_SYNTASTIC_DEBUG_TRACE, 'UpdateErrors' . (a:auto_invoked ? ' (auto)' : '') .
         \ ': ' . (len(a:checker_names) ? join(a:checker_names) : 'default checkers'))
+
+    call s:modemap.synch()
+
     if s:_skip_file()
         return
     endif
 
-    call s:modemap.synch()
     let run_checks = !a:auto_invoked || s:modemap.doAutoChecking()
     if run_checks
         call s:CacheErrors(a:checker_names)
         unlockvar! b:syntastic_changedtick
         let b:syntastic_changedtick = b:changedtick
         lockvar! b:syntastic_changedtick
+    else
+        if a:auto_invoked
+            return
+        endif
     endif
 
     let loclist = g:SyntasticLoclist.current()
@@ -610,12 +643,26 @@ function! s:_ignore_file(filename) abort " {{{2
     return 0
 endfunction " }}}2
 
+function! s:_is_quitting(buf) abort " {{{2
+    let quitting = 0
+    if exists('w:syntastic_wid')
+        let key = a:buf . '_' . getbufvar(a:buf, 'changetick') . '_' . w:syntastic_wid
+        let idx = index(s:_quit_pre, key)
+        if idx >= 0
+            call remove(s:_quit_pre, idx)
+            let quitting = 1
+        endif
+    endif
+
+    return quitting
+endfunction " }}}2
+
 " Skip running in special buffers
 function! s:_skip_file() abort " {{{2
     let fname = expand('%', 1)
-    let skip = get(b:, 'syntastic_skip_checks', 0) || (&buftype !=# '') ||
+    let skip = s:_is_quitting(bufnr('%')) || get(b:, 'syntastic_skip_checks', 0) ||
-        \ !filereadable(fname) || getwinvar(0, '&diff') || s:_ignore_file(fname) ||
+        \ (&buftype !=# '') || !filereadable(fname) || getwinvar(0, '&diff') ||
-        \ fnamemodify(fname, ':e') =~? g:syntastic_ignore_extensions
+        \ s:_ignore_file(fname) || fnamemodify(fname, ':e') =~? g:syntastic_ignore_extensions
     if skip
         call syntastic#log#debug(g:_SYNTASTIC_DEBUG_TRACE, '_skip_file: skipping checks')
     endif
@@ -628,6 +675,9 @@ function! s:_explain_skip(filetypes) abort " {{{2
         let why = []
         let fname = expand('%', 1)
 
+        if s:_is_quitting(bufnr('%'))
+            call add(why, 'quitting buffer')
+        endif
         if get(b:, 'syntastic_skip_checks', 0)
             call add(why, 'b:syntastic_skip_checks set')
         endif

sources_non_forked/syntastic/plugin/syntastic/checker.vim

@@ -7,26 +7,36 @@ let g:SyntasticChecker = {}
 
 " Public methods {{{1
 
-function! g:SyntasticChecker.New(args) abort " {{{2
+function! g:SyntasticChecker.New(args, ...) abort " {{{2
     let newObj = copy(self)
 
     let newObj._filetype = a:args['filetype']
     let newObj._name = a:args['name']
-    let newObj._exec = get(a:args, 'exec', newObj._name)
 
-    if has_key(a:args, 'redirect')
+    if a:0
-        let [filetype, name] = split(a:args['redirect'], '/')
+        " redirected checker
+        let newObj._exec = get(a:args, 'exec', a:1['_exec'])
+
+        let filetype = a:1['_filetype']
+        let name = a:1['_name']
         let prefix = 'SyntaxCheckers_' . filetype . '_' . name . '_'
 
         if exists('g:syntastic_' . filetype . '_' . name . '_sort') && !exists('g:syntastic_' . newObj._filetype . '_' . newObj._name . '_sort')
             let g:syntastic_{newObj._filetype}_{newObj._name}_sort = g:syntastic_{filetype}_{name}_sort
         endif
-    else
-        let prefix = 'SyntaxCheckers_' . newObj._filetype . '_' . newObj._name . '_'
-    endif
 
         if has_key(a:args, 'enable')
             let newObj._enable = a:args['enable']
+        elseif has_key(a:1, '_enable')
+            let newObj._enable = a:1['_enable']
+        endif
+    else
+        let newObj._exec = get(a:args, 'exec', newObj._name)
+        let prefix = 'SyntaxCheckers_' . newObj._filetype . '_' . newObj._name . '_'
+
+        if has_key(a:args, 'enable')
+            let newObj._enable = a:args['enable']
+        endif
     endif
 
     let newObj._locListFunc = function(prefix . 'GetLocList')
@@ -85,6 +95,11 @@ function! g:SyntasticChecker.getLocListRaw() abort " {{{2
 
     if has_key(self, '_enable')
         let status = syntastic#util#var(self._enable, -1)
+        if type(status) != type(0)
+            call syntastic#log#error('checker ' . name . ': invalid value ' . strtrans(string(status)) .
+                \ ' for g:syntastic_' . self._enable . '; try 0 or 1 instead')
+            return []
+        endif
         if status < 0
             call syntastic#log#error('checker ' . name . ': checks disabled for security reasons; ' .
                 \ 'set g:syntastic_' . self._enable . ' to 1 to override')

sources_non_forked/syntastic/plugin/syntastic/loclist.vim

@@ -110,19 +110,21 @@ function! g:SyntasticLoclist.getStatuslineFlag() abort " {{{2
             "hide stuff wrapped in %B(...) unless there are both errors and warnings
             let output = substitute(output, '\m\C%B{\([^}]*\)}', (num_warnings && num_errors) ? '\1' : '' , 'g')
 
-            "sub in the total errors/warnings/both
+            let flags = {
-            let output = substitute(output, '\m\C%w', num_warnings, 'g')
+                \ '%':  '%',
-            let output = substitute(output, '\m\C%e', num_errors, 'g')
+                \ 't':  num_issues,
-            let output = substitute(output, '\m\C%t', num_issues, 'g')
+                \ 'e':  num_errors,
-
+                \ 'w':  num_warnings,
-            "first error/warning line num
+                \ 'N':  (num_issues ? fnamemodify( bufname(self._rawLoclist[0]['bufnr']), ':t') : ''),
-            let output = substitute(output, '\m\C%F', num_issues ? self._rawLoclist[0]['lnum'] : '', 'g')
+                \ 'P':  (num_issues ? fnamemodify( bufname(self._rawLoclist[0]['bufnr']), ':p:~:.') : ''),
-
+                \ 'F':  (num_issues ? self._rawLoclist[0]['lnum'] : ''),
-            "first error line num
+                \ 'ne': (num_errors ? fnamemodify( bufname(errors[0]['bufnr']), ':t') : ''),
-            let output = substitute(output, '\m\C%fe', num_errors ? errors[0]['lnum'] : '', 'g')
+                \ 'pe': (num_errors ? fnamemodify( bufname(errors[0]['bufnr']), ':p:~:.') : ''),
-
+                \ 'fe': (num_errors ? errors[0]['lnum'] : ''),
-            "first warning line num
+                \ 'nw': (num_warnings ? fnamemodify( bufname(warnings[0]['bufnr']), ':t') : ''),
-            let output = substitute(output, '\m\C%fw', num_warnings ? warnings[0]['lnum'] : '', 'g')
+                \ 'pw': (num_warnings ? fnamemodify( bufname(warnings[0]['bufnr']), ':p:~:.') : ''),
+                \ 'fw': (num_warnings ? warnings[0]['lnum'] : '') }
+            let output = substitute(output, '\v\C\%(-?\d*%(\.\d+)?)([npf][ew]|[NPFtew%])', '\=syntastic#util#wformat(submatch(1), flags[submatch(2)])', 'g')
 
             let self._stl_flag = output
         else

sources_non_forked/syntastic/plugin/syntastic/registry.vim

@@ -8,7 +8,8 @@ let g:loaded_syntastic_registry = 1
 let s:_DEFAULT_CHECKERS = {
         \ 'actionscript':  ['mxmlc'],
         \ 'ada':           ['gcc'],
-        \ 'apiblueprint':  ['snowcrash'],
+        \ 'ansible':       ['ansible_lint'],
+        \ 'apiblueprint':  ['drafter'],
         \ 'applescript':   ['osacompile'],
         \ 'asciidoc':      ['asciidoc'],
         \ 'asm':           ['gcc'],
@@ -29,6 +30,7 @@ let s:_DEFAULT_CHECKERS = {
         \ 'd':             ['dmd'],
         \ 'dart':          ['dartanalyzer'],
         \ 'docbk':         ['xmllint'],
+        \ 'dockerfile':    ['dockerfile_lint'],
         \ 'dustjs':        ['swiffer'],
         \ 'elixir':        [],
         \ 'erlang':        ['escript'],
@@ -42,6 +44,7 @@ let s:_DEFAULT_CHECKERS = {
         \ 'haxe':          ['haxe'],
         \ 'hss':           ['hss'],
         \ 'html':          ['tidy'],
+        \ 'jade':          ['jade_lint'],
         \ 'java':          ['javac'],
         \ 'javascript':    ['jshint', 'jslint'],
         \ 'json':          ['jsonlint', 'jsonval'],
@@ -66,7 +69,9 @@ let s:_DEFAULT_CHECKERS = {
         \ 'pod':           ['podchecker'],
         \ 'puppet':        ['puppet', 'puppetlint'],
         \ 'python':        ['python', 'flake8', 'pylint'],
+        \ 'qml':           ['qmllint'],
         \ 'r':             [],
+        \ 'rmd':           [],
         \ 'racket':        ['racket'],
         \ 'rnc':           ['rnv'],
         \ 'rst':           ['rst2pseudoxml'],
@@ -78,6 +83,8 @@ let s:_DEFAULT_CHECKERS = {
         \ 'slim':          ['slimrb'],
         \ 'sml':           ['smlnj'],
         \ 'spec':          ['rpmlint'],
+        \ 'sql':           ['sqlint'],
+        \ 'stylus':        ['stylint'],
         \ 'tcl':           ['nagelfar'],
         \ 'tex':           ['lacheck', 'chktex'],
         \ 'texinfo':       ['makeinfo'],
@@ -91,6 +98,7 @@ let s:_DEFAULT_CHECKERS = {
         \ 'xhtml':         ['tidy'],
         \ 'xml':           ['xmllint'],
         \ 'xslt':          ['xmllint'],
+        \ 'xquery':        ['basex'],
         \ 'yacc':          ['bison'],
         \ 'yaml':          ['jsyaml'],
         \ 'z80':           ['z80syntaxchecker'],
@@ -151,8 +159,21 @@ function! g:SyntasticRegistry.Instance() abort " {{{2
 endfunction " }}}2
 
 function! g:SyntasticRegistry.CreateAndRegisterChecker(args) abort " {{{2
-    let checker = g:SyntasticChecker.New(a:args)
     let registry = g:SyntasticRegistry.Instance()
+
+    if has_key(a:args, 'redirect')
+        let [ft, name] = split(a:args['redirect'], '/')
+        call registry._loadCheckersFor(ft)
+
+        let clone = get(registry._checkerMap[ft], name, {})
+        if empty(clone)
+            throw 'Syntastic: Checker ' . a:args['redirect'] . ' redirects to unregistered checker ' . ft . '/' . name
+        endif
+
+        let checker = g:SyntasticChecker.New(a:args, clone)
+    else
+        let checker = g:SyntasticChecker.New(a:args)
+    endif
     call registry._registerChecker(checker)
 endfunction " }}}2
 
@@ -187,7 +208,7 @@ function! g:SyntasticRegistry.getCheckersAvailable(ftalias, hints_list) abort "
     return filter(self.getCheckers(a:ftalias, a:hints_list), 'v:val.isAvailable()')
 endfunction " }}}2
 
-" Same as getCheckers(), but keep only the checkers tyhat are available and
+" Same as getCheckers(), but keep only the checkers that are available and
 " disabled.  This runs the corresponding IsAvailable() functions for all checkers.
 function! g:SyntasticRegistry.getCheckersDisabled(ftalias, hints_list) abort " {{{2
     return filter(self.getCheckers(a:ftalias, a:hints_list), 'v:val.isDisabled() && v:val.isAvailable()')

sources_non_forked/syntastic/syntax_checkers/ansible/ansible_lint.vim

@@ -0,0 +1,52 @@
+"============================================================================
+"File:        ansible_lint.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Erik Zaadi <erik.zaadi 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_ansible_ansible_lint_checker')
+    finish
+endif
+let g:loaded_syntastic_ansible_ansible_lint_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_ansible_ansible_lint_IsAvailable() dict
+    if !executable(self.getExec())
+        return 0
+    endif
+    return syntastic#util#versionIsAtLeast(self.getVersion(), [2, 0, 4])
+endfunction
+
+function! SyntaxCheckers_ansible_ansible_lint_GetLocList() dict
+    let makeprg = self.makeprgBuild({ 'args_after': '-p' })
+
+    let errorformat = '%f:%l: [ANSIBLE%n] %m'
+
+    let env = syntastic#util#isRunningWindows() ? {} : { 'TERM': 'dumb' }
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'env': env,
+        \ 'defaults': {'type': 'E'},
+        \ 'subtype': 'Style',
+        \ 'returns': [0, 2] })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'ansible',
+    \ 'name': 'ansible_lint',
+    \ 'exec': 'ansible-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/apiblueprint/drafter.vim

@@ -1,5 +1,5 @@
 "============================================================================
-"File:        snowcrash.vim
+"File:        drafter.vim
 "Description: Syntax checking plugin for syntastic.vim
 "Maintainer:  LCD 47 <lcd047 at gmail dot com>
 "License:     This program is free software. It comes without any warranty,
@@ -10,19 +10,19 @@
 "
 "============================================================================
 
-if exists('g:loaded_syntastic_apiblueprint_snowcrash_checker')
+if exists('g:loaded_syntastic_apiblueprint_drafter_checker')
     finish
 endif
-let g:loaded_syntastic_apiblueprint_snowcrash_checker = 1
+let g:loaded_syntastic_apiblueprint_drafter_checker = 1
 
-if !exists('g:syntastic_apiblueprint_snowcrash_sort')
+if !exists('g:syntastic_apiblueprint_drafter_sort')
-    let g:syntastic_apiblueprint_snowcrash_sort = 1
+    let g:syntastic_apiblueprint_drafter_sort = 1
 endif
 
 let s:save_cpo = &cpo
 set cpo&vim
 
-function! SyntaxCheckers_apiblueprint_snowcrash_GetLocList() dict
+function! SyntaxCheckers_apiblueprint_drafter_GetLocList() dict
     let makeprg = self.makeprgBuild({ 'post_args': '-u -l' })
 
     let errorformat =
@@ -34,7 +34,7 @@ function! SyntaxCheckers_apiblueprint_snowcrash_GetLocList() dict
         \ 'makeprg': makeprg,
         \ 'errorformat': errorformat,
         \ 'defaults': {'bufnr': bufnr('')},
-        \ 'returns': [0, 2] })
+        \ 'returns': [0, 2, 3, 4] })
 
     for e in loclist
         let matches = matchlist(e['text'], '\v^(.+); line (\d+), column (\d+) - line (\d+), column (\d+)$')
@@ -58,7 +58,7 @@ endfunction
 
 call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'filetype': 'apiblueprint',
-    \ 'name': 'snowcrash'})
+    \ 'name': 'drafter'})
 
 let &cpo = s:save_cpo
 unlet s:save_cpo

sources_non_forked/syntastic/syntax_checkers/asm/gcc.vim

@@ -19,6 +19,10 @@ if !exists('g:syntastic_asm_compiler_options')
     let g:syntastic_asm_compiler_options = ''
 endif
 
+if !exists('g:syntastic_asm_generic')
+    let g:syntastic_asm_generic = 0
+endif
+
 let s:save_cpo = &cpo
 set cpo&vim
 
@@ -36,14 +40,13 @@ function! SyntaxCheckers_asm_gcc_GetLocList() dict " {{{1
         \     '%f:%l:%c: %trror: %m,' .
         \     '%f:%l:%c: %tarning: %m,' .
         \     '%f:%l: %m',
-        \ 'main_flags': '-x assembler -fsyntax-only -masm=' . s:GetDialect() })
+        \ 'main_flags': '-x assembler -fsyntax-only' . (g:syntastic_asm_generic ? '' : ' -masm=' . s:GetDialect()) })
 endfunction " }}}1
 
 " Utilities {{{1
 
 function! s:GetDialect() " {{{2
-    return exists('g:syntastic_asm_dialect') ? g:syntastic_asm_dialect :
+    return syntastic#util#var('asm_dialect', expand('%:e', 1) ==? 'asm' ? 'intel' : 'att')
-        \ expand('%:e', 1) ==? 'asm' ? 'intel' : 'att'
 endfunction " }}}2
 
 " }}}1

sources_non_forked/syntastic/syntax_checkers/bro/bro.vim

@@ -40,14 +40,12 @@ function! SyntaxCheckers_bro_bro_GetLocList() dict
     let makeprg = self.makeprgBuild({ 'args_before': '--parse-only' })
 
     "example: error in ./foo.bro, line 3: unknown identifier banana, at or near "banana"
-    let errorformat =
+    let errorformat = '%t:%f:%l:%m'
-        \ 'fatal %trror in %f\, line %l: %m,' .
-        \ '%trror in %f\, line %l: %m,' .
-        \ '%tarning in %f\, line %l: %m'
 
     return SyntasticMake({
         \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat })
+        \ 'errorformat': errorformat,
+        \ 'preprocess': 'bro' })
 endfunction
 
 call g:SyntasticRegistry.CreateAndRegisterChecker({

sources_non_forked/syntastic/syntax_checkers/c/clang_check.vim

@@ -43,9 +43,12 @@ function! SyntaxCheckers_c_clang_check_GetLocList() dict
         \ '%-G%\m%\%%(LLVM ERROR:%\|No compilation database found%\)%\@!%.%#,' .
         \ '%E%m'
 
+    let env = syntastic#util#isRunningWindows() ? {} : { 'TERM': 'dumb' }
+
     return SyntasticMake({
         \ 'makeprg': makeprg,
         \ 'errorformat': errorformat,
+        \ 'env': env,
         \ 'defaults': {'bufnr': bufnr('')},
         \ 'returns': [0, 1] })
 endfunction

sources_non_forked/syntastic/syntax_checkers/c/clang_tidy.vim

@@ -43,9 +43,12 @@ function! SyntaxCheckers_c_clang_tidy_GetLocList() dict
         \ '%-G%\m%\%%(LLVM ERROR:%\|No compilation database found%\)%\@!%.%#,' .
         \ '%E%m'
 
+    let env = syntastic#util#isRunningWindows() ? {} : { 'TERM': 'dumb' }
+
     return SyntasticMake({
         \ 'makeprg': makeprg,
         \ 'errorformat': errorformat,
+        \ 'env': env,
         \ 'defaults': {'bufnr': bufnr('')},
         \ 'returns': [0, 1] })
 endfunction

sources_non_forked/syntastic/syntax_checkers/coffee/coffeelint.vim

@@ -24,17 +24,14 @@ function! SyntaxCheckers_coffee_coffeelint_GetLocList() dict
     endif
     let makeprg = self.makeprgBuild({ 'args_after': (s:coffeelint_new ? '--reporter csv' : '--csv') })
 
-    let errorformat =
+    let errorformat = '%f:%l:%t:%m'
-        \ '%f\,%l\,%\d%#\,%trror\,%m,' .
-        \ '%f\,%l\,%trror\,%m,' .
-        \ '%f\,%l\,%\d%#\,%tarn\,%m,' .
-        \ '%f\,%l\,%tarn\,%m'
 
     return SyntasticMake({
         \ 'makeprg': makeprg,
         \ 'errorformat': errorformat,
         \ 'subtype': 'Style',
-        \ 'returns': [0, 1] })
+        \ 'returns': [0, 1],
+        \ 'preprocess': 'coffeelint' })
 endfunction
 
 call g:SyntasticRegistry.CreateAndRegisterChecker({

sources_non_forked/syntastic/syntax_checkers/coq/coqtop.vim

@@ -22,7 +22,7 @@ function! SyntaxCheckers_coq_coqtop_GetLocList() dict
     let makeprg = self.makeprgBuild({ 'args_after': '-noglob -batch -load-vernac-source' })
 
     let errorformat =
-        \ '%AFile \"%f\"\, line %l\, characters %c\-%.%#\:,'.
+        \ '%AFile "%f"\, line %l\, characters %c-%.%#\:,'.
         \ '%C%m'
 
     return SyntasticMake({

sources_non_forked/syntastic/syntax_checkers/cpp/clang_check.vim

@@ -14,8 +14,6 @@ if exists('g:loaded_syntastic_cpp_clang_check_checker')
 endif
 let g:loaded_syntastic_cpp_clang_check_checker = 1
 
-runtime! syntax_checkers/c/*.vim
-
 call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'filetype': 'cpp',
     \ 'name': 'clang_check',

sources_non_forked/syntastic/syntax_checkers/cpp/clang_tidy.vim

@@ -14,8 +14,6 @@ if exists('g:loaded_syntastic_cpp_clang_tidy_checker')
 endif
 let g:loaded_syntastic_cpp_clang_tidy_checker = 1
 
-runtime! syntax_checkers/c/*.vim
-
 call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'filetype': 'cpp',
     \ 'name': 'clang_tidy',

sources_non_forked/syntastic/syntax_checkers/cpp/cppcheck.vim

@@ -14,8 +14,6 @@ if exists('g:loaded_syntastic_cpp_cppcheck_checker')
 endif
 let g:loaded_syntastic_cpp_cppcheck_checker = 1
 
-runtime! syntax_checkers/c/*.vim
-
 call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'filetype': 'cpp',
     \ 'name': 'cppcheck',

sources_non_forked/syntastic/syntax_checkers/cpp/oclint.vim

@@ -14,8 +14,6 @@ if exists('g:loaded_syntastic_cpp_oclint_checker')
 endif
 let g:loaded_syntastic_cpp_oclint_checker = 1
 
-runtime! syntax_checkers/c/*.vim
-
 call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'filetype': 'cpp',
     \ 'name': 'oclint',

sources_non_forked/syntastic/syntax_checkers/cpp/pc_lint.vim

@@ -15,8 +15,6 @@ if exists('g:loaded_syntastic_cpp_pc_lint_checker')
 endif
 let g:loaded_syntastic_cpp_pc_lint_checker = 1
 
-runtime! syntax_checkers/c/*.vim
-
 call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'filetype': 'cpp',
     \ 'name': 'pc_lint',

sources_non_forked/syntastic/syntax_checkers/css/phpcs.vim

@@ -15,8 +15,6 @@ if exists('g:loaded_syntastic_css_phpcs_checker')
 endif
 let g:loaded_syntastic_css_phpcs_checker = 1
 
-runtime! syntax_checkers/php/*.vim
-
 call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'filetype': 'css',
     \ 'name': 'phpcs',

sources_non_forked/syntastic/syntax_checkers/css/recess.vim

@@ -16,8 +16,6 @@ if exists('g:loaded_syntastic_css_recess_checker')
 endif
 let g:loaded_syntastic_css_recess_checker = 1
 
-runtime! syntax_checkers/less/*.vim
-
 call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'filetype': 'css',
     \ 'name': 'recess',

sources_non_forked/syntastic/syntax_checkers/css/stylelint.vim

@@ -0,0 +1,43 @@
+"============================================================================
+"File:        stylelint.vim
+"Description: Syntax checking plugin for syntastic.vim using `stylelint`
+"             (https://github.com/stylelint/stylelint).
+"Maintainer:  Tim Carry <tim at pixelastic 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_css_stylelint_checker')
+    finish
+endif
+let g:loaded_syntastic_css_stylelint_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_css_stylelint_GetLocList() dict
+    let makeprg = self.makeprgBuild({ 'args_after': '-f json' })
+
+    let errorformat = '%t:%f:%l:%c:%m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'subtype': 'Style',
+        \ 'preprocess': 'stylelint',
+        \ 'returns': [0, 1, 2] })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'css',
+    \ 'name': 'stylelint'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
+

sources_non_forked/syntastic/syntax_checkers/docbk/xmllint.vim

@@ -15,8 +15,6 @@ if exists('g:loaded_syntastic_docbk_xmllint_checker')
 endif
 let g:loaded_syntastic_docbk_xmllint_checker = 1
 
-runtime! syntax_checkers/xml/*.vim
-
 call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'filetype': 'docbk',
     \ 'name': 'xmllint',

sources_non_forked/syntastic/syntax_checkers/dockerfile/dockerfile_lint.vim

@@ -0,0 +1,53 @@
+"============================================================================
+"File:        dockerfile_lint.vim
+"Description: Syntax checking plugin for syntastic.vim using dockerfile-lint
+"             (https://github.com/projectatomic/dockerfile-lint).
+"Maintainer:  Tim Carry <tim at pixelastic 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_dockerfile_dockerfile_lint_checker')
+    finish
+endif
+let g:loaded_syntastic_dockerfile_dockerfile_lint_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_dockerfile_dockerfile_lint_GetLocList() dict
+    let makeprg = self.makeprgBuild({
+        \ 'args_after': '-j',
+        \ 'fname_before': '-f' })
+
+    let errorformat = '%t:%n:%l:%m'
+
+    let loclist = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'preprocess': 'dockerfile_lint',
+        \ 'defaults': {'bufnr': bufnr('')},
+        \ 'returns': [0, 1] })
+
+    for e in loclist
+        if e['nr']
+            let e['subtype'] = 'Style'
+        endif
+        call remove(e, 'nr')
+    endfor
+
+    return loclist
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'dockerfile',
+    \ 'name': 'dockerfile_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/go/go.vim

@@ -27,6 +27,10 @@ function! SyntaxCheckers_go_go_IsAvailable() dict
 endfunction
 
 function! SyntaxCheckers_go_go_GetLocList() dict
+    if !exists('s:go_new')
+        let s:go_new = syntastic#util#versionIsAtLeast(self.getVersion(self.getExecEscaped() . ' version'), [1, 5])
+    endif
+
     " Check with gofmt first, since `go build` and `go test` might not report
     " syntax errors in the current file if another file with syntax error is
     " compiled first.
@@ -51,15 +55,15 @@ function! SyntaxCheckers_go_go_GetLocList() dict
     " compiled by `go build`, therefore `go test` must be called for those.
     if match(expand('%', 1), '\m_test\.go$') == -1
         let cmd = 'build'
-        let opts = syntastic#util#var('go_go_build_args')
+        let opts = syntastic#util#var('go_go_build_args', s:go_new ? '-buildmode=archive' : '')
         let cleanup = 0
     else
         let cmd = 'test -c'
-        let opts = syntastic#util#var('go_go_test_args')
+        let opts = syntastic#util#var('go_go_test_args', s:go_new ? '-buildmode=archive' : '')
         let cleanup = 1
     endif
     let opt_str = (type(opts) != type('') || opts !=# '') ? join(syntastic#util#argsescape(opts)) : opts
-    let makeprg = self.getExec() . ' ' . cmd . ' ' . opt_str
+    let makeprg = self.getExecEscaped() . ' ' . cmd . ' ' . opt_str
 
     " The first pattern is for warnings from C compilers.
     let errorformat =
@@ -67,6 +71,8 @@ function! SyntaxCheckers_go_go_GetLocList() dict
         \ '%E%f:%l:%c:%m,' .
         \ '%E%f:%l:%m,' .
         \ '%C%\s%\+%m,' .
+        \ '%+Ecan''t load package: %m,' .
+        \ '%+Einternal error: %m,' .
         \ '%-G#%.%#'
 
     " The go compiler needs to either be run with an import path as an
@@ -77,6 +83,7 @@ function! SyntaxCheckers_go_go_GetLocList() dict
         \ 'makeprg': makeprg,
         \ 'errorformat': errorformat,
         \ 'cwd': expand('%:p:h', 1),
+        \ 'env': {'GOGC': 'off'},
         \ 'defaults': {'type': 'e'} })
 
     if cleanup

sources_non_forked/syntastic/syntax_checkers/go/gometalinter.vim

@@ -0,0 +1,53 @@
+"============================================================================
+"File:        gometalinter.vim
+"Description: Check go syntax using 'gometalint'
+"Maintainer:  Joshua Rubin <joshua@rubixconsulting.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_go_gometalinter_checker')
+    finish
+endif
+let g:loaded_syntastic_go_gometalinter_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_go_gometalinter_GetLocList() dict
+    let makeprg = self.makeprgBuild({
+        \ 'args': '-t',
+        \ 'fname': syntastic#util#shexpand('%:p:h') })
+
+    let errorformat =
+        \ '%f:%l:%c:%trror: %m,' .
+        \ '%f:%l:%c:%tarning: %m,' .
+        \ '%f:%l::%trror: %m,' .
+        \ '%f:%l::%tarning: %m'
+
+    let loclist = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'returns': [0, 1] })
+
+    for e in loclist
+        if e['text'] =~# '\v\(%(deadcode|gocyclo|golint|defercheck|varcheck|structcheck|errcheck|dupl)\)$'
+            let e['subtype'] = 'Style'
+        endif
+    endfor
+
+    return loclist
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'go',
+    \ 'name': 'gometalinter'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:

sources_non_forked/syntastic/syntax_checkers/go/gotype.vim

@@ -19,7 +19,9 @@ let s:save_cpo = &cpo
 set cpo&vim
 
 function! SyntaxCheckers_go_gotype_GetLocList() dict
-    let makeprg = self.getExecEscaped() . ' .'
+    let makeprg = self.makeprgBuild({
+        \ 'args': (expand('%', 1) =~# '\m_test\.go$' ? '-a' : ''),
+        \ 'fname': '.' })
 
     let errorformat =
         \ '%f:%l:%c: %m,' .

sources_non_forked/syntastic/syntax_checkers/go/govet.vim

@@ -23,7 +23,7 @@ function! SyntaxCheckers_go_govet_IsAvailable() dict
 endfunction
 
 function! SyntaxCheckers_go_govet_GetLocList() dict
-    let makeprg = self.getExec() . ' vet'
+    let makeprg = self.getExecEscaped() . ' vet'
 
     let errorformat =
         \ '%Evet: %.%\+: %f:%l:%c: %m,' .

sources_non_forked/syntastic/syntax_checkers/haskell/ghc-mod.vim

@@ -51,7 +51,14 @@ function! SyntaxCheckers_haskell_ghc_mod_IsAvailable() dict
         let s:ghc_mod_new = -1
     endif
 
-    return (s:ghc_mod_new >= 0) && (v:version >= 704 || s:ghc_mod_new)
+    " ghc-mod 5.4.0 wants to run in the root directory of the project;
+    " syntastic can't cope with the resulting complications
+    "
+    " References:
+    " https://hackage.haskell.org/package/ghc-mod-5.4.0.0/changelog
+    let s:ghc_mod_bailout = syntastic#util#versionIsAtLeast(parsed_ver, [5, 4])
+
+    return (s:ghc_mod_new >= 0) && (v:version >= 704 || s:ghc_mod_new) && !s:ghc_mod_bailout
 endfunction
 
 function! SyntaxCheckers_haskell_ghc_mod_GetLocList() dict

sources_non_forked/syntastic/syntax_checkers/haskell/hlint.vim

@@ -18,6 +18,7 @@ function! SyntaxCheckers_haskell_hlint_GetLocList() dict
         \ 'fname': syntastic#util#shexpand('%:p')})
 
     let errorformat =
+        \ '%E%f:%l:%v: Error while reading hint file\, %m,' .
         \ '%E%f:%l:%v: Error: %m,' .
         \ '%W%f:%l:%v: Warning: %m,' .
         \ '%C%m'

sources_non_forked/syntastic/syntax_checkers/jade/jade_lint.vim

@@ -0,0 +1,40 @@
+"============================================================================
+"File:        jade_lint.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Ben Parnell <benjaminparnell.94@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_jade_jade_lint_checker')
+    finish
+endif
+let g:loaded_syntastic_jade_jade_lint_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_jade_jade_lint_GetLocList() dict
+    let makeprg = self.makeprgBuild({ 'args_after': '-r inline' })
+
+    let errorformat = '%f:%l:%c %m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'returns': [0, 2] })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'jade',
+    \ 'name': 'jade_lint',
+    \ 'exec': 'jade-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/java/checkstyle.vim

@@ -17,7 +17,7 @@ endif
 let g:loaded_syntastic_java_checkstyle_checker = 1
 
 if !exists('g:syntastic_java_checkstyle_classpath')
-    let g:syntastic_java_checkstyle_classpath = 'checkstyle-5.5-all.jar'
+    let g:syntastic_java_checkstyle_classpath = 'checkstyle-6.10.1-all.jar'
 endif
 
 if !exists('g:syntastic_java_checkstyle_conf_file')
@@ -32,30 +32,38 @@ function! SyntaxCheckers_java_checkstyle_IsAvailable() dict
         return 0
     endif
 
-    let classpath = expand(g:syntastic_java_checkstyle_classpath, 1)
     let conf_file = expand(g:syntastic_java_checkstyle_conf_file, 1)
-    call self.log(
+    call self.log('filereadable(' . string(conf_file) . ') = ' . filereadable(conf_file))
-        \ 'filereadable(' . string(classpath) . ') = ' . filereadable(classpath) . ', ' .
-        \ 'filereadable(' . string(conf_file) . ') = ' . filereadable(conf_file))
 
-    return filereadable(classpath) && filereadable(conf_file)
+    return filereadable(conf_file)
 endfunction
 
 function! SyntaxCheckers_java_checkstyle_GetLocList() dict
 
-    let fname = syntastic#util#shescape( expand('%:p:h', 1) . syntastic#util#Slash() . expand('%:t', 1) )
+    " classpath
+    if !exists('s:sep')
+        let s:sep = syntastic#util#isRunningWindows() || has('win32unix') ? ';' : ':'
+    endif
+    let classpath = join(map( split(g:syntastic_java_checkstyle_classpath, s:sep, 1), 'expand(v:val, 1)' ), s:sep)
+    call self.log('classpath =', classpath)
 
+    " forced options
+    let opts = []
+    if classpath !=# ''
+        call extend(opts, ['-cp', classpath])
+    endif
+    call extend(opts, [
+        \ 'com.puppycrawl.tools.checkstyle.Main',
+        \ '-c', expand(g:syntastic_java_checkstyle_conf_file, 1),
+        \ '-f', 'xml' ])
+
+    " filename
+    let fname = syntastic#util#shescape( expand('%:p:h', 1) . syntastic#util#Slash() . expand('%:t', 1) )
     if has('win32unix')
         let fname = substitute(syntastic#util#system('cygpath -m ' . fname), '\m\%x00', '', 'g')
     endif
 
-    let makeprg = self.makeprgBuild({
+    let makeprg = self.makeprgBuild({ 'args_after': opts, 'fname': fname })
-        \ 'args_after': [
-        \       '-cp', expand(g:syntastic_java_checkstyle_classpath, 1),
-        \       'com.puppycrawl.tools.checkstyle.Main',
-        \       '-c', expand(g:syntastic_java_checkstyle_conf_file, 1),
-        \       '-f', 'xml'],
-        \ 'fname': fname })
 
     let errorformat = '%f:%t:%l:%c:%m'
 

sources_non_forked/syntastic/syntax_checkers/java/javac.vim

@@ -84,11 +84,12 @@ lockvar! s:_FILE_SHORTCUTS
 
 " }}}1
 
-command! SyntasticJavacEditClasspath call s:EditClasspath()
+" Commands {{{1
 
-if g:syntastic_java_javac_config_file_enabled
+command! SyntasticJavacEditClasspath call s:EditClasspath()
 command! SyntasticJavacEditConfig    call s:EditConfig()
-endif
+
+" }}}1
 
 function! SyntaxCheckers_java_javac_IsAvailable() dict " {{{1
     let s:has_maven = executable(expand(g:syntastic_java_maven_executable, 1))
@@ -173,9 +174,8 @@ function! SyntaxCheckers_java_javac_GetLocList() dict " {{{1
     let errorformat =
         \ '%E%f:%l: error: %m,'.
         \ '%W%f:%l: warning: %m,'.
-        \ '%A%f:%l: %m,'.
+        \ '%E%f:%l: %m,'.
-        \ '%+Z%p^,'.
+        \ '%Z%p^,'.
-        \ '%+C%.%#,'.
         \ '%-G%.%#'
 
     if output_dir !=# ''
@@ -290,6 +290,10 @@ function! s:SaveConfig() " {{{2
 endfunction " }}}2
 
 function! s:EditConfig() " {{{2
+    if !g:syntastic_java_javac_config_file_enabled
+        return
+    endif
+
     let command = 'syntastic javac config'
     let winnr = bufwinnr('^' . command . '$')
     if winnr < 0
@@ -356,7 +360,7 @@ function! s:GetMavenClasspath() " {{{2
             let mvn_cmd = syntastic#util#shexpand(g:syntastic_java_maven_executable) .
                 \ ' -f ' . syntastic#util#shescape(pom) .
                 \ ' ' . g:syntastic_java_maven_options
-            let mvn_classpath_output = split(syntastic#util#system(mvn_cmd . ' dependency:build-classpath'), "\n")
+            let mvn_classpath_output = split(syntastic#util#system(mvn_cmd . ' dependency:build-classpath -DincludeScope=test'), "\n")
             let mvn_classpath = ''
             let class_path_next = 0
 
@@ -373,16 +377,10 @@ function! s:GetMavenClasspath() " {{{2
             let mvn_properties = s:GetMavenProperties()
 
             let sep = syntastic#util#Slash()
-            let output_dir = join(['target', 'classes'], sep)
+            let output_dir = get(mvn_properties, 'project.build.outputDirectory', join(['target', 'classes'], sep))
-            if has_key(mvn_properties, 'project.build.outputDirectory')
-                let output_dir = mvn_properties['project.build.outputDirectory']
-            endif
             let mvn_classpath = s:AddToClasspath(mvn_classpath, output_dir)
 
-            let test_output_dir = join(['target', 'test-classes'], sep)
+            let test_output_dir = get(mvn_properties, 'project.build.testOutputDirectory', join(['target', 'test-classes'], sep))
-            if has_key(mvn_properties, 'project.build.testOutputDirectory')
-                let test_output_dir = mvn_properties['project.build.testOutputDirectory']
-            endif
             let mvn_classpath = s:AddToClasspath(mvn_classpath, test_output_dir)
 
             let g:syntastic_java_javac_maven_pom_ftime[pom] = getftime(pom)
@@ -397,23 +395,16 @@ function! s:MavenOutputDirectory() " {{{2
     let pom = syntastic#util#findFileInParent('pom.xml', expand('%:p:h', 1))
     if s:has_maven && filereadable(pom)
         let mvn_properties = s:GetMavenProperties()
-        let output_dir = getcwd()
+        let output_dir = get(mvn_properties, 'project.properties.build.dir', getcwd())
-        if has_key(mvn_properties, 'project.properties.build.dir')
-            let output_dir = mvn_properties['project.properties.build.dir']
-        endif
 
         let sep = syntastic#util#Slash()
-        if stridx(expand('%:p:h', 1), join(['src', 'main', 'java'], sep)) >= 0
+        let src_main_dir = get(mvn_properties, 'project.build.sourceDirectory', join(['src', 'main', 'java'], sep))
-            let output_dir = join ([output_dir, 'target', 'classes'], sep)
+        let src_test_dir = get(mvn_properties, 'project.build.testsourceDirectory', join(['src', 'test', 'java'], sep))
-            if has_key(mvn_properties, 'project.build.outputDirectory')
+        if stridx(expand('%:p:h', 1), src_main_dir) >= 0
-                let output_dir = mvn_properties['project.build.outputDirectory']
+            let output_dir = get(mvn_properties, 'project.build.outputDirectory', join ([output_dir, 'target', 'classes'], sep))
-            endif
-        endif
-        if stridx(expand('%:p:h', 1), join(['src', 'test', 'java'], sep)) >= 0
-            let output_dir = join([output_dir, 'target', 'test-classes'], sep)
-            if has_key(mvn_properties, 'project.build.testOutputDirectory')
-                let output_dir = mvn_properties['project.build.testOutputDirectory']
         endif
+        if stridx(expand('%:p:h', 1), src_test_dir) >= 0
+            let output_dir = get(mvn_properties, 'project.build.testOutputDirectory', join([output_dir, 'target', 'test-classes'], sep))
         endif
 
         if has('win32unix')

sources_non_forked/syntastic/syntax_checkers/javascript/eslint.vim

@@ -18,21 +18,31 @@ if !exists('g:syntastic_javascript_eslint_sort')
     let g:syntastic_javascript_eslint_sort = 1
 endif
 
+if !exists('g:syntastic_javascript_eslint_generic')
+    let g:syntastic_javascript_eslint_generic = 0
+endif
+
 let s:save_cpo = &cpo
 set cpo&vim
 
 function! SyntaxCheckers_javascript_eslint_IsAvailable() dict
+    if g:syntastic_javascript_eslint_generic
+        call self.log('generic eslint, exec =', self.getExec())
+    endif
+
     if !executable(self.getExec())
         return 0
     endif
-    return syntastic#util#versionIsAtLeast(self.getVersion(), [0, 1])
+    return g:syntastic_javascript_eslint_generic || syntastic#util#versionIsAtLeast(self.getVersion(), [0, 1])
 endfunction
 
 function! SyntaxCheckers_javascript_eslint_GetLocList() dict
+    if !g:syntastic_javascript_eslint_generic
         call syntastic#log#deprecationWarn('javascript_eslint_conf', 'javascript_eslint_args',
             \ "'--config ' . syntastic#util#shexpand(OLD_VAR)")
+    endif
 
-    let makeprg = self.makeprgBuild({ 'args_before': '-f compact' })
+    let makeprg = self.makeprgBuild({ 'args_before': (g:syntastic_javascript_eslint_generic ? '' : '-f compact') })
 
     let errorformat =
         \ '%E%f: line %l\, col %c\, Error - %m,' .
@@ -43,9 +53,17 @@ function! SyntaxCheckers_javascript_eslint_GetLocList() dict
         \ 'errorformat': errorformat,
         \ 'postprocess': ['guards'] })
 
+    if !g:syntastic_javascript_eslint_generic
+        if !exists('s:eslint_new')
+            let s:eslint_new = syntastic#util#versionIsAtLeast(self.getVersion(), [1])
+        endif
+
+        if !s:eslint_new
             for e in loclist
                 let e['col'] += 1
             endfor
+        endif
+    endif
 
     return loclist
 endfunction

sources_non_forked/syntastic/syntax_checkers/javascript/jsxhint.vim

@@ -18,6 +18,10 @@ let s:save_cpo = &cpo
 set cpo&vim
 
 function! SyntaxCheckers_javascript_jsxhint_IsAvailable() dict
+    if !executable(self.getExec())
+        return 0
+    endif
+
     let version_output = syntastic#util#system(self.getExecEscaped() . ' --version')
     let parsed_ver = !v:shell_error && (version_output =~# '\m^JSXHint\>') ? syntastic#util#parseVersion(version_output) : []
     if len(parsed_ver)

sources_non_forked/syntastic/syntax_checkers/javascript/standard.vim

@@ -14,14 +14,22 @@ if exists('g:loaded_syntastic_javascript_standard_checker')
 endif
 let g:loaded_syntastic_javascript_standard_checker = 1
 
+if !exists('g:syntastic_javascript_standard_generic')
+    let g:syntastic_javascript_standard_generic = 0
+endif
+
 let s:save_cpo = &cpo
 set cpo&vim
 
 function! SyntaxCheckers_javascript_standard_IsAvailable() dict
+    if g:syntastic_javascript_standard_generic
+        call self.log('generic standard, exec =', self.getExec())
+    endif
+
     if !executable(self.getExec())
         return 0
     endif
-    return syntastic#util#versionIsAtLeast(self.getVersion(), [2, 6, 1])
+    return g:syntastic_javascript_standard_generic || syntastic#util#versionIsAtLeast(self.getVersion(), [2, 6, 1])
 endfunction
 
 function! SyntaxCheckers_javascript_standard_GetLocList() dict

sources_non_forked/syntastic/syntax_checkers/nix/nix.vim

@@ -23,14 +23,15 @@ function! SyntaxCheckers_nix_nix_GetLocList() dict
     let makeprg = self.makeprgBuild({ 'args_after': '--parse-only' })
 
     let errorformat =
-        \ '%m\, at %f:%l:%c,' .
+        \ '%f:%l:%c:%m,' .
-        \ '%m at %f\, line %l:,' .
+        \ '%f:%l:%m,' .
-        \ 'error: %m\, in %f'
+        \ '%f:%m'
 
     return SyntasticMake({
         \ 'makeprg': makeprg,
         \ 'errorformat': errorformat,
-        \ 'defaults': {'type': 'e'} })
+        \ 'defaults': {'type': 'e'},
+        \ 'preprocess': 'nix' })
 endfunction
 
 call g:SyntasticRegistry.CreateAndRegisterChecker({

sources_non_forked/syntastic/syntax_checkers/nroff/igor.vim

@@ -15,8 +15,6 @@ if exists('g:loaded_syntastic_nroff_igor_checker')
 endif
 let g:loaded_syntastic_nroff_igor_checker = 1
 
-runtime! syntax_checkers/docbk/*.vim
-
 call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'filetype': 'nroff',
     \ 'name': 'igor',

sources_non_forked/syntastic/syntax_checkers/objc/oclint.vim

@@ -14,8 +14,6 @@ if exists('g:loaded_syntastic_objc_oclint_checker')
 endif
 let g:loaded_syntastic_objc_oclint_checker = 1
 
-runtime! syntax_checkers/c/*.vim
-
 call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'filetype': 'objc',
     \ 'name': 'oclint',

sources_non_forked/syntastic/syntax_checkers/objcpp/oclint.vim

@@ -14,8 +14,6 @@ if exists('g:loaded_syntastic_objcpp_oclint_checker')
 endif
 let g:loaded_syntastic_objcpp_oclint_checker = 1
 
-runtime! syntax_checkers/c/*.vim
-
 call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'filetype': 'objcpp',
     \ 'name': 'oclint',

sources_non_forked/syntastic/syntax_checkers/perl/podchecker.vim

@@ -15,8 +15,6 @@ if exists('g:loaded_syntastic_perl_podchecker_checker')
 endif
 let g:loaded_syntastic_perl_podchecker_checker = 1
 
-runtime! syntax_checkers/pod/*.vim
-
 call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'filetype': 'perl',
     \ 'name': 'podchecker',

sources_non_forked/syntastic/syntax_checkers/python/mypy.vim

@@ -16,13 +16,14 @@ set cpo&vim
 function! SyntaxCheckers_python_mypy_GetLocList() dict
     let makeprg = self.makeprgBuild({})
 
-    let errorformat = '%f\, line %l: %m'
+    let errorformat = '%f:%l:%m'
 
     return SyntasticMake({
         \ 'makeprg': makeprg,
         \ 'errorformat': errorformat,
         \ 'defaults': { 'type': 'E' },
-        \ 'returns': [0, 1] })
+        \ 'returns': [0, 1],
+        \ 'preprocess': 'mypy' })
 endfunction
 
 call g:SyntasticRegistry.CreateAndRegisterChecker({

sources_non_forked/syntastic/syntax_checkers/qml/qmllint.vim

@@ -0,0 +1,39 @@
+"============================================================================
+"File:        qmllint.vim
+"Description: Syntax checking plugin for syntastic.vim using qmllint
+"Maintainer:  Peter Wu <peter@lekensteyn.nl>
+"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_qml_qmllint_checker')
+    finish
+endif
+let g:loaded_syntastic_qml_qmllint_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_qml_qmllint_GetLocList() dict
+    let makeprg = self.makeprgBuild({})
+
+    let errorformat = '%f:%l : %m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'postprocess': ['guards'],
+        \ 'returns': [0, 255] })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'qml',
+    \ 'name': 'qmllint'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:

sources_non_forked/syntastic/syntax_checkers/r/lintr.vim

@@ -0,0 +1,81 @@
+"============================================================================
+"File:        lintr.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Jim Hester <james.f.hester 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.
+"
+"============================================================================
+"
+" Security:
+"
+" This checker runs the code in your file.  This is probably fine if you
+" wrote the file yourself, but it can be a problem if you're trying to
+" check third party files.  If you are 100% willing to let Vim run the
+" code in your file, set g:syntastic_enable_r_lintr_checker to 1 in
+" your vimrc to enable this checker:
+"
+" let g:syntastic_enable_r_lintr_checker = 1
+
+if exists("g:loaded_syntastic_r_lintr_checker")
+    finish
+endif
+let g:loaded_syntastic_r_lintr_checker = 1
+
+if !exists('g:syntastic_r_lintr_linters')
+    let g:syntastic_r_lintr_linters = 'default_linters'
+endif
+
+if !exists('g:syntastic_r_lintr_cache')
+    let g:syntastic_r_lintr_cache = 'FALSE'
+endif
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_r_lintr_GetHighlightRegex(item)
+    let term = matchstr(a:item['text'], "\\m'\\zs[^']\\+\\ze'")
+    return term != '' ? '\V' . escape(term, '\') : ''
+endfunction
+
+function! SyntaxCheckers_r_lintr_IsAvailable() dict
+    if !executable(self.getExec())
+        return 0
+    endif
+    call system(self.getExecEscaped() . ' --slave --no-restore --no-save -e ' . syntastic#util#shescape('library(lintr)'))
+    return v:shell_error == 0
+endfunction
+
+function! SyntaxCheckers_r_lintr_GetLocList() dict
+    let setwd = syntastic#util#isRunningWindows() ? 'setwd(''' . escape(getcwd(), '"\') . '''); ' : ''
+    let makeprg = self.getExecEscaped() . ' --slave --no-restore --no-save' .
+        \ ' -e ' . syntastic#util#shescape(setwd . 'suppressPackageStartupMessages(library(lintr)); ' .
+        \       'lint(cache = ' . g:syntastic_r_lintr_cache . ', commandArgs(TRUE), ' . g:syntastic_r_lintr_linters . ')') .
+        \ ' --args ' . syntastic#util#shexpand('%')
+
+    let errorformat =
+        \ '%W%f:%l:%c: style: %m,' .
+        \ '%W%f:%l:%c: warning: %m,' .
+        \ '%E%f:%l:%c: error: %m,'
+
+    call self.setWantSort(1)
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'returns': [0] })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'r',
+    \ 'name': 'lintr',
+    \ 'exec': 'R',
+    \ 'enable': 'enable_r_lintr_checker'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:

sources_non_forked/syntastic/syntax_checkers/rmd/lintr.vim

@@ -0,0 +1,23 @@
+"============================================================================
+"File:        lintr.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Jim Hester <james.f.hester 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_rmd_lintr_checker')
+    finish
+endif
+let g:loaded_syntastic_rmd_lintr_checker = 1
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'rmd',
+    \ 'name': 'lintr',
+    \ 'redirect': 'r/lintr'})
+
+" vim: set sw=4 sts=4 et fdm=marker:

sources_non_forked/syntastic/syntax_checkers/rst/sphinx.vim

@@ -29,9 +29,9 @@ function! SyntaxCheckers_rst_sphinx_GetLocList() dict
 
     let srcdir = syntastic#util#var('rst_sphinx_source_dir')
     call self.log('g:syntastic_rst_sphinx_source_dir =', srcdir)
-    if srcdir == ''
+    if srcdir ==# ''
         let config = syntastic#util#findFileInParent('conf.py',  expand('%:p:h', 1))
-        if config == '' || !filereadable(config)
+        if config ==# '' || !filereadable(config)
             call self.log('conf.py file not found')
             return []
         endif
@@ -40,9 +40,9 @@ function! SyntaxCheckers_rst_sphinx_GetLocList() dict
 
     let confdir = syntastic#util#var('rst_sphinx_config_dir')
     call self.log('g:syntastic_rst_sphinx_config_dir =', confdir)
-    if confdir == ''
+    if confdir ==# ''
         let config = syntastic#util#findFileInParent('conf.py',  expand('%:p:h', 1))
-        let confdir = (config != '' && filereadable(config)) ? fnamemodify(config, ':p:h') : srcdir
+        let confdir = (config !=# '' && filereadable(config)) ? fnamemodify(config, ':p:h') : srcdir
     endif
 
     let makeprg = self.makeprgBuild({

sources_non_forked/syntastic/syntax_checkers/ruby/flog.vim

@@ -0,0 +1,72 @@
+"============================================================================
+"File:        flog.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Tim Carry <tim at pixelastic 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_ruby_flog_checker')
+    finish
+endif
+let g:loaded_syntastic_ruby_flog_checker = 1
+
+if !exists('g:syntastic_ruby_flog_threshold_warning')
+    let g:syntastic_ruby_flog_threshold_warning = 45
+endif
+
+if !exists('g:syntastic_ruby_flog_threshold_error')
+    let g:syntastic_ruby_flog_threshold_error = 90
+endif
+
+if !exists('g:syntastic_ruby_flog_sort')
+    let g:syntastic_ruby_flog_sort = 1
+endif
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_ruby_flog_GetLocList() dict
+    let makeprg = self.makeprgBuild({ 'args': '-a' })
+
+    " Example output:
+    "   93.25: MyClass::my_method my_file:42
+    let errorformat = '%\m%\s%#%m: %.%# %f:%l'
+
+    let loclist = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'subtype': 'Style' })
+
+    let trail_w = syntastic#util#float2str(g:syntastic_ruby_flog_threshold_warning) . ')'
+    let trail_e = syntastic#util#float2str(g:syntastic_ruby_flog_threshold_error) . ')'
+    for e in loclist
+      let score = syntastic#util#str2float(e['text'])
+
+      let e['text'] = 'Complexity is too high (' . syntastic#util#float2str(score) . '/'
+      if score < g:syntastic_ruby_flog_threshold_warning
+          let e['valid'] = 0
+      elseif score < g:syntastic_ruby_flog_threshold_error
+          let e['type'] = 'W'
+          let e['text'] .= trail_w
+      else
+          let e['type'] = 'E'
+          let e['text'] .= trail_e
+      endif
+    endfor
+
+    return loclist
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'ruby',
+    \ 'name': 'flog'})
+
+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.vim

@@ -15,8 +15,6 @@ if exists('g:loaded_syntastic_scss_sass_checker')
 endif
 let g:loaded_syntastic_scss_sass_checker = 1
 
-runtime! syntax_checkers/sass/*.vim
-
 call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'filetype': 'scss',
     \ 'name': 'sass',

sources_non_forked/syntastic/syntax_checkers/scss/sassc.vim

@@ -15,8 +15,6 @@ if exists('g:loaded_syntastic_scss_sassc_checker')
 endif
 let g:loaded_syntastic_scss_sassc_checker = 1
 
-runtime! syntax_checkers/sass/*.vim
-
 call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'filetype': 'scss',
     \ 'name': 'sassc',

sources_non_forked/syntastic/syntax_checkers/slim/slim_lint.vim

@@ -0,0 +1,39 @@
+"============================================================================
+"File:        slim_lint.vim
+"Description: Slim style and syntax checker plugin for Syntastic
+"Maintainer:  Vasily Kolesnikov <re.vkolesnikov@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_slim_slim_lint_checker')
+    finish
+endif
+let g:loaded_syntastic_slim_slim_lint_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_slim_slim_lint_GetLocList() dict
+    let makeprg = self.makeprgBuild({})
+
+    let errorformat = '%f:%l [%t] %m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'subtype': 'Style'})
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'slim',
+    \ 'name': 'slim_lint',
+    \ 'exec': 'slim-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/sql/sqlint.vim

@@ -0,0 +1,50 @@
+"============================================================================
+"File:        sqlint.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Steve Purcell <steve@sanityinc.com>
+"License:     MIT
+"============================================================================
+
+if exists('g:loaded_syntastic_sql_sqlint_checker')
+    finish
+endif
+let g:loaded_syntastic_sql_sqlint_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_sql_sqlint_GetHighlightRegex(i)
+    let term = matchstr(a:i['text'], '\m at or near "\zs[^"]\+\ze"')
+    return term !=# '' ? '\V\<' . escape(term, '\') . '\>' : ''
+endfunction
+
+function! SyntaxCheckers_sql_sqlint_IsAvailable() dict
+    if !executable(self.getExec())
+        return 0
+    endif
+    return syntastic#util#versionIsAtLeast(self.getVersion(), [0, 0, 3])
+endfunction
+
+function! SyntaxCheckers_sql_sqlint_GetLocList() dict
+    let makeprg = self.makeprgBuild({})
+
+    let errorformat =
+        \ '%E%f:%l:%c:ERROR %m,' .
+        \ '%W%f:%l:%c:WARNING %m,' .
+        \ '%C %m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'subtype': 'Style',
+        \ 'returns': [0, 1] })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'sql',
+    \ 'name': 'sqlint'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:

sources_non_forked/syntastic/syntax_checkers/stylus/stylint.vim

@@ -0,0 +1,43 @@
+"============================================================================
+"File:        stylint.vim
+"Description: Syntax checking plugin for syntastic.vim
+"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_stylus_stylint_checker')
+    finish
+endif
+let g:loaded_syntastic_stylus_stylint_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_stylus_stylint_GetLocList() dict
+    let makeprg = self.makeprgBuild({})
+
+    let errorformat =
+        \ '%WWarning: %m,' .
+        \ '%EError: %m,' .
+        \ '%CFile: %f,' .
+        \ '%CLine: %l:%.%#'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'subtype': 'Style' })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'stylus',
+    \ 'name': 'stylint'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:

sources_non_forked/syntastic/syntax_checkers/text/igor.vim

@@ -15,8 +15,6 @@ if exists('g:loaded_syntastic_text_igor_checker')
 endif
 let g:loaded_syntastic_text_igor_checker = 1
 
-runtime! syntax_checkers/docbk/*.vim
-
 call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'filetype': 'text',
     \ 'name': 'igor',

sources_non_forked/syntastic/syntax_checkers/typescript/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_typescript_eslint_checker')
+    finish
+endif
+let g:loaded_syntastic_typescript_eslint_checker = 1
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'typescript',
+    \ 'name': 'eslint',
+    \ 'redirect': 'javascript/eslint'})
+
+" vim: set sw=4 sts=4 et fdm=marker:

sources_non_forked/syntastic/syntax_checkers/typescript/tsc.vim

@@ -18,6 +18,10 @@ let s:save_cpo = &cpo
 set cpo&vim
 
 function! SyntaxCheckers_typescript_tsc_IsAvailable() dict
+    if !executable(self.getExec())
+        return 0
+    endif
+
     let version_output = split(syntastic#util#system(self.getExecEscaped() . ' --version'), '\n', 1)
     let ver = filter(copy(version_output), 'v:val =~# ''\m\<Version ''')
     let parsed_ver = len(ver) ? syntastic#util#parseVersion(ver[0], '\v<Version \zs\d+(\.\d+)\ze') : []
@@ -48,6 +52,7 @@ function! SyntaxCheckers_typescript_tsc_GetLocList() dict
     return SyntasticMake({
         \ 'makeprg': makeprg,
         \ 'errorformat': errorformat,
+        \ 'postprocess': ['guards'],
         \ 'defaults': {'bufnr': bufnr('')} })
 endfunction
 

sources_non_forked/syntastic/syntax_checkers/typescript/tslint.vim

@@ -22,9 +22,13 @@ function! SyntaxCheckers_typescript_tslint_GetHighlightRegex(item)
 endfunction
 
 function! SyntaxCheckers_typescript_tslint_GetLocList() dict
+    if !exists('s:tslint_new')
+        let s:tslint_new = syntastic#util#versionIsAtLeast(self.getVersion(), [2, 4])
+    endif
+
     let makeprg = self.makeprgBuild({
         \ 'args_after': '--format verbose',
-        \ 'fname_before': '-f' })
+        \ 'fname_before': (s:tslint_new ? '' : '-f') })
 
     " (comment-format) ts/app.ts[12, 36]: comment must start with lowercase letter
     let errorformat = '%f[%l\, %c]: %m'

sources_non_forked/syntastic/syntax_checkers/verilog/iverilog.vim

@@ -0,0 +1,38 @@
+"============================================================================
+"File:        iverilog.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Psidium <psiidium at gmail dot com>
+"License:     The MIT License
+"============================================================================
+
+if exists('g:loaded_syntastic_verilog_iverilog_checker')
+    finish
+endif
+let g:loaded_syntastic_verilog_iverilog_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_verilog_iverilog_GetLocList() dict
+    let makeprg = self.makeprgBuild({
+        \ 'args_before': '-t null',
+        \ 'args': '-Wall' })
+
+    let errorformat =
+        \ '%f:%l: %trror: %m,' .
+        \ '%f:%l: %tarning: %m,' .
+        \ '%E%f:%l:      : %m,' .
+        \ '%W%f:%l:        : %m,' .
+        \ '%f:%l: %m'
+
+    return SyntasticMake({'makeprg': makeprg, 'errorformat': errorformat})
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'verilog',
+    \ 'name': 'iverilog'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:

sources_non_forked/syntastic/syntax_checkers/vhdl/vcom.vim

@@ -0,0 +1,55 @@
+"============================================================================
+"File:        vcom.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Jim Vogel <jim dot e dot vogel 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_vhdl_vcom_checker')
+    finish
+endif
+let g:loaded_syntastic_vhdl_vcom_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_vhdl_vcom_GetLocList() dict
+    let makeprg = self.makeprgBuild({ 'args_before': '-lint' })
+
+    let errorformat =
+        \ '** %tRROR: %f(%l): %m,' .
+        \ '** %tRROR: %m,' .
+        \ '** %tARNING: %f(%l): %m,' .
+        \ '** %tARNING: %m,' .
+        \ '** %tOTE: %m,' .
+        \ '%tRROR: %f(%l): %m,' .
+        \ '%tARNING[%*[0-9]]: %f(%l): %m,' .
+        \ '%tRROR: %m,' .
+        \ '%tARNING[%*[0-9]]: %m'
+
+    let loclist = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat })
+
+    for e in loclist
+        if e['type'] !=? 'E' && e['type'] !=? 'W'
+            let e['type'] = 'W'
+        endif
+    endfor
+
+    return loclist
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'vhdl',
+    \ 'name': 'vcom'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:

sources_non_forked/syntastic/syntax_checkers/vim/vimlint.vim

@@ -74,6 +74,8 @@ function! SyntaxCheckers_vim_vimlint_GetLocList() dict " {{{1
         endif
     endif
 
+    call self.log('options =', param)
+
     return vimlint#vimlint(expand('%', 1), param)
 endfunction " }}}1
 

sources_non_forked/syntastic/syntax_checkers/xhtml/jshint.vim

@@ -15,8 +15,6 @@ if exists('g:loaded_syntastic_xhtml_jshint_checker')
 endif
 let g:loaded_syntastic_xhtml_jshint_checker = 1
 
-runtime! syntax_checkers/html/*.vim
-
 call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'filetype': 'xhtml',
     \ 'name': 'jshint',

sources_non_forked/syntastic/syntax_checkers/xquery/basex.vim

@@ -0,0 +1,51 @@
+"============================================================================
+"File:        basex.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  James Wright <james dot jw at hotmail 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.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_xquery_basex_checker')
+    finish
+endif
+let g:loaded_syntastic_xquery_basex_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_xquery_basex_GetLocList() dict
+    let makeprg = self.makeprgBuild({
+        \ 'args_after': '-z',
+        \ 'fname_before': '-q',
+        \ 'fname': syntastic#util#shescape('inspect:module("' . escape(expand('%:p', 1), '"') . '")') })
+
+    let errorformat =
+        \ '%f:%l:%c:%t:%n:%m,' .
+        \ '%m'
+
+    let loclist = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'preprocess': 'basex' })
+
+    for e in loclist
+        if e['type'] !=# 'W' && e['type'] !=# 'E'
+            let e['type'] = 'E'
+        endif
+    endfor
+
+    return loclist
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'xquery',
+    \ 'name': 'basex'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:

sources_non_forked/syntastic/syntax_checkers/xslt/xmllint.vim

@@ -15,8 +15,6 @@ if exists('g:loaded_syntastic_xslt_xmllint_checker')
 endif
 let g:loaded_syntastic_xslt_xmllint_checker = 1
 
-runtime! syntax_checkers/xml/*.vim
-
 call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'filetype': 'xslt',
     \ 'name': 'xmllint',

sources_non_forked/syntastic/syntax_checkers/yaml/jsyaml.vim

@@ -28,6 +28,7 @@ function! SyntaxCheckers_yaml_jsyaml_GetLocList() dict
     let errorformat =
         \ 'Error on line %l\, col %c:%m,' .
         \ 'JS-YAML: %m at line %l\, column %c:,' .
+        \ 'YAMLException: %m at line %l\, column %c:,' .
         \ '%-G%.%#'
 
     return SyntasticMake({

sources_non_forked/tlib/autoload/tlib.vim

@@ -1,10 +1,7 @@
-" tlib.vim
 " @Author:      Tom Link (micathom AT gmail com?subject=[vim])
 " @Website:     http://www.vim.org/account/profile.php?user_id=4037
 " @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
-" @Created:     2007-07-17.
+" @Revision:    13
-" @Last Change: 2013-09-25.
-" @Revision:    0.0.12
 
 " :nodefault:
 TLet g:tlib#debug = 0

sources_non_forked/tlib/autoload/tlib/Filter_cnf.vim

@@ -3,8 +3,8 @@
 " @Website:     http://www.vim.org/account/profile.php?user_id=4037
 " @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 " @Created:     2008-11-25.
-" @Last Change: 2014-06-02.
+" @Last Change: 2014-11-18.
-" @Revision:    0.0.109
+" @Revision:    0.0.114
 
 let s:prototype = tlib#Object#New({'_class': ['Filter_cnf'], 'name': 'cnf'}) "{{{2
 let s:prototype.highlight = g:tlib#input#higroup

sources_non_forked/tlib/autoload/tlib/Filter_glob.vim

@@ -2,8 +2,8 @@
 " @Website:     http://www.vim.org/account/profile.php?user_id=4037
 " @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 " @Created:     2008-11-25.
-" @Last Change: 2014-01-23.
+" @Last Change: 2014-11-18.
-" @Revision:    0.0.80
+" @Revision:    0.0.82
 
 let s:prototype = tlib#Filter_cnf#New({'_class': ['Filter_glob'], 'name': 'glob'}) "{{{2
 let s:prototype.highlight = g:tlib#input#higroup
@@ -61,8 +61,8 @@ endf
 
 " :nodoc:
 function! s:prototype.CleanFilter(filter) dict "{{{3
-    let filter = substitute(a:filter, '\\.\\{-}', g:tlib#Filter_glob#seq, 'g')
+    let filter = substitute(a:filter, '\\\.\\{-}', g:tlib#Filter_glob#seq, 'g')
-    let filter = substitute(filter, '\\.', g:tlib#Filter_glob#char, 'g')
+    let filter = substitute(filter, '\\\.', g:tlib#Filter_glob#char, 'g')
     return filter
 endf
 

sources_non_forked/tlib/autoload/tlib/Object.vim

@@ -1,20 +1,11 @@
-" Object.vim -- Prototype objects?
 " @Author:      Tom Link (micathom AT gmail com?subject=[vim])
 " @Website:     http://www.vim.org/account/profile.php?user_id=4037
 " @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
-" @Created:     2007-05-01.
+" @Revision:    127
-" @Last Change: 2011-03-10.
-" @Revision:    0.1.126
 
 " :filedoc:
 " Provides a prototype plus some OO-like methods.
 
-
-if &cp || exists("loaded_tlib_object_autoload")
-    finish
-endif
-let loaded_tlib_object_autoload = 1
-
 let s:id_counter = 0
 let s:prototype  = {'_class': ['object'], '_super': [], '_id': 0} "{{{2
 

sources_non_forked/tlib/autoload/tlib/Test.vim

@@ -1,18 +1,10 @@
-" Test.vim -- A test class
 " @Author:      Tom Link (micathom AT gmail com?subject=[vim])
 " @Website:     http://www.vim.org/account/profile.php?user_id=4037
 " @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
-" @Created:     2007-05-01.
+" @Revision:    11
-" @Last Change: 2010-09-05.
-" @Revision:    0.1.10
 
 " :enddoc:
 
-if &cp || exists("loaded_tlib_Test_autoload")
-    finish
-endif
-let loaded_tlib_Test_autoload = 1
-
 
 let s:prototype = tlib#Object#New({'_class': ['Test']}) "{{{2
 function! tlib#Test#New(...) "{{{3

sources_non_forked/tlib/autoload/tlib/TestChild.vim

@@ -1,18 +1,10 @@
-" TestChild.vim
 " @Author:      Tom Link (micathom AT gmail com?subject=[vim])
 " @Website:     http://www.vim.org/account/profile.php?user_id=4037
 " @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
-" @Created:     2007-05-18.
+" @Revision:    15
-" @Last Change: 2010-09-05.
-" @Revision:    0.1.14
 
 " :enddoc:
 
-if &cp || exists("loaded_tlib_TestChild_autoload")
-    finish
-endif
-let loaded_tlib_TestChild_autoload = 1
-
 
 let s:prototype = tlib#Test#New({'_class': ['TestChild']}) "{{{2
 function! tlib#TestChild#New(...) "{{{3

sources_non_forked/tlib/autoload/tlib/World.vim

@@ -1,7 +1,7 @@
 " @Author:      Tom Link (micathom AT gmail com?subject=[vim])
 " @Website:     http://www.vim.org/account/profile.php?user_id=4037
 " @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
-" @Revision:    1397
+" @Revision:    1432
 
 " :filedoc:
 " A prototype used by |tlib#input#List|.
@@ -359,6 +359,7 @@ endf
 
 " :nodoc:
 function! s:prototype.SelectItem(mode, index) dict "{{{3
+    " TLogVAR a:mode, a:index
     let bi = self.GetBaseIdx(a:index)
     " if self.RespondTo('MaySelectItem')
     "     if !self.MaySelectItem(bi)
@@ -378,6 +379,14 @@ function! s:prototype.SelectItem(mode, index) dict "{{{3
 endf
 
 
+" :nodoc:
+function! s:prototype.FormatBaseFromData() abort dict "{{{3
+    if has_key(self, 'format_data') && has_key(self, 'data')
+        let self.base = map(copy(self.data), 'call(self.format_data, [v:val], self)')
+    endif    
+endf
+
+
 " :nodoc:
 function! s:prototype.FormatArgs(format_string, arg) dict "{{{3
     let nargs = len(substitute(a:format_string, '%%\|[^%]', '', 'g'))
@@ -603,11 +612,13 @@ endf
 " :nodoc:
 function! s:prototype.IsValidFilter() dict "{{{3
     let last = self.FilterRxPrefix() .'\('. self.filter[0][0] .'\)'
+    Tlibtrace 'tlib', last
     " TLogVAR last
     try
         let a = match("", last)
         return 1
     catch
+        Tlibtrace 'tlib', v:exception
         return 0
     endtry
 endf
@@ -673,6 +684,8 @@ endf
 " :nodoc:
 function! s:prototype.ReduceFilter() dict "{{{3
     " TLogVAR self.filter
+    let reduced = 0
+    while !reduced
         if self.filter[0] == [''] && len(self.filter) > 1
             call remove(self.filter, 0)
         elseif empty(self.filter[0][0]) && len(self.filter[0]) > 1
@@ -680,6 +693,10 @@ function! s:prototype.ReduceFilter() dict "{{{3
         else
             call self.matcher.ReduceFrontFilter(self)
         endif
+        if self.IsValidFilter()
+            let reduced = 1
+        endif
+    endwh
 endf
 
 
@@ -687,6 +704,7 @@ endf
 " filter is either a string or a list of list of strings.
 function! s:prototype.SetInitialFilter(filter) dict "{{{3
     " let self.initial_filter = [[''], [a:filter]]
+    Tlibtrace 'tlib', a:filter
     if type(a:filter) == 3
         let self.initial_filter = deepcopy(a:filter)
     else
@@ -816,10 +834,18 @@ function! s:prototype.UseInputListScratch() dict "{{{3
     if !exists('w:tlib_list_init')
         " TLogVAR scratch
         if has_key(self, 'index_next_syntax')
+            if type(self.index_next_syntax) == 1
                 exec 'syntax match InputlListIndex /^\d\+:\s/ nextgroup='. self.index_next_syntax
+            elseif type(self.index_next_syntax) == 4
+                for [n, nsyn] in items(self.index_next_syntax)
+                    let fn = printf('%0'. world.index_width .'d', n)
+                    exec 'syntax match InputlListIndex /^'. fn .':\s/ nextgroup='. nsyn
+                endfor
+            endif
         else
             syntax match InputlListIndex /^\d\+:\s/
         endif
+        call tlib#hook#Run('tlib_UseInputListScratch', self)
         syntax match InputlListCursor /^\d\+\* .*$/ contains=InputlListIndex
         syntax match InputlListSelected /^\d\+# .*$/ contains=InputlListIndex
         hi def link InputlListIndex Constant
@@ -830,7 +856,6 @@ function! s:prototype.UseInputListScratch() dict "{{{3
         " let b:tlibDisplayListMarks = {}
         let b:tlibDisplayListMarks = []
         let b:tlibDisplayListWorld = self
-        call tlib#hook#Run('tlib_UseInputListScratch', self)
         let w:tlib_list_init = 1
     endif
     return scratch
@@ -842,6 +867,7 @@ endf
 function! s:prototype.Reset(...) dict "{{{3
     TVarArg ['initial', 0]
     " TLogVAR initial
+    Tlibtrace 'tlib', initial, self.initial_filter
     let self.state     = 'display'
     let self.offset    = 1
     let self.filter    = deepcopy(self.initial_filter)
@@ -853,6 +879,7 @@ function! s:prototype.Reset(...) dict "{{{3
     call self.UseInputListScratch()
     call self.ResetSelected()
     call self.Retrieve(!initial)
+    call self.FormatBaseFromData()
     return self
 endf
 
@@ -977,6 +1004,7 @@ function! s:prototype.DisplayHelp() dict "{{{3
     call self.PushHelp('Mouse', 'L: Pick item, R: Show menu')
     call self.PushHelp('<M-Number>',  'Select an item')
     call self.PushHelp('<BS>, <C-BS>', 'Reduce filter')
+    call self.PushHelp('<Tab>', 'Complete word')
     call self.PushHelp('<S-Esc>, <F10>', 'Enter command')
 
     if self.key_mode == 'default'
@@ -1214,10 +1242,11 @@ endf
 
 " :nodoc:
 function! s:prototype.Query() dict "{{{3
+    let flt = self.DisplayFilter()
     if g:tlib_inputlist_shortmessage
-        let query = 'Filter: '. self.DisplayFilter()
+        let query = 'Filter: '. flt
     else
-        let query = self.query .' (filter: '. self.DisplayFilter() .'; press <F1> for help)'
+        let query = self.query .' (filter: '. flt .'; press <F1> for help)'
     endif
     return query
 endf

sources_non_forked/tlib/autoload/tlib/agent.vim

@@ -1,10 +1,7 @@
-" agent.vim
 " @Author:      Tom Link (micathom AT gmail com?subject=[vim])
 " @Website:     http://www.vim.org/account/profile.php?user_id=4037
 " @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
-" @Created:     2007-06-24.
+" @Revision:    328
-" @Last Change: 2014-02-06.
-" @Revision:    0.1.251
 
 
 " :filedoc:
@@ -414,14 +411,17 @@ function! tlib#agent#ViewFile(world, selected) "{{{3
     if !empty(a:selected)
         let back = a:world.SwitchWindow('win')
         " TLogVAR back
-        if !&hidden && &l:modified
+        for filename in a:selected
-            let cmd0 = 'split'
+            call tlib#file#Edit(filename)
-            let cmd1 = 'sbuffer'
+        endfor
-        else
+        " if !&hidden && &l:modified
-            let cmd0 = 'edit'
+        "     let cmd0 = 'split'
-            let cmd1 = 'buffer'
+        "     let cmd1 = 'sbuffer'
-        endif
+        " else
-        call tlib#file#With(cmd0, cmd1, a:selected, a:world)
+        "     let cmd0 = 'edit'
+        "     let cmd1 = 'buffer'
+        " endif
+        " call tlib#file#With(cmd0, cmd1, a:selected, a:world)
         " TLogVAR &filetype
         exec back
         let a:world.state = 'display'
@@ -612,3 +612,53 @@ function! tlib#agent#CompleteAgentNames(ArgLead, CmdLine, CursorPos)
     return filter(copy(s:agent_names), 'stridx(v:val, a:ArgLead) != -1')
 endf
 
+
+function! tlib#agent#Complete(world, selected) abort "{{{3
+    let rxprefix = a:world.matcher.FilterRxPrefix()
+    let flt = a:world.filter[0][0]
+    " TLogVAR flt
+    let fltrx = rxprefix . flt . '\m[^[:space:][:cntrl:][:punct:]<>*+?&~{}()\[\]\\/]\+'
+    let fltrx0 = '\m^' . fltrx
+    " TLogVAR fltrx, fltrx0
+    let words = {}
+    for item in a:world.list
+        let parts = split(item, '\ze'. fltrx)
+        " TLogVAR item, parts
+        for part in parts
+            let word = matchstr(part, fltrx0)
+            " TLogVAR part, word
+            if !empty(word)
+                let words[word] = 1
+            endif
+        endfor
+    endfor
+    " TLogVAR keys(words)
+    let completions = keys(words)
+    " let completions = filter(keys(words), 'matchstr(v:val, fltrx0)')
+    let completions = sort(completions, 's:SortCompletions')
+    let completions = tlib#list#Uniq(completions)
+    " TLogVAR 0, completions
+    while len(completions) > 1
+        let nchar = strwidth(completions[0]) - 1
+        let completions = map(completions, 'strpart(v:val, 0, nchar)')
+        " TLogVAR 'reduce', completions
+        let completions = tlib#list#Uniq(completions)
+        " TLogVAR 'unique', len(completions), completions
+    endwh
+    " TLogVAR 9, completions
+    if empty(completions)
+        let a:world.state = 'redisplay update'
+    else
+        let a:world.filter[0][0] = completions[0]
+        let a:world.state = 'display update'
+    endif
+    return a:world
+endf
+
+
+function! s:SortCompletions(a, b) abort "{{{3
+    let i1 = strwidth(a:a)
+    let i2 = strwidth(a:b)
+    return i2 - i1
+endf
+

sources_non_forked/tlib/autoload/tlib/arg.vim

@@ -1,8 +1,8 @@
 " @Author:      Tom Link (micathom AT gmail com?subject=[vim])
 " @Website:     http://www.vim.org/account/profile.php?user_id=4037
 " @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
-" @Last Change: 2014-07-01.
+" @Last Change: 2015-11-19.
-" @Revision:    63
+" @Revision:    251
 
 
 " :def: function! tlib#arg#Get(n, var, ?default="", ?test='')
@@ -31,30 +31,25 @@ function! tlib#arg#Let(list, ...) "{{{3
 endf
 
 
-" :def: function! tlib#arg#Key(dict, list, ?default='')
+" :def: function! tlib#arg#StringAsKeyArgs(string, ?keys=[], ?evaluate=0, ?sep=':', ?booleans=0)
-" See |:TKeyArg|.
-function! tlib#arg#Key(list, ...) "{{{3
-    let default = a:0 >= 1 ? a:1 : ''
-    let dict = a:list[0]
-    let list = map(copy(a:list[1:-1]), 'type(v:val) == 3 ? v:val : [v:val, default]')
-    let args = map(list, '"let ". v:val[0] ." = ". string(get(dict, v:val[0], v:val[1]))')
-    " TLogVAR dict, list, args
-    return join(args, ' | ')
-endf
-
-
-" :def: function! tlib#arg#StringAsKeyArgs(string, ?keys=[], ?evaluate=0, ?sep=':')
 function! tlib#arg#StringAsKeyArgs(string, ...) "{{{1
-    TVarArg ['keys', {}], ['evaluate', 0], ['sep', ':']
+    TVarArg ['keys', {}], ['evaluate', 0], ['sep', ':'], ['booleans', 0]
     let keyargs = {}
     let args = split(a:string, '\\\@<! ')
-    let arglist = map(args, 'matchlist(v:val, ''^\%(\(\w\+\)'. sep .'\(.*\)\|\(.*\)\)$'')')
+    let key_rx = booleans ? '\([-+]\?\w\+\)' : '\(\w\+\)'
+    let arglist = map(args, 'matchlist(v:val, ''^\%('. key_rx . sep .'\(.*\)\|\(.*\)\)$'')')
     " TLogVAR a:string, args, arglist
-    let pos = 0
+    let pos = -1
     for matchlist in arglist
         if !empty(matchlist[3])
-            let keyargs[pos] = matchlist[3]
+            if booleans && matchlist[3] =~ '^[-+]'
+                let key = substitute(matchlist[3], '^[-+]', '', '')
+                let val = matchstr(matchlist[3], '^[-+]')
+                let keyargs[key] = val ==# '+'
+            else
                 let pos += 1
+                let keyargs[pos] = matchlist[3]
+            endif
         else
             let [match, key, val; rest] = matchlist
             if empty(keys) || has_key(keys, key)
@@ -68,12 +63,242 @@ function! tlib#arg#StringAsKeyArgs(string, ...) "{{{1
             endif
         endif
     endfor
+    if pos >= 0
+        let keyargs['__posargs__'] = range(0, pos)
+    endif
     return keyargs
 endf
 
 
 function! tlib#arg#StringAsKeyArgsEqual(string) "{{{1
-    return tlib#arg#StringAsKeyArgs(a:string, [], 0, '=')
+    return tlib#arg#StringAsKeyArgs(a:string, [], 0, '=', 1)
+endf
+
+
+" :display: tlib#arg#GetOpts(args, ?def={})
+" Convert a list of strings of command-line arguments into a dictonary.
+"
+" The main use case is to pass [<f-args>], i.e. the command-line 
+" arguments of a command as list, from a command definition to this 
+" function.
+"
+" Example:
+" ['-h']
+" => If def contains a 'help' key, invoke |:help| on its value.
+"
+" ['-ab', '--foo', '--bar=BAR', 'bla', bla']
+" => {'a': 1, 'b': 1, 'foo': 1, 'bar': 'BAR', '__rest__': ['bla', 'bla']}
+"
+" ['-ab', '--', '--foo', '--bar=BAR']
+" => {'a': 1, 'b': 1, '__rest__': ['--foo', '--bar=BAR']}
+function! tlib#arg#GetOpts(args, ...) abort "{{{3
+    let throw = a:0 == 0
+    TVarArg ['def', {}]
+    " TLogVAR def
+    let opts = {'__exit__': 0}
+    for [key, vdef] in items(get(def, 'values', {}))
+        if has_key(vdef, 'default')
+            let opts[key] = vdef.default
+        endif
+    endfor
+    let idx = 0
+    for o in a:args
+        let [break, idx] = s:SetOpt(def, opts, idx, o)
+        if break == 1
+            break
+        elseif break == 2
+            if throw
+                throw 'tlib#arg#GetOpts: Show help'
+            else
+                let opts.__exit__ = 5
+            endif
+        endif
+    endfor
+    let opts.__rest__ = a:args[idx : -1]
+    return opts
+endf
+
+
+function! s:GetValueType(def) abort "{{{3
+    return get(a:def, 'type', type(get(a:def, 'default', '')))
+endf
+
+
+function! s:SetOpt(def, opts, idx, opt) abort "{{{3
+    " TLogVAR a:def
+    let idx = a:idx + 1
+    let break = 0
+    let long = get(a:def, 'long', 1)
+    let short = get(a:def, 'short', 1)
+    if (short && a:opt =~# '^-[?h]$') || (long && a:opt ==# '--help')
+        if has_key(a:def, 'help')
+            exec 'help' a:def.help
+        else
+            " TLogVAR a:def
+            let values = get(a:def, 'values', {})
+            let flags = get(a:def, 'flags', {})
+            if empty(values) && empty(flags)
+                echom 'No help'
+            else
+                if !empty(values)
+                    echom 'Options:'
+                    for [key, vdef] in sort(items(values))
+                        let opt = key
+                        let default = get(vdef, 'default', '')
+                        let type = s:GetValueType(vdef)
+                        if default =~ '^-\?\d\+\%(\.\d\+\)$'
+                            if type == -1
+                                let opt .= ' (flag)'
+                            elseif type == 1
+                                let opt .= '=INT'
+                            else
+                                let opt .= '=INT or maybe BOOL'
+                            endif
+                        elseif type(default) == 1
+                            let opt .= '=STRING'
+                        elseif type(default) == 3
+                            let opt .= '=COMMA-LIST'
+                        endif
+                        echom printf('  --%20s (default: %s)', opt, string(default))
+                    endfor
+                endif
+                if !empty(flags)
+                    echom 'Short flags:'
+                    for [sflag, lflag] in sort(items(flags))
+                        echom printf('  -%s -> %s', sflag, lflag)
+                    endfor
+                endif
+            endif
+        endif
+        let break = 2
+    elseif long &&  a:opt =~# '^--no-.\+'
+        let key = matchstr(a:opt, '^--no-\zs.\+$')
+        let a:opts[key] = s:Validate(a:def, key, 0)
+    elseif long &&  a:opt =~# '^--\w\+$'
+        let key = matchstr(a:opt, '^--\zs.\+$')
+        let a:opts[key] = s:Validate(a:def, key, 1)
+    elseif long &&  a:opt =~# '^--\w\+='
+        let ml = matchlist(a:opt, '^--\(\w\+\)=\(.*\)$')
+        if empty(ml)
+            throw 'tlib#arg#GetOpts: Cannot parse: '. a:opt
+        else
+            let values = get(a:def, 'values', {})
+            if has_key(values, ml[1])
+                let vdef = values[ml[1]]
+                let type = s:GetValueType(vdef)
+                if type == -1
+                    let opt_value = !!str2nr(ml[2])
+                elseif type == 0
+                    let opt_value = str2nr(ml[2])
+                elseif type == 1
+                    let opt_value = ml[2]
+                elseif type == 2
+                    let opt_value = function(ml[2])
+                elseif type == 3
+                    let opt_value = tlib#string#SplitCommaList(ml[2])
+                elseif type == 4
+                    throw 'tlib#arg#GetOpts: Unsupported type conversion for '. ml[1]
+                elseif type == 5
+                    let opt_value = str2float(ml[2])
+                endif
+            else
+                let opt_value = ml[2]
+            endif
+            let a:opts[ml[1]] = s:Validate(a:def, ml[1], opt_value)
+            unlet opt_value
+        endif
+    elseif short && a:opt =~# '^-\w='
+        let flagdefs = get(a:def, 'flags', {})
+        let flag = matchstr(a:opt, '^-\zs\w')
+        let rest = matchstr(a:opt, '^-\w\zs.*$')
+        call s:SetFlag(a:def, a:opts, idx, flag, rest, flagdefs)
+    elseif short && a:opt =~# '^-\w\+$'
+        let flagdefs = get(a:def, 'flags', {})
+        for flag in split(substitute(a:opt, '^-', '', ''), '\zs')
+            call s:SetFlag(a:def, a:opts, idx, flag, '', flagdefs)
+        endfor
+    else
+        let break = 1
+        if a:opt !=# '--'
+            let idx -= 1
+        endif
+    endif
+    return [break, idx]
+endf
+
+
+function! s:SetFlag(def, opts, idx, flag, rest, flagdefs) abort "{{{3
+    " TLogVAR a:def
+    if has_key(a:flagdefs, a:flag)
+        call s:SetOpt(a:def, a:opts, a:idx, a:flagdefs[a:flag] . a:rest)
+    else
+        let a:opts[a:flag] = s:Validate(a:def, a:flag, 1)
+    endif
+endf
+
+
+function! s:Validate(def, name, value) abort "{{{3
+    let values = get(a:def, 'values', {})
+    if has_key(values, a:name)
+        let vdef = values[a:name]
+        if has_key(vdef, 'validate')
+            if !call(vdef.validate, [a:value])
+                throw printf('tlib#arg: %s has invalid value: %s', string(a:name), string(a:value))
+            endif
+        endif
+    endif
+    return a:value
+endf
+
+
+":nodoc:
+function! tlib#arg#CComplete(def, ArgLead) abort "{{{3
+    let values = get(a:def, 'values', {})
+    let opt = matchstr(a:ArgLead, '^--\zs\w\+\ze=')
+    if has_key(values, opt)
+        let words = []
+        let vals = values[opt]
+        let complete_customlist = get(vals, 'complete_customlist', '')
+        if !empty(complete_customlist)
+            let words = eval(complete_customlist)
+        " else
+        "     let complete = get(vals, 'complete', '')
+        "     if !empty(complete)
+        "     endif
+        endif
+        if !empty(words)
+            let lead = substitute(a:ArgLead, '^--\w\+=', '', '')
+            if !empty(lead)
+                let nchar = len(lead)
+                call filter(words, 'strpart(v:val, 0, nchar) ==# lead')
+            endif
+            let words = map(words, '"--". opt ."=". v:val')
+            return sort(words)
+        endif
+    endif
+    let cs = {'-h': 1, '--help': 1}
+    for [name, vdef] in items(values)
+        let type = s:GetValueType(vdef)
+        if type >= 0
+            let name .= '='
+        else
+            let cs['--no-'. name] = 1
+        endif
+        let cs['--'. name] = 1
+    endfor
+    for [name, subst] in items(get(a:def, 'flags', {}))
+        let ldef = get(values, substitute(subst, '^--', '', ''), {})
+        let type = s:GetValueType(ldef)
+        if type >= 0
+            let name .= '='
+        endif
+        let cs['-'. name] = 1
+    endfor
+    let nchar = len(a:ArgLead)
+    if nchar > 0
+        call filter(cs, 'strpart(v:key, 0, nchar) ==# a:ArgLead')
+    endif
+    return sort(keys(cs))
 endf