m-vim_plugins/nerdtree
1
0
Fork 0
mirror of https://github.com/preservim/nerdtree.git synced 2025-11-08 11:23:48 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Put Callback function variables in local scope. (#1230)

Browse Source 
* Put `Callback` function variables in local scope.

This change prevents conflict with other `Callback` functions that are
defined elsewhere in global scope.

* Update version number in change log.
This commit is contained in:
Phil Runninger
2021-03-01 09:34:54 -05:00
committed by GitHub
parent a1fa4a33bf
commit f63fb6984f
4 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/nerdtree/key_map.vim
View File

@@ -66,11 +66,11 @@ endfunction
"FUNCTION: KeyMap.invoke() {{{1
"Call the KeyMaps callback function
function! s:KeyMap.invoke(...)
let Callback = type(self.callback) ==# type(function('tr')) ? self.callback : function(self.callback)
let l:Callback = type(self.callback) ==# type(function('tr')) ? self.callback : function(self.callback)
if a:0
call Callback(a:1)
call l:Callback(a:1)
else
call Callback()
call l:Callback()
endif
endfunction

4
lib/nerdtree/notifier.vim
View File

@@ -15,8 +15,8 @@ function! s:Notifier.NotifyListeners(event, path, nerdtree, params)
let event = g:NERDTreeEvent.New(a:nerdtree, a:path, a:event, a:params)
for Listener in s:Notifier.GetListenersForEvent(a:event)
let Callback = type(Listener) == type(function('tr')) ? Listener : function(Listener)
call Callback(event)
let l:Callback = type(Listener) == type(function('tr')) ? Listener : function(Listener)
call l:Callback(event)
endfor
endfunction

8
lib/nerdtree/path.vim
View File

@@ -459,10 +459,10 @@ function! s:Path.ignore(nerdtree)
endif
endfor
for Callback in g:NERDTree.PathFilters()
let Callback = type(Callback) ==# type(function('tr')) ? Callback : function(Callback)
if Callback({'path': self, 'nerdtree': a:nerdtree})
return 1
for l:Callback in g:NERDTree.PathFilters()
let l:Callback = type(l:Callback) ==# type(function('tr')) ? l:Callback : function(l:Callback)
if l:Callback({'path': self, 'nerdtree': a:nerdtree})
return 1
endif
endfor
endif