Permalink
Browse files

Updated plugins

  • Loading branch information...
1 parent 6a16a93 commit 1dba960b75349fd8e2f31cb97f45b232a7bc7b6c amix committed Jul 2, 2014
Showing with 2,648 additions and 1,225 deletions.
  1. +41 −3 sources_non_forked/ack.vim/README.md
  2. +17 −6 sources_non_forked/ack.vim/autoload/ack.vim
  3. +14 −2 sources_non_forked/ack.vim/doc/ack.txt
  4. +1 −1 sources_non_forked/ack.vim/ftplugin/qf.vim
  5. +6 −2 sources_non_forked/ack.vim/plugin/ack.vim
  6. +6 −1 sources_non_forked/goyo.vim/plugin/goyo.vim
  7. +5 −2 sources_non_forked/nerdtree/README.markdown
  8. +11 −3 sources_non_forked/nerdtree/autoload/nerdtree.vim
  9. +38 −24 sources_non_forked/nerdtree/doc/NERD_tree.txt
  10. +6 −2 sources_non_forked/nerdtree/lib/nerdtree/bookmark.vim
  11. +1 −1 sources_non_forked/nerdtree/lib/nerdtree/creator.vim
  12. +1 −1 sources_non_forked/nerdtree/lib/nerdtree/menu_item.vim
  13. +21 −0 sources_non_forked/nerdtree/lib/nerdtree/path.vim
  14. +2 −2 sources_non_forked/nerdtree/lib/nerdtree/tree_dir_node.vim
  15. +13 −6 sources_non_forked/nerdtree/nerdtree_plugin/fs_menu.vim
  16. +4 −2 sources_non_forked/nerdtree/plugin/NERD_tree.vim
  17. +51 −39 sources_non_forked/nerdtree/syntax/nerdtree.vim
  18. +89 −33 sources_non_forked/syntastic/CONTRIBUTING.md
  19. +24 −13 sources_non_forked/syntastic/README.markdown
  20. +1 −1 sources_non_forked/syntastic/autoload/syntastic/c.vim
  21. +30 −4 sources_non_forked/syntastic/autoload/syntastic/log.vim
  22. +2 −0 sources_non_forked/syntastic/autoload/syntastic/postprocess.vim
  23. +24 −0 sources_non_forked/syntastic/autoload/syntastic/preprocess.vim
  24. +1 −0 sources_non_forked/syntastic/autoload/syntastic/util.vim
  25. +27 −13 sources_non_forked/syntastic/doc/syntastic.txt
  26. +51 −33 sources_non_forked/syntastic/plugin/syntastic.vim
  27. +5 −11 sources_non_forked/syntastic/plugin/syntastic/checker.vim
  28. +2 −2 sources_non_forked/syntastic/plugin/syntastic/cursor.vim
  29. +9 −2 sources_non_forked/syntastic/plugin/syntastic/highlighting.vim
  30. +28 −2 sources_non_forked/syntastic/plugin/syntastic/loclist.vim
  31. +1 −0 sources_non_forked/syntastic/plugin/syntastic/notifiers.vim
  32. +40 −44 sources_non_forked/syntastic/plugin/syntastic/registry.vim
  33. +13 −10 sources_non_forked/syntastic/plugin/syntastic/signs.vim
  34. +4 −8 sources_non_forked/syntastic/syntax_checkers/actionscript/mxmlc.vim
  35. +3 −2 sources_non_forked/syntastic/syntax_checkers/bemhtml/bemhtmllint.vim
  36. +45 −0 sources_non_forked/syntastic/syntax_checkers/bro/bro.vim
  37. +14 −11 sources_non_forked/syntastic/syntax_checkers/c/checkpatch.vim
  38. +1 −1 sources_non_forked/syntastic/syntax_checkers/c/make.vim
  39. +55 −0 sources_non_forked/syntastic/syntax_checkers/cabal/cabal.vim
  40. +2 −1 sources_non_forked/syntastic/syntax_checkers/co/coco.vim
  41. +5 −1 sources_non_forked/syntastic/syntax_checkers/coffee/coffeelint.vim
  42. +3 −7 sources_non_forked/syntastic/syntax_checkers/css/csslint.vim
  43. +26 −0 sources_non_forked/syntastic/syntax_checkers/css/recess.vim
  44. +6 −0 sources_non_forked/syntastic/syntax_checkers/d/dmd.vim
  45. +16 −11 sources_non_forked/syntastic/syntax_checkers/eruby/ruby.vim
  46. +3 −7 sources_non_forked/syntastic/syntax_checkers/haml/haml.vim
  47. +3 −1 sources_non_forked/syntastic/syntax_checkers/haskell/hdevtools.vim
  48. +7 −16 sources_non_forked/syntastic/syntax_checkers/html/jshint.vim
  49. +4 −0 sources_non_forked/syntastic/syntax_checkers/html/tidy.vim
  50. +51 −65 sources_non_forked/syntastic/syntax_checkers/java/javac.vim
  51. +10 −22 sources_non_forked/syntastic/syntax_checkers/javascript/closurecompiler.vim
  52. +8 −11 sources_non_forked/syntastic/syntax_checkers/javascript/eslint.vim
  53. +2 −5 sources_non_forked/syntastic/syntax_checkers/javascript/gjslint.vim
  54. +7 −14 sources_non_forked/syntastic/syntax_checkers/javascript/jshint.vim
  55. +3 −6 sources_non_forked/syntastic/syntax_checkers/javascript/jsl.vim
  56. +1 −1 sources_non_forked/syntastic/syntax_checkers/javascript/jslint.vim
  57. +44 −0 sources_non_forked/syntastic/syntax_checkers/less/recess.vim
  58. +4 −3 sources_non_forked/syntastic/syntax_checkers/lisp/clisp.vim
  59. +8 −12 sources_non_forked/syntastic/syntax_checkers/perl/perl.vim
  60. +2 −2 sources_non_forked/syntastic/syntax_checkers/php/phpcs.vim
  61. +2 −5 sources_non_forked/syntastic/syntax_checkers/puppet/puppetlint.vim
  62. +2 −1 sources_non_forked/syntastic/syntax_checkers/python/flake8.vim
  63. +3 −1 sources_non_forked/syntastic/syntax_checkers/python/frosted.vim
  64. +25 −11 sources_non_forked/syntastic/syntax_checkers/python/pep257.vim
  65. +2 −1 sources_non_forked/syntastic/syntax_checkers/python/pep8.vim
  66. +2 −1 sources_non_forked/syntastic/syntax_checkers/python/py3kwarn.vim
  67. +8 −7 sources_non_forked/syntastic/syntax_checkers/python/pyflakes.vim
  68. +3 −1 sources_non_forked/syntastic/syntax_checkers/python/pylama.vim
  69. +1 −0 sources_non_forked/syntastic/syntax_checkers/python/pylint.vim
  70. +3 −1 sources_non_forked/syntastic/syntax_checkers/python/python.vim
  71. +4 −1 sources_non_forked/syntastic/syntax_checkers/r/lint.vim
  72. +2 −1 sources_non_forked/syntastic/syntax_checkers/r/svtools.vim
  73. +2 −10 sources_non_forked/syntastic/syntax_checkers/ruby/jruby.vim
  74. +1 −1 sources_non_forked/syntastic/syntax_checkers/ruby/macruby.vim
  75. +8 −10 sources_non_forked/syntastic/syntax_checkers/ruby/mri.vim
  76. +5 −1 sources_non_forked/syntastic/syntax_checkers/ruby/rubylint.vim
  77. +1 −0 sources_non_forked/syntastic/syntax_checkers/sass/sass.vim
  78. +10 −14 sources_non_forked/syntastic/syntax_checkers/{rust/rustc.vim → sass/sassc.vim}
  79. +2 −5 sources_non_forked/syntastic/syntax_checkers/scala/fsc.vim
  80. +3 −7 sources_non_forked/syntastic/syntax_checkers/scala/scalac.vim
  81. +0 −1 sources_non_forked/syntastic/syntax_checkers/scss/sass.vim
  82. +25 −0 sources_non_forked/syntastic/syntax_checkers/scss/sassc.vim
  83. +36 −35 sources_non_forked/syntastic/syntax_checkers/sh/sh.vim
  84. +46 −0 sources_non_forked/syntastic/syntax_checkers/typescript/tslint.vim
  85. +1 −1 sources_non_forked/syntastic/syntax_checkers/vala/valac.vim
  86. +1 −1 sources_non_forked/syntastic/syntax_checkers/vhdl/ghdl.vim
  87. +3 −2 sources_non_forked/syntastic/syntax_checkers/vim/vimlint.vim
  88. +4 −9 sources_non_forked/syntastic/syntax_checkers/yaml/yamlxs.vim
  89. +1 −1 sources_non_forked/syntastic/syntax_checkers/z80/z80syntaxchecker.vim
  90. +2 −24 sources_non_forked/tlib/autoload/tlib/Filter_cnf.vim
  91. +3 −1 sources_non_forked/tlib/autoload/tlib/World.vim
  92. +5 −3 sources_non_forked/tlib/autoload/tlib/string.vim
  93. +2 −2 sources_non_forked/tlib/doc/tlib.txt
  94. +2 −2 sources_non_forked/tlib/plugin/02tlib.vim
  95. +1 −1 sources_non_forked/vim-airline/README.md
  96. +6 −4 sources_non_forked/vim-airline/autoload/airline.vim
  97. +23 −17 sources_non_forked/vim-airline/autoload/airline/extensions.vim
  98. +8 −1 sources_non_forked/vim-airline/autoload/airline/extensions/branch.vim
  99. +16 −1 sources_non_forked/vim-airline/autoload/airline/extensions/hunks.vim
  100. +54 −0 sources_non_forked/vim-airline/autoload/airline/extensions/nrrwrgn.vim
  101. +3 −3 sources_non_forked/vim-airline/autoload/airline/extensions/tabline/unique_tail_improved.vim
  102. +28 −9 sources_non_forked/vim-airline/autoload/airline/extensions/whitespace.vim
  103. +4 −1 sources_non_forked/vim-airline/autoload/airline/highlighter.vim
  104. +1 −1 sources_non_forked/vim-airline/autoload/airline/themes/bubblegum.vim
  105. +29 −5 sources_non_forked/vim-airline/doc/airline.txt
  106. +3 −1 sources_non_forked/vim-commentary/README.markdown
  107. +3 −0 sources_non_forked/vim-commentary/doc/commentary.txt
  108. +1 −0 sources_non_forked/vim-commentary/plugin/commentary.vim
  109. +2 −2 sources_non_forked/vim-fugitive/README.markdown
  110. +42 −16 sources_non_forked/vim-fugitive/doc/fugitive.txt
  111. +363 −107 sources_non_forked/vim-fugitive/plugin/fugitive.vim
  112. +1 −1 sources_non_forked/vim-golang/autoload/go/complete.vim
  113. +3 −1 sources_non_forked/vim-golang/ftplugin/go.vim
  114. +16 −4 sources_non_forked/vim-golang/indent/go.vim
  115. +5 −3 sources_non_forked/vim-golang/readme.txt
  116. +17 −0 sources_non_forked/vim-markdown/README.markdown
  117. +1 −1 sources_non_forked/vim-markdown/ftplugin/markdown.vim
  118. +2 −2 sources_non_forked/vim-markdown/syntax/markdown.vim
  119. +0 −5 sources_non_forked/vim-snipmate/after/plugin/snipMate.vim
  120. +25 −13 sources_non_forked/vim-snipmate/autoload/snipMate.vim
  121. +7 −1 sources_non_forked/vim-snipmate/doc/snipMate.txt
  122. +26 −10 sources_non_forked/vim-snipmate/plugin/snipMate.vim
  123. +22 −16 sources_non_forked/vim-snippets/README.md
  124. +12 −12 sources_non_forked/vim-snippets/UltiSnips/c.snippets
  125. +1 −1 sources_non_forked/vim-snippets/UltiSnips/cpp.snippets
  126. +29 −29 sources_non_forked/vim-snippets/UltiSnips/d.snippets
  127. +6 −0 sources_non_forked/vim-snippets/UltiSnips/go.snippets
  128. +5 −5 sources_non_forked/vim-snippets/UltiSnips/java.snippets
  129. +12 −0 sources_non_forked/vim-snippets/UltiSnips/javascript.snippets
  130. +25 −0 sources_non_forked/vim-snippets/UltiSnips/javascript_angular.snippets
  131. +34 −0 sources_non_forked/vim-snippets/UltiSnips/julia.snippets
  132. +11 −0 sources_non_forked/vim-snippets/UltiSnips/markdown.snippets
  133. +3 −0 sources_non_forked/vim-snippets/UltiSnips/pandoc.snippets
  134. +22 −0 sources_non_forked/vim-snippets/UltiSnips/php_symfony2.snippets
  135. +35 −2 sources_non_forked/vim-snippets/UltiSnips/r.snippets
  136. +92 −55 sources_non_forked/vim-snippets/UltiSnips/rust.snippets
  137. +1 −1 sources_non_forked/vim-snippets/UltiSnips/tex.snippets
  138. +3 −39 sources_non_forked/vim-snippets/UltiSnips/vim.snippets
  139. +18 −0 sources_non_forked/vim-snippets/snippets/_.snippets
  140. +20 −0 sources_non_forked/vim-snippets/snippets/css.snippets
  141. +3 −30 sources_non_forked/vim-snippets/snippets/elixir.snippets
  142. +12 −0 sources_non_forked/vim-snippets/snippets/go.snippets
  143. +4 −1 sources_non_forked/vim-snippets/snippets/html.snippets
  144. +0 −72 sources_non_forked/vim-snippets/snippets/html_minimal.snippets
  145. +60 −17 sources_non_forked/vim-snippets/snippets/java.snippets
  146. +1 −1 sources_non_forked/vim-snippets/snippets/javascript/javascript.snippets
  147. +102 −0 sources_non_forked/vim-snippets/snippets/julia.snippets
  148. +1 −1 sources_non_forked/vim-snippets/snippets/php.snippets
  149. +13 −3 sources_non_forked/vim-snippets/snippets/r.snippets
  150. +2 −2 sources_non_forked/vim-snippets/snippets/ruby.snippets
  151. +125 −0 sources_non_forked/vim-snippets/snippets/rust.snippets
  152. +36 −0 sources_non_forked/vim-snippets/snippets/scheme.snippets
  153. +1 −1 sources_non_forked/vim-snippets/snippets/sh.snippets
  154. +83 −76 sources_non_forked/vim-snippets/snippets/tex.snippets
  155. +14 −12 sources_non_forked/vim-snippets/snippets/vim.snippets
  156. +8 −6 sources_non_forked/vim-surround/plugin/surround.vim
@@ -9,7 +9,7 @@ ack from vim, and shows the results in a split window.
### Ack
-You will need the ack, of course, to install it follow the
+You will need the ack(>= 2.0), of course, to install it follow the
[manual](http://beyondgrep.com/install/)
### The Plugin
@@ -75,8 +75,8 @@ check out the docs for the Perl script 'ack', for obvious reasons:
### Gotchas
Some characters have special meaning, and need to be escaped your search
-pattern. For instance, '#'. You have to escape it like this :Ack '\\\#define
-foo' to search for #define foo. (From blueyed in issue #5.)
+pattern. For instance, '#'. You have to escape it like this `:Ack '\\\#define
+foo'` to search for '#define foo'. (From blueyed in issue #5.)
## Changelog
@@ -91,3 +91,41 @@ foo' to search for #define foo. (From blueyed in issue #5.)
* Add g:ack_mapping
* Add g:ack_default_options
* Add a help toggle `?`(like NERDTree)
+
+### 1.0.1
+
+* Fixes #124. Bug with `g:ack_autofold_results`
+
+### 1.0.2
+
+* Add compatibility with [vim-dispatch](https://github.com/tpope/vim-dispatch)
+
+### 1.0.3
+
+* Fixes #127. Use `&l:hlsearch` instead of `v:hlsearch` to keep compatibility
+with versions that does not have this variable.
+
+### 1.0.4
+
+* Fixes #128. Always apply mappings, even when using vim-dispatch.
+
+### 1.0.5
+
+* Fixes #128. Fixes the `errorformat` for ack when using vim-dispatch.
+* Do not use vim-dispatch by default. To use vim-dispath must set
+`g:ack_use_dispatch`
+
+### 1.0.6
+
+* Fixes highlight function to work when user passes options. Ex.: Ack -i test
+ Thank's @mannih. (#131, #134)
+
+### 1.0.7
+
+* Fixes highlight function to work when passes more than one option, or options
+with double dashes(--option) Thank's to @MiguelLatorre and @mannih
+
+### 1.0.8
+
+* Fixes (again) highlight, now using negative look behind.
+* Change mappings `o` and `O` to behave as documented
@@ -8,6 +8,7 @@ function! ack#Ack(cmd, args)
else
let l:grepargs = a:args . join(a:000, ' ')
end
+ echom l:grepargs
let l:ackprg_run = g:ackprg
" Format, used to manage column jump
@@ -26,7 +27,14 @@ function! ack#Ack(cmd, args)
try
" NOTE: we escape special chars, but not everything using shellescape to
" allow for passing arguments etc
- silent execute a:cmd . " " . escape(l:grepargs, '|#%')
+ if g:ack_use_dispatch
+ let &l:errorformat = g:ackformat
+ let &l:makeprg=g:ackprg." " . escape(l:grepargs, '|#%')
+ Make
+ else
+ silent execute a:cmd . " " . escape(l:grepargs, '|#%')
+ endif
+
finally
let &grepprg=grepprg_bak
let &grepformat=grepformat_bak
@@ -42,15 +50,19 @@ function! ack#Ack(cmd, args)
let s:close_cmd = ':cclose<CR>'
endif
- call ack#show_results()
+ if !g:ack_use_dispatch
+ call ack#show_results()
+ else
+ copen
+ endif
+ call <SID>apply_maps()
call <SID>highlight(l:grepargs)
redraw!
endfunction
function! ack#show_results()
execute s:handler
- call <SID>apply_maps()
endfunction
function! s:apply_maps()
@@ -100,9 +112,8 @@ function! s:highlight(args)
return
endif
- let @/ = matchstr(a:args, "\\v\\w+\>|['\"]\\zs[^\"]+\\ze['\"]")
- setlocal hlsearch
- call feedkeys(":let v:hlsearch=1 \| echo \<CR>", "n")
+ let @/ = matchstr(a:args, "\\v(-)\@<!(\<)\@<=\\w+|['\"]\\zs.{-}\\ze['\"]")
+ call feedkeys(":let &l:hlsearch=1 \| echo \<CR>", "n")
endfunction
function! ack#AckFromSearch(cmd, args)
@@ -86,15 +86,15 @@ Example:
let g:ackprg = "other-bin-ack"
<
- g:ack_default_options*
+ *g:ack_default_options*
g:ack_default_options
Default: " -s -H --nocolor --nogroup --column"
Use this option to specify the options used by ack
Example:
>
- let g:ackprg =
+ let g:ack_default_options =
\ " -s -H --nocolor --nogroup --column --smart-case --follow"
<
@@ -203,6 +203,18 @@ Example:
let g:ackpreview = 1
<
+ *g:ack_use_dispatch*
+
+g:ack_use_dispatch
+Default: 0
+
+Use this option to use vim-dispatch to search the results in background
+
+Example:
+>
+ let g:ack_use_dispatch = 1
+<
+
==============================================================================
MAPPINGS *ack-mappings*
@@ -1,4 +1,4 @@
-if g:ack_autofold_results
+if exists("g:ack_autofold_results") && g:ack_autofold_results
setlocal foldlevel=0
setlocal foldmethod=expr
setlocal foldexpr=matchstr(getline(v:lnum),'^[^\|]\\+')==#matchstr(getline(v:lnum+1),'^[^\|]\\+')?1:'<1'
@@ -22,12 +22,16 @@ if !exists("g:ack_apply_lmappings")
let g:ack_apply_lmappings = !exists("g:ack_lhandler")
endif
+if !exists("g:ack_use_dispatch")
+ let g:ack_use_dispatch = 0
+end
+
let s:ack_mappings = {
\ "t": "<C-W><CR><C-W>T",
\ "T": "<C-W><CR><C-W>TgT<C-W>j",
\ "o": "<CR>",
- \ "O": "<CR><C-W><C-W>:ccl<CR>",
- \ "go": "<CR><C-W>j",
+ \ "O": "<CR><C-W>p<C-W>c",
+ \ "go": "<CR><C-W>p",
\ "h": "<C-W><CR><C-W>K",
\ "H": "<C-W><CR><C-W>K<C-W>b",
\ "v": "<C-W><CR><C-W>H<C-W>b<C-W>J<C-W>t",
@@ -104,13 +104,13 @@ function! s:tranquilize()
\ 'StatusLine', 'StatusLineNC', 'SignColumn']
" -1 on Vim / '' on GVim
if bg == -1 || empty(bg)
- call s:set_color(grp, '', 'NONE')
call s:set_color(grp, 'fg', get(g:, 'goyo_bg', 'black'))
call s:set_color(grp, 'bg', 'NONE')
else
call s:set_color(grp, 'fg', bg)
call s:set_color(grp, 'bg', bg)
endif
+ call s:set_color(grp, '', 'NONE')
endfor
endfunction
@@ -244,6 +244,8 @@ function! s:goyo_off()
let goyo_disabled_airline = t:goyo_disabled_airline
let goyo_disabled_powerline = t:goyo_disabled_powerline
let goyo_disabled_lightline = t:goyo_disabled_lightline
+ let goyo_orig_buffer = t:goyo_master
+ let [line, col] = [line('.'), col('.')]
if tabpagenr() == 1
tabnew
@@ -252,6 +254,9 @@ function! s:goyo_off()
endif
tabclose
execute 'normal! '.s:orig_tab.'gt'
+ if winbufnr(0) == goyo_orig_buffer
+ execute printf('normal! %dG%d|', line, col)
+ endif
let wmh = remove(goyo_revert, 'winminheight')
let wh = remove(goyo_revert, 'winheight')
@@ -60,7 +60,7 @@ Installation
cd ~/.vim/bundle
git clone https://github.com/scrooloose/nerdtree.git
-Then reload vim, run `:helptags`, and check out `:help NERD_tree.txt`.
+Then reload vim, run `:Helptags`, and check out `:help NERD_tree.txt`.
Faq
@@ -80,7 +80,10 @@ A. Stick this in your vimrc: `autocmd vimenter * NERDTree`
__Q. How can I open a NERDTree automatically when vim starts up if no files were specified?__
-A. Stick this in your vimrc `autocmd vimenter * if !argc() | NERDTree | endif`
+A. Stick this in your vimrc
+
+ autocmd StdinReadPre * let s:std_in=1
+ autocmd VimEnter * if !argc() == 0 && !exists("s:std_in") | NERDTree | endif
__Q. How can I map a specific key or shortcut to open NERDTree?__
@@ -513,7 +513,7 @@ function! nerdtree#dumpHelp()
let @h=@h."\" ". g:NERDTreeMapHelp .": toggle help\n"
let @h=@h."\"\n\" ----------------------------\n"
let @h=@h."\" Bookmark commands~\n"
- let @h=@h."\" :Bookmark <name>\n"
+ let @h=@h."\" :Bookmark [<name>]\n"
let @h=@h."\" :BookmarkToRoot <name>\n"
let @h=@h."\" :RevealBookmark <name>\n"
let @h=@h."\" :OpenBookmark <name>\n"
@@ -1068,9 +1068,17 @@ function! s:closeCurrentDir(node)
if parent ==# {} || parent.isRoot()
call nerdtree#echo("cannot close tree root")
else
- call a:node.parent.close()
+ while g:NERDTreeCascadeOpenSingleChildDir && !parent.parent.isRoot()
+ if parent.parent.getVisibleChildCount() == 1
+ call parent.close()
+ let parent = parent.parent
+ else
+ break
+ endif
+ endwhile
+ call parent.close()
call nerdtree#renderView()
- call a:node.parent.putCursorHere(0, 0)
+ call parent.putCursorHere(0, 0)
endif
endfunction
Oops, something went wrong.

0 comments on commit 1dba960

Please sign in to comment.