mirror of
https://github.com/amix/vimrc
synced 2025-06-23 15:04:59 +08:00
Updated plugins
This commit is contained in:
@ -1,21 +1,21 @@
|
||||
if exists("g:loaded_nerdtree_autoload")
|
||||
if exists('g:loaded_nerdtree_autoload')
|
||||
finish
|
||||
endif
|
||||
let g:loaded_nerdtree_autoload = 1
|
||||
|
||||
let s:rootNERDTreePath = resolve(expand("<sfile>:p:h:h"))
|
||||
let s:rootNERDTreePath = resolve(expand('<sfile>:p:h:h'))
|
||||
|
||||
"FUNCTION: nerdtree#version(...) {{{1
|
||||
" If any value is given as an argument, the entire line of text from the
|
||||
" change log is shown for the current version; otherwise, only the version
|
||||
" number is shown.
|
||||
function! nerdtree#version(...)
|
||||
function! nerdtree#version(...) abort
|
||||
let l:text = 'Unknown'
|
||||
try
|
||||
let l:changelog = readfile(join([s:rootNERDTreePath, "CHANGELOG.md"], nerdtree#slash()))
|
||||
let l:changelog = readfile(join([s:rootNERDTreePath, 'CHANGELOG.md'], nerdtree#slash()))
|
||||
let l:line = 0
|
||||
while l:line <= len(l:changelog)
|
||||
if l:changelog[l:line] =~ '\d\+\.\d\+'
|
||||
if l:changelog[l:line] =~# '\d\+\.\d\+'
|
||||
let l:text = substitute(l:changelog[l:line], '.*\(\d\+.\d\+\).*', '\1', '')
|
||||
let l:text .= substitute(l:changelog[l:line+1], '^.\{-}\(\.\d\+\).\{-}:\(.*\)', a:0>0 ? '\1:\2' : '\1', '')
|
||||
break
|
||||
@ -31,7 +31,7 @@ endfunction
|
||||
"============================================================
|
||||
|
||||
"FUNCTION: nerdtree#slash() {{{2
|
||||
function! nerdtree#slash()
|
||||
function! nerdtree#slash() abort
|
||||
|
||||
if nerdtree#runningWindows()
|
||||
if exists('+shellslash') && &shellslash
|
||||
@ -46,8 +46,8 @@ endfunction
|
||||
|
||||
"FUNCTION: nerdtree#and(x,y) {{{2
|
||||
" Implements and() function for Vim <= 7.2
|
||||
function! nerdtree#and(x,y)
|
||||
if exists("*and")
|
||||
function! nerdtree#and(x,y) abort
|
||||
if exists('*and')
|
||||
return and(a:x, a:y)
|
||||
else
|
||||
let l:x = a:x
|
||||
@ -68,7 +68,7 @@ endfunction
|
||||
|
||||
"FUNCTION: nerdtree#checkForBrowse(dir) {{{2
|
||||
"inits a window tree in the current buffer if appropriate
|
||||
function! nerdtree#checkForBrowse(dir)
|
||||
function! nerdtree#checkForBrowse(dir) abort
|
||||
if !isdirectory(a:dir)
|
||||
return
|
||||
endif
|
||||
@ -83,18 +83,18 @@ endfunction
|
||||
"FUNCTION: s:reuseWin(dir) {{{2
|
||||
"finds a NERDTree buffer with root of dir, and opens it.
|
||||
function! s:reuseWin(dir) abort
|
||||
let path = g:NERDTreePath.New(fnamemodify(a:dir, ":p"))
|
||||
let path = g:NERDTreePath.New(fnamemodify(a:dir, ':p'))
|
||||
|
||||
for i in range(1, bufnr("$"))
|
||||
for i in range(1, bufnr('$'))
|
||||
unlet! nt
|
||||
let nt = getbufvar(i, "NERDTree")
|
||||
let nt = getbufvar(i, 'NERDTree')
|
||||
if empty(nt)
|
||||
continue
|
||||
endif
|
||||
|
||||
if nt.isWinTree() && nt.root.path.equals(path)
|
||||
call nt.setPreviousBuf(bufnr("#"))
|
||||
exec "buffer " . i
|
||||
call nt.setPreviousBuf(bufnr('#'))
|
||||
exec 'buffer ' . i
|
||||
return 1
|
||||
endif
|
||||
endfor
|
||||
@ -104,17 +104,17 @@ endfunction
|
||||
|
||||
" FUNCTION: nerdtree#completeBookmarks(A,L,P) {{{2
|
||||
" completion function for the bookmark commands
|
||||
function! nerdtree#completeBookmarks(A,L,P)
|
||||
function! nerdtree#completeBookmarks(A,L,P) abort
|
||||
return filter(g:NERDTreeBookmark.BookmarkNames(), 'v:val =~# "^' . a:A . '"')
|
||||
endfunction
|
||||
|
||||
"FUNCTION: nerdtree#compareNodes(dir) {{{2
|
||||
function! nerdtree#compareNodes(n1, n2)
|
||||
function! nerdtree#compareNodes(n1, n2) abort
|
||||
return a:n1.path.compareTo(a:n2.path)
|
||||
endfunction
|
||||
|
||||
"FUNCTION: nerdtree#compareNodesBySortKey(n1, n2) {{{2
|
||||
function! nerdtree#compareNodesBySortKey(n1, n2)
|
||||
function! nerdtree#compareNodesBySortKey(n1, n2) abort
|
||||
let sortKey1 = a:n1.path.getSortKey()
|
||||
let sortKey2 = a:n2.path.getSortKey()
|
||||
let i = 0
|
||||
@ -122,15 +122,15 @@ function! nerdtree#compareNodesBySortKey(n1, n2)
|
||||
" Compare chunks upto common length.
|
||||
" If chunks have different type, the one which has
|
||||
" integer type is the lesser.
|
||||
if type(sortKey1[i]) == type(sortKey2[i])
|
||||
if type(sortKey1[i]) ==# type(sortKey2[i])
|
||||
if sortKey1[i] <# sortKey2[i]
|
||||
return - 1
|
||||
elseif sortKey1[i] ># sortKey2[i]
|
||||
return 1
|
||||
endif
|
||||
elseif type(sortKey1[i]) == v:t_number
|
||||
elseif type(sortKey1[i]) ==# v:t_number
|
||||
return -1
|
||||
elseif type(sortKey2[i]) == v:t_number
|
||||
elseif type(sortKey2[i]) ==# v:t_number
|
||||
return 1
|
||||
endif
|
||||
let i = i + 1
|
||||
@ -150,7 +150,7 @@ endfunction
|
||||
" FUNCTION: nerdtree#deprecated(func, [msg]) {{{2
|
||||
" Issue a deprecation warning for a:func. If a second arg is given, use this
|
||||
" as the deprecation message
|
||||
function! nerdtree#deprecated(func, ...)
|
||||
function! nerdtree#deprecated(func, ...) abort
|
||||
let msg = a:0 ? a:func . ' ' . a:1 : a:func . ' is deprecated'
|
||||
|
||||
if !exists('s:deprecationWarnings')
|
||||
@ -164,22 +164,22 @@ endfunction
|
||||
|
||||
" FUNCTION: nerdtree#exec(cmd, ignoreAll) {{{2
|
||||
" Same as :exec cmd but, if ignoreAll is TRUE, set eventignore=all for the duration
|
||||
function! nerdtree#exec(cmd, ignoreAll)
|
||||
let old_ei = &ei
|
||||
function! nerdtree#exec(cmd, ignoreAll) abort
|
||||
let old_ei = &eventignore
|
||||
if a:ignoreAll
|
||||
set ei=all
|
||||
set eventignore=all
|
||||
endif
|
||||
exec a:cmd
|
||||
let &ei = old_ei
|
||||
let &eventignore = old_ei
|
||||
endfunction
|
||||
|
||||
" FUNCTION: nerdtree#has_opt(options, name) {{{2
|
||||
function! nerdtree#has_opt(options, name)
|
||||
return has_key(a:options, a:name) && a:options[a:name] == 1
|
||||
function! nerdtree#has_opt(options, name) abort
|
||||
return has_key(a:options, a:name) && a:options[a:name] ==# 1
|
||||
endfunction
|
||||
|
||||
" FUNCTION: nerdtree#loadClassFiles() {{{2
|
||||
function! nerdtree#loadClassFiles()
|
||||
function! nerdtree#loadClassFiles() abort
|
||||
runtime lib/nerdtree/path.vim
|
||||
runtime lib/nerdtree/menu_controller.vim
|
||||
runtime lib/nerdtree/menu_item.vim
|
||||
@ -197,7 +197,7 @@ function! nerdtree#loadClassFiles()
|
||||
endfunction
|
||||
|
||||
" FUNCTION: nerdtree#postSourceActions() {{{2
|
||||
function! nerdtree#postSourceActions()
|
||||
function! nerdtree#postSourceActions() abort
|
||||
call g:NERDTreeBookmark.CacheBookmarks(1)
|
||||
call nerdtree#ui_glue#createDefaultBindings()
|
||||
|
||||
@ -206,13 +206,13 @@ function! nerdtree#postSourceActions()
|
||||
endfunction
|
||||
|
||||
"FUNCTION: nerdtree#runningWindows(dir) {{{2
|
||||
function! nerdtree#runningWindows()
|
||||
return has("win16") || has("win32") || has("win64")
|
||||
function! nerdtree#runningWindows() abort
|
||||
return has('win16') || has('win32') || has('win64')
|
||||
endfunction
|
||||
|
||||
"FUNCTION: nerdtree#runningCygwin(dir) {{{2
|
||||
function! nerdtree#runningCygwin()
|
||||
return has("win32unix")
|
||||
function! nerdtree#runningCygwin() abort
|
||||
return has('win32unix')
|
||||
endfunction
|
||||
|
||||
" SECTION: View Functions {{{1
|
||||
@ -223,16 +223,16 @@ endfunction
|
||||
"
|
||||
"Args:
|
||||
"msg: the message to echo
|
||||
function! nerdtree#echo(msg)
|
||||
function! nerdtree#echo(msg) abort
|
||||
redraw
|
||||
echomsg empty(a:msg) ? "" : ("NERDTree: " . a:msg)
|
||||
echomsg empty(a:msg) ? '' : ('NERDTree: ' . a:msg)
|
||||
endfunction
|
||||
|
||||
"FUNCTION: nerdtree#echoError {{{2
|
||||
"Wrapper for nerdtree#echo, sets the message type to errormsg for this message
|
||||
"Args:
|
||||
"msg: the message to echo
|
||||
function! nerdtree#echoError(msg)
|
||||
function! nerdtree#echoError(msg) abort
|
||||
echohl errormsg
|
||||
call nerdtree#echo(a:msg)
|
||||
echohl normal
|
||||
@ -242,14 +242,14 @@ endfunction
|
||||
"Wrapper for nerdtree#echo, sets the message type to warningmsg for this message
|
||||
"Args:
|
||||
"msg: the message to echo
|
||||
function! nerdtree#echoWarning(msg)
|
||||
function! nerdtree#echoWarning(msg) abort
|
||||
echohl warningmsg
|
||||
call nerdtree#echo(a:msg)
|
||||
echohl normal
|
||||
endfunction
|
||||
|
||||
"FUNCTION: nerdtree#renderView {{{2
|
||||
function! nerdtree#renderView()
|
||||
function! nerdtree#renderView() abort
|
||||
call b:NERDTree.render()
|
||||
endfunction
|
||||
|
||||
|
Reference in New Issue
Block a user