Skip to content

Commit

Permalink
Fix lint warnings: use the abort attribute for functions in autoload
Browse files Browse the repository at this point in the history
  • Loading branch information
alerque committed Dec 31, 2019
1 parent 10868dd commit 38b1e5e
Show file tree
Hide file tree
Showing 2 changed files with 74 additions and 74 deletions.
36 changes: 18 additions & 18 deletions autoload/nerdtree.vim
Expand Up @@ -9,7 +9,7 @@ let s:rootNERDTreePath = resolve(expand('<sfile>:p:h:h'))
" 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()))
Expand All @@ -31,7 +31,7 @@ endfunction
"============================================================

"FUNCTION: nerdtree#slash() {{{2
function! nerdtree#slash()
function! nerdtree#slash() abort

if nerdtree#runningWindows()
if exists('+shellslash') && &shellslash
Expand All @@ -46,7 +46,7 @@ endfunction

"FUNCTION: nerdtree#and(x,y) {{{2
" Implements and() function for Vim <= 7.2
function! nerdtree#and(x,y)
function! nerdtree#and(x,y) abort
if exists('*and')
return and(a:x, a:y)
else
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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')
Expand All @@ -164,7 +164,7 @@ 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)
function! nerdtree#exec(cmd, ignoreAll) abort
let old_ei = &ei
if a:ignoreAll
set ei=all
Expand All @@ -174,12 +174,12 @@ function! nerdtree#exec(cmd, ignoreAll)
endfunction

" FUNCTION: nerdtree#has_opt(options, name) {{{2
function! nerdtree#has_opt(options, name)
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
Expand All @@ -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()

Expand All @@ -206,12 +206,12 @@ function! nerdtree#postSourceActions()
endfunction

"FUNCTION: nerdtree#runningWindows(dir) {{{2
function! nerdtree#runningWindows()
function! nerdtree#runningWindows() abort
return has('win16') || has('win32') || has('win64')
endfunction

"FUNCTION: nerdtree#runningCygwin(dir) {{{2
function! nerdtree#runningCygwin()
function! nerdtree#runningCygwin() abort
return has('win32unix')
endfunction

Expand All @@ -223,7 +223,7 @@ endfunction
"
"Args:
"msg: the message to echo
function! nerdtree#echo(msg)
function! nerdtree#echo(msg) abort
redraw
echomsg empty(a:msg) ? '' : ('NERDTree: ' . a:msg)
endfunction
Expand All @@ -232,7 +232,7 @@ endfunction
"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
Expand All @@ -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

Expand Down

0 comments on commit 38b1e5e

Please sign in to comment.