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

Fix lint warnings: prefer single quoted strings

Browse Source
This commit is contained in:
Caleb Maclennan
2019-12-31 08:50:25 +03:00
parent 8d81510aa6
commit 45e33f2502
20 changed files with 478 additions and 478 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
autoload/nerdtree.vim
View File

@@ -1,9 +1,9 @@
if exists("g:loaded_nerdtree_autoload") if exists('g:loaded_nerdtree_autoload')
finish finish
endif endif
let g:loaded_nerdtree_autoload = 1 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 "FUNCTION: nerdtree#version(...) {{{1
" If any value is given as an argument, the entire line of text from the " If any value is given as an argument, the entire line of text from the
@@ -12,7 +12,7 @@ let s:rootNERDTreePath = resolve(expand("<sfile>:p:h:h"))
function! nerdtree#version(...) function! nerdtree#version(...)
let l:text = 'Unknown' let l:text = 'Unknown'
try 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 let l:line = 0
while l:line <= len(l:changelog) while l:line <= len(l:changelog)
if l:changelog[l:line] =~ '\d\+\.\d\+' if l:changelog[l:line] =~ '\d\+\.\d\+'
@@ -47,7 +47,7 @@ endfunction
"FUNCTION: nerdtree#and(x,y) {{{2 "FUNCTION: nerdtree#and(x,y) {{{2
" Implements and() function for Vim <= 7.2 " Implements and() function for Vim <= 7.2
function! nerdtree#and(x,y) function! nerdtree#and(x,y)
if exists("*and") if exists('*and')
return and(a:x, a:y) return and(a:x, a:y)
else else
let l:x = a:x let l:x = a:x
@@ -83,18 +83,18 @@ endfunction
"FUNCTION: s:reuseWin(dir) {{{2 "FUNCTION: s:reuseWin(dir) {{{2
"finds a NERDTree buffer with root of dir, and opens it. "finds a NERDTree buffer with root of dir, and opens it.
function! s:reuseWin(dir) abort 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 unlet! nt
let nt = getbufvar(i, "NERDTree") let nt = getbufvar(i, 'NERDTree')
if empty(nt) if empty(nt)
continue continue
endif endif
if nt.isWinTree() && nt.root.path.equals(path) if nt.isWinTree() && nt.root.path.equals(path)
call nt.setPreviousBuf(bufnr("#")) call nt.setPreviousBuf(bufnr('#'))
exec "buffer " . i exec 'buffer ' . i
return 1 return 1
endif endif
endfor endfor
@@ -207,12 +207,12 @@ endfunction
"FUNCTION: nerdtree#runningWindows(dir) {{{2 "FUNCTION: nerdtree#runningWindows(dir) {{{2
function! nerdtree#runningWindows() function! nerdtree#runningWindows()
return has("win16") || has("win32") || has("win64") return has('win16') || has('win32') || has('win64')
endfunction endfunction
"FUNCTION: nerdtree#runningCygwin(dir) {{{2 "FUNCTION: nerdtree#runningCygwin(dir) {{{2
function! nerdtree#runningCygwin() function! nerdtree#runningCygwin()
return has("win32unix") return has('win32unix')
endfunction endfunction
" SECTION: View Functions {{{1 " SECTION: View Functions {{{1
@@ -225,7 +225,7 @@ endfunction
"msg: the message to echo "msg: the message to echo
function! nerdtree#echo(msg) function! nerdtree#echo(msg)
redraw redraw
echomsg empty(a:msg) ? "" : ("NERDTree: " . a:msg) echomsg empty(a:msg) ? '' : ('NERDTree: ' . a:msg)
endfunction endfunction
"FUNCTION: nerdtree#echoError {{{2 "FUNCTION: nerdtree#echoError {{{2

138
autoload/nerdtree/ui_glue.vim
View File

@@ -1,4 +1,4 @@
if exists("g:loaded_nerdtree_ui_glue_autoload") if exists('g:loaded_nerdtree_ui_glue_autoload')
finish finish
endif endif
let g:loaded_nerdtree_ui_glue_autoload = 1 let g:loaded_nerdtree_ui_glue_autoload = 1
@@ -8,73 +8,73 @@ function! nerdtree#ui_glue#createDefaultBindings()
let s = '<SNR>' . s:SID() . '_' let s = '<SNR>' . s:SID() . '_'
call NERDTreeAddKeyMap({ 'key': '<MiddleMouse>', 'scope': 'all', 'callback': s . 'handleMiddleMouse' }) call NERDTreeAddKeyMap({ 'key': '<MiddleMouse>', 'scope': 'all', 'callback': s . 'handleMiddleMouse' })
call NERDTreeAddKeyMap({ 'key': '<LeftRelease>', 'scope': "all", 'callback': s."handleLeftClick" }) call NERDTreeAddKeyMap({ 'key': '<LeftRelease>', 'scope': 'all', 'callback': s.'handleLeftClick' })
call NERDTreeAddKeyMap({ 'key': '<2-LeftMouse>', 'scope': "DirNode", 'callback': s."activateDirNode" }) call NERDTreeAddKeyMap({ 'key': '<2-LeftMouse>', 'scope': 'DirNode', 'callback': s.'activateDirNode' })
call NERDTreeAddKeyMap({ 'key': '<2-LeftMouse>', 'scope': "FileNode", 'callback': s."activateFileNode" }) call NERDTreeAddKeyMap({ 'key': '<2-LeftMouse>', 'scope': 'FileNode', 'callback': s.'activateFileNode' })
call NERDTreeAddKeyMap({ 'key': '<2-LeftMouse>', 'scope': "Bookmark", 'callback': s."activateBookmark" }) call NERDTreeAddKeyMap({ 'key': '<2-LeftMouse>', 'scope': 'Bookmark', 'callback': s.'activateBookmark' })
call NERDTreeAddKeyMap({ 'key': '<2-LeftMouse>', 'scope': "all", 'callback': s."activateAll" }) call NERDTreeAddKeyMap({ 'key': '<2-LeftMouse>', 'scope': 'all', 'callback': s.'activateAll' })
call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapCustomOpen, 'scope':'FileNode', 'callback': s."customOpenFile"}) call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapCustomOpen, 'scope':'FileNode', 'callback': s.'customOpenFile'})
call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapCustomOpen, 'scope':'DirNode', 'callback': s."customOpenDir"}) call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapCustomOpen, 'scope':'DirNode', 'callback': s.'customOpenDir'})
call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapCustomOpen, 'scope':'Bookmark', 'callback': s."customOpenBookmark"}) call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapCustomOpen, 'scope':'Bookmark', 'callback': s.'customOpenBookmark'})
call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapCustomOpen, 'scope':'all', 'callback': s."activateAll" }) call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapCustomOpen, 'scope':'all', 'callback': s.'activateAll' })
call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapActivateNode, 'scope': "DirNode", 'callback': s."activateDirNode" }) call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapActivateNode, 'scope': 'DirNode', 'callback': s.'activateDirNode' })
call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapActivateNode, 'scope': "FileNode", 'callback': s."activateFileNode" }) call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapActivateNode, 'scope': 'FileNode', 'callback': s.'activateFileNode' })
call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapActivateNode, 'scope': "Bookmark", 'callback': s."activateBookmark" }) call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapActivateNode, 'scope': 'Bookmark', 'callback': s.'activateBookmark' })
call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapPreview, 'scope': "Bookmark", 'callback': s."previewBookmark" }) call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapPreview, 'scope': 'Bookmark', 'callback': s.'previewBookmark' })
call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapActivateNode, 'scope': "all", 'callback': s."activateAll" }) call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapActivateNode, 'scope': 'all', 'callback': s.'activateAll' })
call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapOpenSplit, 'scope': "Node", 'callback': s."openHSplit" }) call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapOpenSplit, 'scope': 'Node', 'callback': s.'openHSplit' })
call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapOpenVSplit, 'scope': "Node", 'callback': s."openVSplit" }) call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapOpenVSplit, 'scope': 'Node', 'callback': s.'openVSplit' })
call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapPreview, 'scope': "Node", 'callback': s."previewNodeCurrent" }) call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapPreview, 'scope': 'Node', 'callback': s.'previewNodeCurrent' })
call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapPreviewVSplit, 'scope': "Node", 'callback': s."previewNodeVSplit" }) call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapPreviewVSplit, 'scope': 'Node', 'callback': s.'previewNodeVSplit' })
call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapPreviewSplit, 'scope': "Node", 'callback': s."previewNodeHSplit" }) call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapPreviewSplit, 'scope': 'Node', 'callback': s.'previewNodeHSplit' })
call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapOpenRecursively, 'scope': "DirNode", 'callback': s."openNodeRecursively" }) call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapOpenRecursively, 'scope': 'DirNode', 'callback': s.'openNodeRecursively' })
call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapUpdir, 'scope': 'all', 'callback': s . 'upDirCurrentRootClosed' }) call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapUpdir, 'scope': 'all', 'callback': s . 'upDirCurrentRootClosed' })
call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapUpdirKeepOpen, 'scope': 'all', 'callback': s . 'upDirCurrentRootOpen' }) call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapUpdirKeepOpen, 'scope': 'all', 'callback': s . 'upDirCurrentRootOpen' })
call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapChangeRoot, 'scope': 'Node', 'callback': s . 'chRoot' }) call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapChangeRoot, 'scope': 'Node', 'callback': s . 'chRoot' })
call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapChdir, 'scope': "Node", 'callback': s."chCwd" }) call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapChdir, 'scope': 'Node', 'callback': s.'chCwd' })
call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapQuit, 'scope': "all", 'callback': s."closeTreeWindow" }) call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapQuit, 'scope': 'all', 'callback': s.'closeTreeWindow' })
call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapCWD, 'scope': "all", 'callback': "nerdtree#ui_glue#chRootCwd" }) call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapCWD, 'scope': 'all', 'callback': 'nerdtree#ui_glue#chRootCwd' })
call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapRefreshRoot, 'scope': "all", 'callback': s."refreshRoot" }) call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapRefreshRoot, 'scope': 'all', 'callback': s.'refreshRoot' })
call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapRefresh, 'scope': "Node", 'callback': s."refreshCurrent" }) call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapRefresh, 'scope': 'Node', 'callback': s.'refreshCurrent' })
call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapHelp, 'scope': "all", 'callback': s."displayHelp" }) call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapHelp, 'scope': 'all', 'callback': s.'displayHelp' })
call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapToggleZoom, 'scope': "all", 'callback': s."toggleZoom" }) call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapToggleZoom, 'scope': 'all', 'callback': s.'toggleZoom' })
call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapToggleHidden, 'scope': "all", 'callback': s."toggleShowHidden" }) call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapToggleHidden, 'scope': 'all', 'callback': s.'toggleShowHidden' })
call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapToggleFilters, 'scope': "all", 'callback': s."toggleIgnoreFilter" }) call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapToggleFilters, 'scope': 'all', 'callback': s.'toggleIgnoreFilter' })
call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapToggleFiles, 'scope': "all", 'callback': s."toggleShowFiles" }) call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapToggleFiles, 'scope': 'all', 'callback': s.'toggleShowFiles' })
call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapToggleBookmarks, 'scope': "all", 'callback': s."toggleShowBookmarks" }) call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapToggleBookmarks, 'scope': 'all', 'callback': s.'toggleShowBookmarks' })
call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapCloseDir, 'scope': "Node", 'callback': s."closeCurrentDir" }) call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapCloseDir, 'scope': 'Node', 'callback': s.'closeCurrentDir' })
call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapCloseChildren, 'scope': "DirNode", 'callback': s."closeChildren" }) call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapCloseChildren, 'scope': 'DirNode', 'callback': s.'closeChildren' })
call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapMenu, 'scope': "Node", 'callback': s."showMenu" }) call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapMenu, 'scope': 'Node', 'callback': s.'showMenu' })
call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapJumpParent, 'scope': "Node", 'callback': s."jumpToParent" }) call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapJumpParent, 'scope': 'Node', 'callback': s.'jumpToParent' })
call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapJumpFirstChild, 'scope': "Node", 'callback': s."jumpToFirstChild" }) call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapJumpFirstChild, 'scope': 'Node', 'callback': s.'jumpToFirstChild' })
call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapJumpLastChild, 'scope': "Node", 'callback': s."jumpToLastChild" }) call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapJumpLastChild, 'scope': 'Node', 'callback': s.'jumpToLastChild' })
call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapJumpRoot, 'scope': "all", 'callback': s."jumpToRoot" }) call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapJumpRoot, 'scope': 'all', 'callback': s.'jumpToRoot' })
call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapJumpNextSibling, 'scope': "Node", 'callback': s."jumpToNextSibling" }) call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapJumpNextSibling, 'scope': 'Node', 'callback': s.'jumpToNextSibling' })
call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapJumpPrevSibling, 'scope': "Node", 'callback': s."jumpToPrevSibling" }) call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapJumpPrevSibling, 'scope': 'Node', 'callback': s.'jumpToPrevSibling' })
call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapOpenInTab, 'scope': 'Node', 'callback': s . 'openInNewTab' }) call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapOpenInTab, 'scope': 'Node', 'callback': s . 'openInNewTab' })
call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapOpenInTabSilent, 'scope': 'Node', 'callback': s . 'openInNewTabSilent' }) call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapOpenInTabSilent, 'scope': 'Node', 'callback': s . 'openInNewTabSilent' })
call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapOpenInTab, 'scope': 'Bookmark', 'callback': s . 'openInNewTab' }) call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapOpenInTab, 'scope': 'Bookmark', 'callback': s . 'openInNewTab' })
call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapOpenInTabSilent, 'scope': 'Bookmark', 'callback': s . 'openInNewTabSilent' }) call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapOpenInTabSilent, 'scope': 'Bookmark', 'callback': s . 'openInNewTabSilent' })
call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapOpenExpl, 'scope': "DirNode", 'callback': s."openExplorer" }) call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapOpenExpl, 'scope': 'DirNode', 'callback': s.'openExplorer' })
call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapOpenExpl, 'scope': "FileNode", 'callback': s."openExplorer" }) call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapOpenExpl, 'scope': 'FileNode', 'callback': s.'openExplorer' })
call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapDeleteBookmark, 'scope': "Bookmark", 'callback': s."deleteBookmark" }) call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapDeleteBookmark, 'scope': 'Bookmark', 'callback': s.'deleteBookmark' })
endfunction endfunction
@@ -82,19 +82,19 @@ endfunction
"============================================================ "============================================================
"FUNCTION: s:customOpenFile() {{{1 "FUNCTION: s:customOpenFile() {{{1
" Open file node with the "custom" key, initially <CR>. " Open file node with the 'custom' key, initially <CR>.
function! s:customOpenFile(node) function! s:customOpenFile(node)
call a:node.activate(s:initCustomOpenArgs().file) call a:node.activate(s:initCustomOpenArgs().file)
endfunction endfunction
"FUNCTION: s:customOpenDir() {{{1 "FUNCTION: s:customOpenDir() {{{1
" Open directory node with the "custom" key, initially <CR>. " Open directory node with the 'custom' key, initially <CR>.
function! s:customOpenDir(node) function! s:customOpenDir(node)
call s:activateDirNode(a:node, s:initCustomOpenArgs().dir) call s:activateDirNode(a:node, s:initCustomOpenArgs().dir)
endfunction endfunction
"FUNCTION: s:customOpenBookmark() {{{1 "FUNCTION: s:customOpenBookmark() {{{1
" Open bookmark node with the "custom" key, initially <CR>. " Open bookmark node with the 'custom' key, initially <CR>.
function! s:customOpenBookmark(node) function! s:customOpenBookmark(node)
if a:node.path.isDirectory if a:node.path.isDirectory
call a:node.activate(b:NERDTree, s:initCustomOpenArgs().dir) call a:node.activate(b:NERDTree, s:initCustomOpenArgs().dir)
@@ -113,7 +113,7 @@ endfunction
"FUNCTION: s:activateAll() {{{1 "FUNCTION: s:activateAll() {{{1
"handle the user activating the updir line "handle the user activating the updir line
function! s:activateAll() function! s:activateAll()
if getline(".") ==# g:NERDTreeUI.UpDirLine() if getline('.') ==# g:NERDTreeUI.UpDirLine()
return nerdtree#ui_glue#upDir(0) return nerdtree#ui_glue#upDir(0)
endif endif
endfunction endfunction
@@ -155,10 +155,10 @@ function! nerdtree#ui_glue#bookmarkNode(...)
call currentNode.bookmark(name) call currentNode.bookmark(name)
call b:NERDTree.render() call b:NERDTree.render()
catch /^NERDTree.IllegalBookmarkNameError/ catch /^NERDTree.IllegalBookmarkNameError/
call nerdtree#echo("bookmark names must not contain spaces") call nerdtree#echo('bookmark names must not contain spaces')
endtry endtry
else else
call nerdtree#echo("select a node first") call nerdtree#echo('select a node first')
endif endif
endfunction endfunction
@@ -167,7 +167,7 @@ function! s:chCwd(node)
try try
call a:node.path.changeToDir() call a:node.path.changeToDir()
catch /^NERDTree.PathChangeError/ catch /^NERDTree.PathChangeError/
call nerdtree#echoWarning("could not change cwd") call nerdtree#echoWarning('could not change cwd')
endtry endtry
endfunction endfunction
@@ -237,12 +237,12 @@ endfunction
" close the tree window " close the tree window
function! s:closeTreeWindow() function! s:closeTreeWindow()
if b:NERDTree.isWinTree() && b:NERDTree.previousBuf() != -1 if b:NERDTree.isWinTree() && b:NERDTree.previousBuf() != -1
exec "buffer " . b:NERDTree.previousBuf() exec 'buffer ' . b:NERDTree.previousBuf()
else else
if winnr("$") > 1 if winnr('$') > 1
call g:NERDTree.Close() call g:NERDTree.Close()
else else
call nerdtree#echo("Cannot close last window") call nerdtree#echo('Cannot close last window')
endif endif
endif endif
endfunction endfunction
@@ -250,8 +250,8 @@ endfunction
" FUNCTION: s:deleteBookmark(bookmark) {{{1 " FUNCTION: s:deleteBookmark(bookmark) {{{1
" Prompt the user to confirm the deletion of the selected bookmark. " Prompt the user to confirm the deletion of the selected bookmark.
function! s:deleteBookmark(bookmark) function! s:deleteBookmark(bookmark)
let l:message = "Delete the bookmark \"" . a:bookmark.name let l:message = 'Delete the bookmark "' . a:bookmark.name
\ . "\" from the bookmark list?" \ . '" from the bookmark list?'
let l:choices = "&Yes\n&No" let l:choices = "&Yes\n&No"
@@ -340,8 +340,8 @@ function! s:handleLeftClick()
"the dir arrows are multibyte chars, and vim's string functions only "the dir arrows are multibyte chars, and vim's string functions only
"deal with single bytes - so split the line up with the hack below and "deal with single bytes - so split the line up with the hack below and
"take the line substring manually "take the line substring manually
let line = split(getline(line(".")), '\zs') let line = split(getline(line('.')), '\zs')
let startToCur = "" let startToCur = ''
for i in range(0,len(line)-1) for i in range(0,len(line)-1)
let startToCur .= line[i] let startToCur .= line[i]
endfor endfor
@@ -483,7 +483,7 @@ endfunction
" FUNCTION: nerdtree#ui_glue#openBookmark(name) {{{1 " FUNCTION: nerdtree#ui_glue#openBookmark(name) {{{1
" Open the Bookmark that has the specified name. This function provides the " Open the Bookmark that has the specified name. This function provides the
" implementation for the ":OpenBookmark" command. " implementation for the :OpenBookmark command.
function! nerdtree#ui_glue#openBookmark(name) function! nerdtree#ui_glue#openBookmark(name)
try try
let l:bookmark = g:NERDTreeBookmark.BookmarkFor(a:name) let l:bookmark = g:NERDTreeBookmark.BookmarkFor(a:name)
@@ -527,10 +527,10 @@ endfunction
" FUNCTION: s:openNodeRecursively(node) {{{1 " FUNCTION: s:openNodeRecursively(node) {{{1
function! s:openNodeRecursively(node) function! s:openNodeRecursively(node)
call nerdtree#echo("Recursively opening node. Please wait...") call nerdtree#echo('Recursively opening node. Please wait...')
call a:node.openRecursively() call a:node.openRecursively()
call b:NERDTree.render() call b:NERDTree.render()
call nerdtree#echo("") call nerdtree#echo('')
endfunction endfunction
" FUNCTION: s:previewBookmark(bookmark) {{{1 " FUNCTION: s:previewBookmark(bookmark) {{{1
@@ -564,7 +564,7 @@ function! nerdtree#ui_glue#revealBookmark(name)
let targetNode = g:NERDTreeBookmark.GetNodeForName(a:name, 0, b:NERDTree) let targetNode = g:NERDTreeBookmark.GetNodeForName(a:name, 0, b:NERDTree)
call targetNode.putCursorHere(0, 1) call targetNode.putCursorHere(0, 1)
catch /^NERDTree.BookmarkNotFoundError/ catch /^NERDTree.BookmarkNotFoundError/
call nerdtree#echo("Bookmark isnt cached under the current root") call nerdtree#echo('Bookmark isnt cached under the current root')
endtry endtry
endfunction endfunction
@@ -575,15 +575,15 @@ function! s:refreshRoot()
if !g:NERDTree.IsOpen() if !g:NERDTree.IsOpen()
return return
endif endif
call nerdtree#echo("Refreshing the root node. This could take a while...") call nerdtree#echo('Refreshing the root node. This could take a while...')
let l:curWin = winnr() let l:curWin = winnr()
call nerdtree#exec(g:NERDTree.GetWinNum() . "wincmd w", 1) call nerdtree#exec(g:NERDTree.GetWinNum() . 'wincmd w', 1)
call b:NERDTree.root.refresh() call b:NERDTree.root.refresh()
call b:NERDTree.render() call b:NERDTree.render()
redraw redraw
call nerdtree#exec(l:curWin . "wincmd w", 1) call nerdtree#exec(l:curWin . 'wincmd w', 1)
call nerdtree#echo("") call nerdtree#echo('')
endfunction endfunction
" FUNCTION: s:refreshCurrent(node) {{{1 " FUNCTION: s:refreshCurrent(node) {{{1
@@ -594,10 +594,10 @@ function! s:refreshCurrent(node)
let node = node.parent let node = node.parent
endif endif
call nerdtree#echo("Refreshing node. This could take a while...") call nerdtree#echo('Refreshing node. This could take a while...')
call node.refresh() call node.refresh()
call b:NERDTree.render() call b:NERDTree.render()
call nerdtree#echo("") call nerdtree#echo('')
endfunction endfunction
" FUNCTION: nerdtree#ui_glue#setupCommands() {{{1 " FUNCTION: nerdtree#ui_glue#setupCommands() {{{1
@@ -615,7 +615,7 @@ endfunction
" Function: s:SID() {{{1 " Function: s:SID() {{{1
function s:SID() function s:SID()
if !exists("s:sid") if !exists('s:sid')
let s:sid = matchstr(expand('<sfile>'), '<SNR>\zs\d\+\ze_SID$') let s:sid = matchstr(expand('<sfile>'), '<SNR>\zs\d\+\ze_SID$')
endif endif
return s:sid return s:sid

34
lib/nerdtree/bookmark.vim
View File

@@ -33,7 +33,7 @@ endfunction
" Class method to get all bookmarks. Lazily initializes the bookmarks global " Class method to get all bookmarks. Lazily initializes the bookmarks global
" variable " variable
function! s:Bookmark.Bookmarks() function! s:Bookmark.Bookmarks()
if !exists("g:NERDTreeBookmarks") if !exists('g:NERDTreeBookmarks')
let g:NERDTreeBookmarks = [] let g:NERDTreeBookmarks = []
endif endif
return g:NERDTreeBookmarks return g:NERDTreeBookmarks
@@ -53,7 +53,7 @@ endfunction
" FUNCTION: Bookmark.BookmarkFor(name) {{{1 " FUNCTION: Bookmark.BookmarkFor(name) {{{1
" Class method that returns the Bookmark object having the specified name. " Class method that returns the Bookmark object having the specified name.
" Throws "NERDTree.BookmarkNotFoundError" if no Bookmark is found. " Throws NERDTree.BookmarkNotFoundError if no Bookmark is found.
function! s:Bookmark.BookmarkFor(name) function! s:Bookmark.BookmarkFor(name)
let l:result = {} let l:result = {}
for l:bookmark in s:Bookmark.Bookmarks() for l:bookmark in s:Bookmark.Bookmarks()
@@ -111,7 +111,7 @@ function! s:Bookmark.CacheBookmarks(silent)
if invalidBookmarksFound if invalidBookmarksFound
call s:Bookmark.Write() call s:Bookmark.Write()
if !a:silent if !a:silent
call nerdtree#echo(invalidBookmarksFound . " invalid bookmarks were read. See :help NERDTreeInvalidBookmarks for info.") call nerdtree#echo(invalidBookmarksFound . ' invalid bookmarks were read. See :help NERDTreeInvalidBookmarks for info.')
endif endif
endif endif
endif endif
@@ -120,7 +120,7 @@ endfunction
" FUNCTION: Bookmark.CompareBookmarksByName(firstBookmark, secondBookmark) {{{1 " FUNCTION: Bookmark.CompareBookmarksByName(firstBookmark, secondBookmark) {{{1
" Class method that indicates the relative position of two bookmarks when " Class method that indicates the relative position of two bookmarks when
" placed in alphabetical order by name. Case-sensitivity is determined by an " placed in alphabetical order by name. Case-sensitivity is determined by an
" option. Supports the "s:Bookmark.SortBookmarksList()" method. " option. Supports the s:Bookmark.SortBookmarksList() method.
function! s:Bookmark.CompareBookmarksByName(firstBookmark, secondBookmark) function! s:Bookmark.CompareBookmarksByName(firstBookmark, secondBookmark)
let l:result = 0 let l:result = 0
if g:NERDTreeBookmarksSort == 1 if g:NERDTreeBookmarksSort == 1
@@ -159,13 +159,13 @@ endfunction
" FUNCTION: s:Edit() {{{1 " FUNCTION: s:Edit() {{{1
" opens the NERDTreeBookmarks file for manual editing " opens the NERDTreeBookmarks file for manual editing
function! s:Bookmark.Edit() function! s:Bookmark.Edit()
call nerdtree#exec("wincmd w", 1) call nerdtree#exec('wincmd w', 1)
call nerdtree#exec("edit ".g:NERDTreeBookmarksFile, 1) call nerdtree#exec('edit '.g:NERDTreeBookmarksFile, 1)
endfunction endfunction
" FUNCTION: Bookmark.getNode(nerdtree, searchFromAbsoluteRoot) {{{1 " FUNCTION: Bookmark.getNode(nerdtree, searchFromAbsoluteRoot) {{{1
" Returns the tree node object associated with this Bookmark. " Returns the tree node object associated with this Bookmark.
" Throws "NERDTree.BookmarkedNodeNotFoundError" if the node is not found. " Throws NERDTree.BookmarkedNodeNotFoundError if the node is not found.
" "
" Args: " Args:
" searchFromAbsoluteRoot: boolean flag, search from the highest cached node " searchFromAbsoluteRoot: boolean flag, search from the highest cached node
@@ -185,8 +185,8 @@ endfunction
" FUNCTION: Bookmark.GetNodeForName(name, searchFromAbsoluteRoot, nerdtree) {{{1 " FUNCTION: Bookmark.GetNodeForName(name, searchFromAbsoluteRoot, nerdtree) {{{1
" Class method that returns the tree node object for the Bookmark with the " Class method that returns the tree node object for the Bookmark with the
" given name. Throws "NERDTree.BookmarkNotFoundError" if a Bookmark with the " given name. Throws NERDTree.BookmarkNotFoundError if a Bookmark with the
" name does not exist. Throws "NERDTree.BookmarkedNodeNotFoundError" if a " name does not exist. Throws NERDTree.BookmarkedNodeNotFoundError if a
" tree node for the named Bookmark could not be found. " tree node for the named Bookmark could not be found.
function! s:Bookmark.GetNodeForName(name, searchFromAbsoluteRoot, nerdtree) function! s:Bookmark.GetNodeForName(name, searchFromAbsoluteRoot, nerdtree)
let l:bookmark = s:Bookmark.BookmarkFor(a:name) let l:bookmark = s:Bookmark.BookmarkFor(a:name)
@@ -196,7 +196,7 @@ endfunction
" FUNCTION: Bookmark.GetSelected() {{{1 " FUNCTION: Bookmark.GetSelected() {{{1
" returns the Bookmark the cursor is over, or {} " returns the Bookmark the cursor is over, or {}
function! s:Bookmark.GetSelected() function! s:Bookmark.GetSelected()
let line = getline(".") let line = getline('.')
let name = substitute(line, '^>\(.\{-}\) .\+$', '\1', '') let name = substitute(line, '^>\(.\{-}\) .\+$', '\1', '')
if name != line if name != line
try try
@@ -212,7 +212,7 @@ endfunction
" Class method to get all invalid bookmark strings read from the bookmarks " Class method to get all invalid bookmark strings read from the bookmarks
" file " file
function! s:Bookmark.InvalidBookmarks() function! s:Bookmark.InvalidBookmarks()
if !exists("g:NERDTreeInvalidBookmarks") if !exists('g:NERDTreeInvalidBookmarks')
let g:NERDTreeInvalidBookmarks = [] let g:NERDTreeInvalidBookmarks = []
endif endif
return g:NERDTreeInvalidBookmarks return g:NERDTreeInvalidBookmarks
@@ -222,8 +222,8 @@ endfunction
function! s:Bookmark.mustExist() function! s:Bookmark.mustExist()
if !self.path.exists() if !self.path.exists()
call s:Bookmark.CacheBookmarks(1) call s:Bookmark.CacheBookmarks(1)
throw "NERDTree.BookmarkPointsToInvalidLocationError: the bookmark \"". throw 'NERDTree.BookmarkPointsToInvalidLocationError: the bookmark "'.
\ self.name ."\" points to a non existing location: \"". self.path.str() \ self.name .'" points to a non existing location: "'. self.path.str()
endif endif
endfunction endfunction
@@ -231,7 +231,7 @@ endfunction
" Create a new bookmark object with the given name and path object " Create a new bookmark object with the given name and path object
function! s:Bookmark.New(name, path) function! s:Bookmark.New(name, path)
if a:name =~# ' ' if a:name =~# ' '
throw "NERDTree.IllegalBookmarkNameError: illegal name:" . a:name throw 'NERDTree.IllegalBookmarkNameError: illegal name:' . a:name
endif endif
let newBookmark = copy(self) let newBookmark = copy(self)
@@ -335,7 +335,7 @@ function! s:Bookmark.validate()
return 1 return 1
else else
call s:Bookmark.CacheBookmarks(1) call s:Bookmark.CacheBookmarks(1)
call nerdtree#echo(self.name . "now points to an invalid location. See :help NERDTreeInvalidBookmarks for info.") call nerdtree#echo(self.name . 'now points to an invalid location. See :help NERDTreeInvalidBookmarks for info.')
return 0 return 0
endif endif
endfunction endfunction
@@ -349,7 +349,7 @@ function! s:Bookmark.Write()
endfor endfor
"add a blank line before the invalid ones "add a blank line before the invalid ones
call add(bookmarkStrings, "") call add(bookmarkStrings, '')
for j in s:Bookmark.InvalidBookmarks() for j in s:Bookmark.InvalidBookmarks()
call add(bookmarkStrings, j) call add(bookmarkStrings, j)
@@ -358,7 +358,7 @@ function! s:Bookmark.Write()
try try
call writefile(bookmarkStrings, g:NERDTreeBookmarksFile) call writefile(bookmarkStrings, g:NERDTreeBookmarksFile)
catch catch
call nerdtree#echoError("Failed to write bookmarks file. Make sure g:NERDTreeBookmarksFile points to a valid location.") call nerdtree#echoError('Failed to write bookmarks file. Make sure g:NERDTreeBookmarksFile points to a valid location.')
endtry endtry
endfunction endfunction

30
lib/nerdtree/creator.vim
View File

@@ -82,20 +82,20 @@ function! s:Creator.createWindowTree(dir)
try try
let path = g:NERDTreePath.New(a:dir) let path = g:NERDTreePath.New(a:dir)
catch /^NERDTree.InvalidArgumentsError/ catch /^NERDTree.InvalidArgumentsError/
call nerdtree#echo("Invalid directory name:" . a:dir) call nerdtree#echo('Invalid directory name:' . a:dir)
return return
endtry endtry
"we want the directory buffer to disappear when we do the :edit below "we want the directory buffer to disappear when we do the :edit below
setlocal bufhidden=wipe setlocal bufhidden=wipe
let previousBuf = expand("#") let previousBuf = expand('#')
"we need a unique name for each window tree buffer to ensure they are "we need a unique name for each window tree buffer to ensure they are
"all independent "all independent
exec g:NERDTreeCreatePrefix . " edit " . self._nextBufferName() exec g:NERDTreeCreatePrefix . ' edit ' . self._nextBufferName()
call self._createNERDTree(path, "window") call self._createNERDTree(path, 'window')
let b:NERDTree._previousBuf = bufnr(previousBuf) let b:NERDTree._previousBuf = bufnr(previousBuf)
call self._setCommonBufOptions() call self._setCommonBufOptions()
@@ -109,7 +109,7 @@ function! s:Creator._createNERDTree(path, type)
let b:NERDTree = g:NERDTree.New(a:path, a:type) let b:NERDTree = g:NERDTree.New(a:path, a:type)
" TODO: This assignment is kept for compatibility reasons. Many other " TODO: This assignment is kept for compatibility reasons. Many other
" plugins use "b:NERDTreeRoot" instead of "b:NERDTree.root". Remove this " plugins use b:NERDTreeRoot instead of b:NERDTree.root. Remove this
" assignment in the future. " assignment in the future.
let b:NERDTreeRoot = b:NERDTree.root let b:NERDTreeRoot = b:NERDTree.root
@@ -126,9 +126,9 @@ endfunction
function! s:Creator.createMirror() function! s:Creator.createMirror()
"get the names off all the nerd tree buffers "get the names off all the nerd tree buffers
let treeBufNames = [] let treeBufNames = []
for i in range(1, tabpagenr("$")) for i in range(1, tabpagenr('$'))
let nextName = self._tabpagevar(i, 'NERDTreeBufName') let nextName = self._tabpagevar(i, 'NERDTreeBufName')
if nextName != -1 && (!exists("t:NERDTreeBufName") || nextName != t:NERDTreeBufName) if nextName != -1 && (!exists('t:NERDTreeBufName') || nextName != t:NERDTreeBufName)
call add(treeBufNames, nextName) call add(treeBufNames, nextName)
endif endif
endfor endfor
@@ -140,7 +140,7 @@ function! s:Creator.createMirror()
let i = 0 let i = 0
while i < len(treeBufNames) while i < len(treeBufNames)
let bufName = treeBufNames[i] let bufName = treeBufNames[i]
let treeRoot = getbufvar(bufName, "NERDTree").root let treeRoot = getbufvar(bufName, 'NERDTree').root
let options[i+1 . '. ' . treeRoot.path.str() . ' (buf name: ' . bufName . ')'] = bufName let options[i+1 . '. ' . treeRoot.path.str() . ' (buf name: ' . bufName . ')'] = bufName
let i = i + 1 let i = i + 1
endwhile endwhile
@@ -148,7 +148,7 @@ function! s:Creator.createMirror()
"work out which tree to mirror, if there is more than 1 then ask the user "work out which tree to mirror, if there is more than 1 then ask the user
let bufferName = '' let bufferName = ''
if len(keys(options)) > 1 if len(keys(options)) > 1
let choices = ["Choose a tree to mirror"] let choices = ['Choose a tree to mirror']
let choices = extend(choices, sort(keys(options))) let choices = extend(choices, sort(keys(options)))
let choice = inputlist(choices) let choice = inputlist(choices)
if choice < 1 || choice > len(options) || choice ==# '' if choice < 1 || choice > len(options) || choice ==# ''
@@ -159,7 +159,7 @@ function! s:Creator.createMirror()
elseif len(keys(options)) ==# 1 elseif len(keys(options)) ==# 1
let bufferName = values(options)[0] let bufferName = values(options)[0]
else else
call nerdtree#echo("No trees to mirror") call nerdtree#echo('No trees to mirror')
return return
endif endif
@@ -227,7 +227,7 @@ endfunction
" FUNCTION: s:Creator._nextBufferNumber() {{{1 " FUNCTION: s:Creator._nextBufferNumber() {{{1
" the number to add to the nerd tree buffer name to make the buf name unique " the number to add to the nerd tree buffer name to make the buf name unique
function! s:Creator._nextBufferNumber() function! s:Creator._nextBufferNumber()
if !exists("s:Creator._NextBufNum") if !exists('s:Creator._NextBufNum')
let s:Creator._NextBufNum = 1 let s:Creator._NextBufNum = 1
else else
let s:Creator._NextBufNum += 1 let s:Creator._NextBufNum += 1
@@ -254,7 +254,7 @@ function! s:Creator._pathForString(str)
try try
let path = g:NERDTreePath.New(dir) let path = g:NERDTreePath.New(dir)
catch /^NERDTree.InvalidArgumentsError/ catch /^NERDTree.InvalidArgumentsError/
call nerdtree#echo("No bookmark or directory found for: " . a:str) call nerdtree#echo('No bookmark or directory found for: ' . a:str)
return {} return {}
endtry endtry
endif endif
@@ -274,7 +274,7 @@ function! s:Creator._removeTreeBufForTab()
"nerdtree buf may be mirrored/displayed elsewhere "nerdtree buf may be mirrored/displayed elsewhere
if self._isBufHidden(buf) if self._isBufHidden(buf)
exec "bwipeout " . buf exec 'bwipeout ' . buf
endif endif
endif endif
@@ -333,12 +333,12 @@ function! s:Creator._tabpagevar(tabnr, var)
let old_ei = &ei let old_ei = &ei
set ei=all set ei=all
exec "tabnext " . a:tabnr exec 'tabnext ' . a:tabnr
let v = -1 let v = -1
if exists('t:' . a:var) if exists('t:' . a:var)
exec 'let v = t:' . a:var exec 'let v = t:' . a:var
endif endif
exec "tabnext " . currentTab exec 'tabnext ' . currentTab
let &ei = old_ei let &ei = old_ei

4
lib/nerdtree/flag_set.vim
View File

@@ -43,13 +43,13 @@ endfunction
"FUNCTION: FlagSet.renderToString() {{{1 "FUNCTION: FlagSet.renderToString() {{{1
function! s:FlagSet.renderToString() function! s:FlagSet.renderToString()
let flagstring = "" let flagstring = ''
for i in values(self._flags) for i in values(self._flags)
let flagstring .= join(i) let flagstring .= join(i)
endfor endfor
if len(flagstring) == 0 if len(flagstring) == 0
return "" return ''
endif endif
return '[' . flagstring . ']' return '[' . flagstring . ']'

22
lib/nerdtree/key_map.vim
View File

@@ -53,7 +53,7 @@ function! s:KeyMap.bind()
endif endif
let keymapInvokeString = escape(keymapInvokeString, '\') let keymapInvokeString = escape(keymapInvokeString, '\')
let premap = self.key == "<LeftRelease>" ? " <LeftRelease>" : " " let premap = self.key == '<LeftRelease>' ? ' <LeftRelease>' : ' '
exec 'nnoremap <buffer> <silent> '. self.key . premap . ':call nerdtree#ui_glue#invokeKeyMap("'. keymapInvokeString .'")<cr>' exec 'nnoremap <buffer> <silent> '. self.key . premap . ':call nerdtree#ui_glue#invokeKeyMap("'. keymapInvokeString .'")<cr>'
endfunction endfunction
@@ -66,7 +66,7 @@ endfunction
"FUNCTION: KeyMap.invoke() {{{1 "FUNCTION: KeyMap.invoke() {{{1
"Call the KeyMaps callback function "Call the KeyMaps callback function
function! s:KeyMap.invoke(...) function! s:KeyMap.invoke(...)
let Callback = type(self.callback) == type(function("tr")) ? self.callback : function(self.callback) let Callback = type(self.callback) == type(function('tr')) ? self.callback : function(self.callback)
if a:0 if a:0
call Callback(a:1) call Callback(a:1)
else else
@@ -78,11 +78,11 @@ endfunction
"Find a keymapping for a:key and the current scope invoke it. "Find a keymapping for a:key and the current scope invoke it.
" "
"Scope is determined as follows: "Scope is determined as follows:
" * if the cursor is on a dir node then "DirNode" " * if the cursor is on a dir node then DirNode
" * if the cursor is on a file node then "FileNode" " * if the cursor is on a file node then FileNode
" * if the cursor is on a bookmark then "Bookmark" " * if the cursor is on a bookmark then Bookmark
" "
"If a keymap has the scope of "all" then it will be called if no other keymap "If a keymap has the scope of 'all' then it will be called if no other keymap
"is found for a:key and the scope. "is found for a:key and the scope.
function! s:KeyMap.Invoke(key) function! s:KeyMap.Invoke(key)
@@ -100,7 +100,7 @@ function! s:KeyMap.Invoke(key)
"try file node "try file node
if !node.path.isDirectory if !node.path.isDirectory
let km = s:KeyMap.FindFor(a:key, "FileNode") let km = s:KeyMap.FindFor(a:key, 'FileNode')
if !empty(km) if !empty(km)
return km.invoke(node) return km.invoke(node)
endif endif
@@ -108,14 +108,14 @@ function! s:KeyMap.Invoke(key)
"try dir node "try dir node
if node.path.isDirectory if node.path.isDirectory
let km = s:KeyMap.FindFor(a:key, "DirNode") let km = s:KeyMap.FindFor(a:key, 'DirNode')
if !empty(km) if !empty(km)
return km.invoke(node) return km.invoke(node)
endif endif
endif endif
"try generic node "try generic node
let km = s:KeyMap.FindFor(a:key, "Node") let km = s:KeyMap.FindFor(a:key, 'Node')
if !empty(km) if !empty(km)
return km.invoke(node) return km.invoke(node)
endif endif
@@ -125,14 +125,14 @@ function! s:KeyMap.Invoke(key)
"try bookmark "try bookmark
let bm = g:NERDTreeBookmark.GetSelected() let bm = g:NERDTreeBookmark.GetSelected()
if !empty(bm) if !empty(bm)
let km = s:KeyMap.FindFor(a:key, "Bookmark") let km = s:KeyMap.FindFor(a:key, 'Bookmark')
if !empty(km) if !empty(km)
return km.invoke(bm) return km.invoke(bm)
endif endif
endif endif
"try all "try all
let km = s:KeyMap.FindFor(a:key, "all") let km = s:KeyMap.FindFor(a:key, 'all')
if !empty(km) if !empty(km)
return km.invoke() return km.invoke()
endif endif

18
lib/nerdtree/menu_controller.vim
View File

@@ -44,7 +44,7 @@ function! s:MenuController.showMenu()
finally finally
call self._restoreOptions() call self._restoreOptions()
" Redraw when "Ctrl-C" or "Esc" is received. " Redraw when Ctrl-C or Esc is received.
if !l:done || self.selection == -1 if !l:done || self.selection == -1
redraw! redraw!
endif endif
@@ -58,25 +58,25 @@ endfunction
"FUNCTION: MenuController._echoPrompt() {{{1 "FUNCTION: MenuController._echoPrompt() {{{1
function! s:MenuController._echoPrompt() function! s:MenuController._echoPrompt()
let navHelp = "Use " . g:NERDTreeMenuDown . "/" . g:NERDTreeMenuUp . "/enter" let navHelp = 'Use ' . g:NERDTreeMenuDown . '/' . g:NERDTreeMenuUp . '/enter'
if self.isMinimal() if self.isMinimal()
let selection = self.menuItems[self.selection].text let selection = self.menuItems[self.selection].text
let keyword = matchstr(selection, "\([^ ]*") let keyword = matchstr(selection, '\([^ ]*')
let shortcuts = map(copy(self.menuItems), "v:val['shortcut']") let shortcuts = map(copy(self.menuItems), "v:val['shortcut']")
let shortcuts[self.selection] = " " . keyword . " " let shortcuts[self.selection] = ' ' . keyword . ' '
echo "Menu: [" . join(shortcuts, ",") . "] (" . navHelp . " or shortcut): " echo 'Menu: [' . join(shortcuts, ',') . '] (' . navHelp . ' or shortcut): '
else else
echo "NERDTree Menu. " . navHelp . ", or the shortcuts indicated" echo 'NERDTree Menu. ' . navHelp . ', or the shortcuts indicated'
echo "=========================================================" echo '========================================================='
for i in range(0, len(self.menuItems)-1) for i in range(0, len(self.menuItems)-1)
if self.selection == i if self.selection == i
echo "> " . self.menuItems[i].text echo '> ' . self.menuItems[i].text
else else
echo " " . self.menuItems[i].text echo ' ' . self.menuItems[i].text
endif endif
endfor endfor
endif endif

10
lib/nerdtree/menu_item.vim
View File

@@ -6,7 +6,7 @@ let g:NERDTreeMenuItem = s:MenuItem
"FUNCTION: MenuItem.All() {{{1 "FUNCTION: MenuItem.All() {{{1
"get all top level menu items "get all top level menu items
function! s:MenuItem.All() function! s:MenuItem.All()
if !exists("s:menuItems") if !exists('s:menuItems')
let s:menuItems = [] let s:menuItems = []
endif endif
return s:menuItems return s:menuItems
@@ -58,7 +58,7 @@ function! s:MenuItem.CreateSeparator(options)
let standard_options = { 'text': '--------------------', let standard_options = { 'text': '--------------------',
\ 'shortcut': -1, \ 'shortcut': -1,
\ 'callback': -1 } \ 'callback': -1 }
let options = extend(a:options, standard_options, "force") let options = extend(a:options, standard_options, 'force')
return s:MenuItem.Create(options) return s:MenuItem.Create(options)
endfunction endfunction
@@ -67,7 +67,7 @@ endfunction
"make a new submenu and add it to global list "make a new submenu and add it to global list
function! s:MenuItem.CreateSubmenu(options) function! s:MenuItem.CreateSubmenu(options)
let standard_options = { 'callback': -1 } let standard_options = { 'callback': -1 }
let options = extend(a:options, standard_options, "force") let options = extend(a:options, standard_options, 'force')
return s:MenuItem.Create(options) return s:MenuItem.Create(options)
endfunction endfunction
@@ -79,7 +79,7 @@ endfunction
"specified "specified
function! s:MenuItem.enabled() function! s:MenuItem.enabled()
if self.isActiveCallback != -1 if self.isActiveCallback != -1
return type(self.isActiveCallback) == type(function("tr")) ? self.isActiveCallback() : {self.isActiveCallback}() return type(self.isActiveCallback) == type(function('tr')) ? self.isActiveCallback() : {self.isActiveCallback}()
endif endif
return 1 return 1
endfunction endfunction
@@ -94,7 +94,7 @@ function! s:MenuItem.execute()
call mc.showMenu() call mc.showMenu()
else else
if self.callback != -1 if self.callback != -1
if type(self.callback) == type(function("tr")) if type(self.callback) == type(function('tr'))
call self.callback() call self.callback()
else else
call {self.callback}() call {self.callback}()

38
lib/nerdtree/nerdtree.vim
View File

@@ -37,26 +37,26 @@ function! s:NERDTree.Close()
return return
endif endif
if winnr("$") != 1 if winnr('$') != 1
" Use the window ID to identify the currently active window or fall " Use the window ID to identify the currently active window or fall
" back on the buffer ID if win_getid/win_gotoid are not available, in " back on the buffer ID if win_getid/win_gotoid are not available, in
" which case we'll focus an arbitrary window showing the buffer. " which case we'll focus an arbitrary window showing the buffer.
let l:useWinId = exists('*win_getid') && exists('*win_gotoid') let l:useWinId = exists('*win_getid') && exists('*win_gotoid')
if winnr() == s:NERDTree.GetWinNum() if winnr() == s:NERDTree.GetWinNum()
call nerdtree#exec("wincmd p", 1) call nerdtree#exec('wincmd p', 1)
let l:activeBufOrWin = l:useWinId ? win_getid() : bufnr("") let l:activeBufOrWin = l:useWinId ? win_getid() : bufnr('')
call nerdtree#exec("wincmd p", 1) call nerdtree#exec('wincmd p', 1)
else else
let l:activeBufOrWin = l:useWinId ? win_getid() : bufnr("") let l:activeBufOrWin = l:useWinId ? win_getid() : bufnr('')
endif endif
call nerdtree#exec(s:NERDTree.GetWinNum() . " wincmd w", 1) call nerdtree#exec(s:NERDTree.GetWinNum() . ' wincmd w', 1)
call nerdtree#exec("close", 0) call nerdtree#exec('close', 0)
if l:useWinId if l:useWinId
call nerdtree#exec("call win_gotoid(" . l:activeBufOrWin . ")", 0) call nerdtree#exec('call win_gotoid(' . l:activeBufOrWin . ')', 0)
else else
call nerdtree#exec(bufwinnr(l:activeBufOrWin) . " wincmd w", 0) call nerdtree#exec(bufwinnr(l:activeBufOrWin) . ' wincmd w', 0)
endif endif
else else
close close
@@ -75,7 +75,7 @@ endfunction
"Places the cursor at the top of the bookmarks table "Places the cursor at the top of the bookmarks table
function! s:NERDTree.CursorToBookmarkTable() function! s:NERDTree.CursorToBookmarkTable()
if !b:NERDTree.ui.getShowBookmarks() if !b:NERDTree.ui.getShowBookmarks()
throw "NERDTree.IllegalOperationError: cant find bookmark table, bookmarks arent active" throw 'NERDTree.IllegalOperationError: cant find bookmark table, bookmarks arent active'
endif endif
if g:NERDTreeMinimalUI if g:NERDTreeMinimalUI
@@ -88,7 +88,7 @@ function! s:NERDTree.CursorToBookmarkTable()
while getline(line) !~# '^>-\+Bookmarks-\+$' while getline(line) !~# '^>-\+Bookmarks-\+$'
let line = line + 1 let line = line + 1
if line >= rootNodeLine if line >= rootNodeLine
throw "NERDTree.BookmarkTableNotFoundError: didnt find the bookmarks table" throw 'NERDTree.BookmarkTableNotFoundError: didnt find the bookmarks table'
endif endif
endwhile endwhile
call cursor(line, 2) call cursor(line, 2)
@@ -98,19 +98,19 @@ endfunction
"Places the cursor in the nerd tree window "Places the cursor in the nerd tree window
function! s:NERDTree.CursorToTreeWin() function! s:NERDTree.CursorToTreeWin()
call g:NERDTree.MustBeOpen() call g:NERDTree.MustBeOpen()
call nerdtree#exec(g:NERDTree.GetWinNum() . "wincmd w", 1) call nerdtree#exec(g:NERDTree.GetWinNum() . 'wincmd w', 1)
endfunction endfunction
" Function: s:NERDTree.ExistsForBuffer() {{{1 " Function: s:NERDTree.ExistsForBuffer() {{{1
" Returns 1 if a nerd tree root exists in the current buffer " Returns 1 if a nerd tree root exists in the current buffer
function! s:NERDTree.ExistsForBuf() function! s:NERDTree.ExistsForBuf()
return exists("b:NERDTree") return exists('b:NERDTree')
endfunction endfunction
" Function: s:NERDTree.ExistsForTab() {{{1 " Function: s:NERDTree.ExistsForTab() {{{1
" Returns 1 if a nerd tree root exists in the current tab " Returns 1 if a nerd tree root exists in the current tab
function! s:NERDTree.ExistsForTab() function! s:NERDTree.ExistsForTab()
if !exists("t:NERDTreeBufName") if !exists('t:NERDTreeBufName')
return return
end end
@@ -133,7 +133,7 @@ function! s:NERDTree.ForCurrentTab()
endif endif
let bufnr = bufnr(t:NERDTreeBufName) let bufnr = bufnr(t:NERDTreeBufName)
return getbufvar(bufnr, "NERDTree") return getbufvar(bufnr, 'NERDTree')
endfunction endfunction
"FUNCTION: s:NERDTree.getRoot() {{{1 "FUNCTION: s:NERDTree.getRoot() {{{1
@@ -144,7 +144,7 @@ endfunction
"FUNCTION: s:NERDTree.GetWinNum() {{{1 "FUNCTION: s:NERDTree.GetWinNum() {{{1
"gets the nerd tree window number for this tab "gets the nerd tree window number for this tab
function! s:NERDTree.GetWinNum() function! s:NERDTree.GetWinNum()
if exists("t:NERDTreeBufName") if exists('t:NERDTreeBufName')
return bufwinnr(t:NERDTreeBufName) return bufwinnr(t:NERDTreeBufName)
endif endif
@@ -165,18 +165,18 @@ endfunction
"FUNCTION: s:NERDTree.isTabTree() {{{1 "FUNCTION: s:NERDTree.isTabTree() {{{1
function! s:NERDTree.isTabTree() function! s:NERDTree.isTabTree()
return self._type == "tab" return self._type == 'tab'
endfunction endfunction
"FUNCTION: s:NERDTree.isWinTree() {{{1 "FUNCTION: s:NERDTree.isWinTree() {{{1
function! s:NERDTree.isWinTree() function! s:NERDTree.isWinTree()
return self._type == "window" return self._type == 'window'
endfunction endfunction
"FUNCTION: s:NERDTree.MustBeOpen() {{{1 "FUNCTION: s:NERDTree.MustBeOpen() {{{1
function! s:NERDTree.MustBeOpen() function! s:NERDTree.MustBeOpen()
if !s:NERDTree.IsOpen() if !s:NERDTree.IsOpen()
throw "NERDTree.TreeNotOpen" throw 'NERDTree.TreeNotOpen'
endif endif
endfunction endfunction

4
lib/nerdtree/notifier.vim
View File

@@ -15,13 +15,13 @@ function! s:Notifier.NotifyListeners(event, path, nerdtree, params)
let event = g:NERDTreeEvent.New(a: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) for Listener in s:Notifier.GetListenersForEvent(a:event)
let Callback = type(Listener) == type(function("tr")) ? Listener : function(Listener) let Callback = type(Listener) == type(function('tr')) ? Listener : function(Listener)
call Callback(event) call Callback(event)
endfor endfor
endfunction endfunction
function! s:Notifier.GetListenersMap() function! s:Notifier.GetListenersMap()
if !exists("s:refreshListenersMap") if !exists('s:refreshListenersMap')
let s:refreshListenersMap = {} let s:refreshListenersMap = {}
endif endif
return s:refreshListenersMap return s:refreshListenersMap

46
lib/nerdtree/opener.vim
View File

@@ -1,7 +1,7 @@
" ============================================================================ " ============================================================================
" CLASS: Opener " CLASS: Opener
" "
" The Opener class defines an API for "opening" operations. " The Opener class defines an API for 'opening' operations.
" ============================================================================ " ============================================================================
@@ -54,7 +54,7 @@ endfunction
" find the window number of the first normal window " find the window number of the first normal window
function! s:Opener._firstUsableWindow() function! s:Opener._firstUsableWindow()
let i = 1 let i = 1
while i <= winnr("$") while i <= winnr('$')
let bnum = winbufnr(i) let bnum = winbufnr(i)
if bnum != -1 && getbufvar(bnum, '&buftype') ==# '' if bnum != -1 && getbufvar(bnum, '&buftype') ==# ''
\ && !getwinvar(i, '&previewwindow') \ && !getwinvar(i, '&previewwindow')
@@ -102,15 +102,15 @@ endfunction
" winnumber: the number of the window in question " winnumber: the number of the window in question
function! s:Opener._isWindowUsable(winnumber) function! s:Opener._isWindowUsable(winnumber)
"gotta split if theres only one window (i.e. the NERD tree) "gotta split if theres only one window (i.e. the NERD tree)
if winnr("$") ==# 1 if winnr('$') ==# 1
return 0 return 0
endif endif
let oldwinnr = winnr() let oldwinnr = winnr()
call nerdtree#exec(a:winnumber . "wincmd p", 1) call nerdtree#exec(a:winnumber . 'wincmd p', 1)
let specialWindow = getbufvar("%", '&buftype') != '' || getwinvar('%', '&previewwindow') let specialWindow = getbufvar('%', '&buftype') != '' || getwinvar('%', '&previewwindow')
let modified = &modified let modified = &modified
call nerdtree#exec(oldwinnr . "wincmd p", 1) call nerdtree#exec(oldwinnr . 'wincmd p', 1)
"if its a special window e.g. quickfix or another explorer plugin then we "if its a special window e.g. quickfix or another explorer plugin then we
"have to split "have to split
@@ -131,9 +131,9 @@ endfunction
" a:path: the path object that is to be opened " a:path: the path object that is to be opened
" a:opts: a dictionary containing the following optional keys... " a:opts: a dictionary containing the following optional keys...
" 'where': specifies whether the node should be opened in new split, in " 'where': specifies whether the node should be opened in new split, in
" a new tab or, in the last window; takes values "v", "h", or "t" " a new tab or, in the last window; takes values 'v', 'h', or 't'
" 'reuse': if file is already shown in a window, jump there; takes values " 'reuse': if file is already shown in a window, jump there; takes values
" "all", "currenttab", or empty " 'all', 'currenttab', or empty
" 'keepopen': boolean (0 or 1); if true, the tree window will not be closed " 'keepopen': boolean (0 or 1); if true, the tree window will not be closed
" 'stay': boolean (0 or 1); if true, remain in tree window after opening " 'stay': boolean (0 or 1); if true, remain in tree window after opening
function! s:Opener.New(path, opts) function! s:Opener.New(path, opts)
@@ -153,21 +153,21 @@ endfunction
" FUNCTION: Opener._newSplit() {{{1 " FUNCTION: Opener._newSplit() {{{1
function! s:Opener._newSplit() function! s:Opener._newSplit()
let onlyOneWin = (winnr("$") ==# 1) let onlyOneWin = (winnr('$') ==# 1)
let savesplitright = &splitright let savesplitright = &splitright
if onlyOneWin if onlyOneWin
let &splitright = (g:NERDTreeWinPos ==# "left") let &splitright = (g:NERDTreeWinPos ==# 'left')
endif endif
" If only one window (ie. NERDTree), split vertically instead. " If only one window (ie. NERDTree), split vertically instead.
let splitMode = onlyOneWin ? "vertical" : "" let splitMode = onlyOneWin ? 'vertical' : ''
" Open the new window " Open the new window
try try
call nerdtree#exec('wincmd p', 1) call nerdtree#exec('wincmd p', 1)
call nerdtree#exec(splitMode . " split",1) call nerdtree#exec(splitMode . ' split',1)
catch /^Vim\%((\a\+)\)\=:E37/ catch /^Vim\%((\a\+)\)\=:E37/
call g:NERDTree.CursorToTreeWin() call g:NERDTree.CursorToTreeWin()
throw "NERDTree.FileAlreadyOpenAndModifiedError: ". self._path.str() ." is already open and modified." throw 'NERDTree.FileAlreadyOpenAndModifiedError: '. self._path.str() .' is already open and modified.'
catch /^Vim\%((\a\+)\)\=:/ catch /^Vim\%((\a\+)\)\=:/
"do nothing "do nothing
endtry endtry
@@ -187,10 +187,10 @@ endfunction
function! s:Opener._newVSplit() function! s:Opener._newVSplit()
let l:winwidth = winwidth('.') let l:winwidth = winwidth('.')
let onlyOneWin = (winnr("$") ==# 1) let onlyOneWin = (winnr('$') ==# 1)
let savesplitright = &splitright let savesplitright = &splitright
if onlyOneWin if onlyOneWin
let &splitright = (g:NERDTreeWinPos ==# "left") let &splitright = (g:NERDTreeWinPos ==# 'left')
let l:winwidth = g:NERDTreeWinSize let l:winwidth = g:NERDTreeWinSize
endif endif
@@ -219,7 +219,7 @@ endfunction
" FUNCTION: Opener._openFile() {{{1 " FUNCTION: Opener._openFile() {{{1
function! s:Opener._openFile() function! s:Opener._openFile()
if !self._stay && !and(g:NERDTreeQuitOnOpen,1) && exists("b:NERDTreeZoomed") && b:NERDTreeZoomed if !self._stay && !and(g:NERDTreeQuitOnOpen,1) && exists('b:NERDTreeZoomed') && b:NERDTreeZoomed
call b:NERDTree.ui.toggleZoom() call b:NERDTree.ui.toggleZoom()
endif endif
@@ -261,18 +261,18 @@ endfunction
" FUNCTION: Opener._previousWindow() {{{1 " FUNCTION: Opener._previousWindow() {{{1
function! s:Opener._previousWindow() function! s:Opener._previousWindow()
if !self._isWindowUsable(winnr("#")) && self._firstUsableWindow() ==# -1 if !self._isWindowUsable(winnr('#')) && self._firstUsableWindow() ==# -1
call self._newSplit() call self._newSplit()
else else
try try
if !self._isWindowUsable(winnr("#")) if !self._isWindowUsable(winnr('#'))
call nerdtree#exec(self._firstUsableWindow() . "wincmd w", 1) call nerdtree#exec(self._firstUsableWindow() . 'wincmd w', 1)
else else
call nerdtree#exec('wincmd p', 1) call nerdtree#exec('wincmd p', 1)
endif endif
catch /^Vim\%((\a\+)\)\=:E37/ catch /^Vim\%((\a\+)\)\=:E37/
call g:NERDTree.CursorToTreeWin() call g:NERDTree.CursorToTreeWin()
throw "NERDTree.FileAlreadyOpenAndModifiedError: ". self._path.str() ." is already open and modified." throw 'NERDTree.FileAlreadyOpenAndModifiedError: '. self._path.str() .' is already open and modified.'
catch /^Vim\%((\a\+)\)\=:/ catch /^Vim\%((\a\+)\)\=:/
echo v:exception echo v:exception
endtry endtry
@@ -297,7 +297,7 @@ function! s:Opener._reuseWindow()
"check the current tab for the window "check the current tab for the window
let winnr = bufwinnr('^' . self._path.str() . '$') let winnr = bufwinnr('^' . self._path.str() . '$')
if winnr != -1 if winnr != -1
call nerdtree#exec(winnr . "wincmd w", 0) call nerdtree#exec(winnr . 'wincmd w', 0)
call self._checkToCloseTree(0) call self._checkToCloseTree(0)
return 1 return 1
endif endif
@@ -312,7 +312,7 @@ function! s:Opener._reuseWindow()
call self._checkToCloseTree(1) call self._checkToCloseTree(1)
call nerdtree#exec(tabnr . 'tabnext', 1) call nerdtree#exec(tabnr . 'tabnext', 1)
let winnr = bufwinnr('^' . self._path.str() . '$') let winnr = bufwinnr('^' . self._path.str() . '$')
call nerdtree#exec(winnr . "wincmd w", 0) call nerdtree#exec(winnr . 'wincmd w', 0)
return 1 return 1
endif endif
@@ -321,7 +321,7 @@ endfunction
" FUNCTION: Opener._saveCursorPos() {{{1 " FUNCTION: Opener._saveCursorPos() {{{1
function! s:Opener._saveCursorPos() function! s:Opener._saveCursorPos()
let self._bufnr = bufnr("") let self._bufnr = bufnr('')
let self._tabnr = tabpagenr() let self._tabnr = tabpagenr()
endfunction endfunction

46
lib/nerdtree/path.vim
View File

@@ -37,7 +37,7 @@ endfunction
" FUNCTION: Path.bookmarkNames() {{{1 " FUNCTION: Path.bookmarkNames() {{{1
function! s:Path.bookmarkNames() function! s:Path.bookmarkNames()
if !exists("self._bookmarkNames") if !exists('self._bookmarkNames')
call self.cacheDisplayString() call self.cacheDisplayString()
endif endif
return self._bookmarkNames return self._bookmarkNames
@@ -87,22 +87,22 @@ function! s:Path.changeToDir()
endif endif
try try
if g:NERDTreeUseTCD && exists(":tcd") == 2 if g:NERDTreeUseTCD && exists(':tcd') == 2
execute "tcd " . dir execute 'tcd ' . dir
call nerdtree#echo("Tab's CWD is now: " . getcwd()) call nerdtree#echo("Tab's CWD is now: " . getcwd())
else else
execute "cd " . dir execute 'cd ' . dir
call nerdtree#echo("CWD is now: " . getcwd()) call nerdtree#echo('CWD is now: ' . getcwd())
endif endif
catch catch
throw "NERDTree.PathChangeError: cannot change CWD to " . dir throw 'NERDTree.PathChangeError: cannot change CWD to ' . dir
endtry endtry
endfunction endfunction
" FUNCTION: Path.compareTo() {{{1 " FUNCTION: Path.compareTo() {{{1
" "
" Compares this Path to the given path and returns 0 if they are equal, -1 if " Compares this Path to the given path and returns 0 if they are equal, -1 if
" this Path is "less than" the given path, or 1 if it is "greater". " this Path is 'less than' the given path, or 1 if it is 'greater'.
" "
" Args: " Args:
" path: the path object to compare this to " path: the path object to compare this to
@@ -188,7 +188,7 @@ endfunction
" dest: the location to copy this dir/file to " dest: the location to copy this dir/file to
function! s:Path.copy(dest) function! s:Path.copy(dest)
if !s:Path.CopyingSupported() if !s:Path.CopyingSupported()
throw "NERDTree.CopyingNotSupportedError: Copying is not supported on this OS" throw 'NERDTree.CopyingNotSupportedError: Copying is not supported on this OS'
endif endif
call s:Path.createParentDirectories(a:dest) call s:Path.createParentDirectories(a:dest)
@@ -199,10 +199,10 @@ function! s:Path.copy(dest)
let cmd_prefix = (self.isDirectory ? g:NERDTreeCopyDirCmd : g:NERDTreeCopyFileCmd) let cmd_prefix = (self.isDirectory ? g:NERDTreeCopyDirCmd : g:NERDTreeCopyFileCmd)
endif endif
let cmd = cmd_prefix . " " . escape(self.str(), self._escChars()) . " " . escape(a:dest, self._escChars()) let cmd = cmd_prefix . ' ' . escape(self.str(), self._escChars()) . ' ' . escape(a:dest, self._escChars())
let success = system(cmd) let success = system(cmd)
if v:shell_error != 0 if v:shell_error != 0
throw "NERDTree.CopyError: Could not copy ''". self.str() ."'' to: '" . a:dest . "'" throw "NERDTree.CopyError: Could not copy '". self.str() ."' to: '" . a:dest . "'"
endif endif
endfunction endfunction
@@ -286,7 +286,7 @@ endfunction
" Returns a string that specifies how the path should be represented as a " Returns a string that specifies how the path should be represented as a
" string " string
function! s:Path.displayString() function! s:Path.displayString()
if self.cachedDisplayString ==# "" if self.cachedDisplayString ==# ''
call self.cacheDisplayString() call self.cacheDisplayString()
endif endif
@@ -295,7 +295,7 @@ endfunction
" FUNCTION: Path.edit() {{{1 " FUNCTION: Path.edit() {{{1
function! s:Path.edit() function! s:Path.edit()
exec "edit " . self.str({'format': 'Edit'}) exec 'edit ' . self.str({'format': 'Edit'})
endfunction endfunction
" FUNCTION: Path.extractDriveLetter(fullpath) {{{1 " FUNCTION: Path.extractDriveLetter(fullpath) {{{1
@@ -306,7 +306,7 @@ function! s:Path.extractDriveLetter(fullpath)
if a:fullpath =~ '^\(\\\\\|\/\/\)' if a:fullpath =~ '^\(\\\\\|\/\/\)'
"For network shares, the 'drive' consists of the first two parts of the path, i.e. \\boxname\share "For network shares, the 'drive' consists of the first two parts of the path, i.e. \\boxname\share
let self.drive = substitute(a:fullpath, '^\(\(\\\\\|\/\/\)[^\\\/]*\(\\\|\/\)[^\\\/]*\).*', '\1', '') let self.drive = substitute(a:fullpath, '^\(\(\\\\\|\/\/\)[^\\\/]*\(\\\|\/\)[^\\\/]*\).*', '\1', '')
let self.drive = substitute(self.drive, '/', '\', "g") let self.drive = substitute(self.drive, '/', '\', 'g')
else else
let self.drive = substitute(a:fullpath, '\(^[a-zA-Z]:\).*', '\1', '') let self.drive = substitute(a:fullpath, '\(^[a-zA-Z]:\).*', '\1', '')
endif endif
@@ -413,7 +413,7 @@ endfunction
" FUNCTION: Path.getSortKey() {{{1 " FUNCTION: Path.getSortKey() {{{1
" returns a key used in compare function for sorting " returns a key used in compare function for sorting
function! s:Path.getSortKey() function! s:Path.getSortKey()
if !exists("self._sortKey") || g:NERDTreeSortOrder !=# g:NERDTreeOldSortOrder if !exists('self._sortKey') || g:NERDTreeSortOrder !=# g:NERDTreeOldSortOrder
" Look for file metadata tags: [[timestamp]], [[extension]], [[size]] " Look for file metadata tags: [[timestamp]], [[extension]], [[size]]
let metadata = [] let metadata = []
for tag in g:NERDTreeSortOrder for tag in g:NERDTreeSortOrder
@@ -501,7 +501,7 @@ function! s:Path.ignore(nerdtree)
endfor endfor
for Callback in g:NERDTree.PathFilters() for Callback in g:NERDTree.PathFilters()
let Callback = type(Callback) == type(function("tr")) ? Callback : function(Callback) let Callback = type(Callback) == type(function('tr')) ? Callback : function(Callback)
if Callback({'path': self, 'nerdtree': a:nerdtree}) if Callback({'path': self, 'nerdtree': a:nerdtree})
return 1 return 1
endif endif
@@ -637,8 +637,8 @@ function! s:Path.readInfoFromDisk(fullpath)
let fullpath = s:Path.WinToUnixPath(a:fullpath) let fullpath = s:Path.WinToUnixPath(a:fullpath)
if getftype(fullpath) ==# "fifo" if getftype(fullpath) ==# 'fifo'
throw "NERDTree.InvalidFiletypeError: Cant handle FIFO files: " . a:fullpath throw 'NERDTree.InvalidFiletypeError: Cant handle FIFO files: ' . a:fullpath
endif endif
let self.pathSegments = filter(split(fullpath, '/'), '!empty(v:val)') let self.pathSegments = filter(split(fullpath, '/'), '!empty(v:val)')
@@ -650,7 +650,7 @@ function! s:Path.readInfoFromDisk(fullpath)
let self.isDirectory = 0 let self.isDirectory = 0
let self.isReadOnly = filewritable(a:fullpath) ==# 0 let self.isReadOnly = filewritable(a:fullpath) ==# 0
else else
throw "NERDTree.InvalidArgumentsError: Invalid path = " . a:fullpath throw 'NERDTree.InvalidArgumentsError: Invalid path = ' . a:fullpath
endif endif
let self.isExecutable = 0 let self.isExecutable = 0
@@ -700,7 +700,7 @@ endfunction
" Renames this node on the filesystem " Renames this node on the filesystem
function! s:Path.rename(newPath) function! s:Path.rename(newPath)
if a:newPath ==# '' if a:newPath ==# ''
throw "NERDTree.InvalidArgumentsError: Invalid newPath for renaming = ". a:newPath throw 'NERDTree.InvalidArgumentsError: Invalid newPath for renaming = '. a:newPath
endif endif
call s:Path.createParentDirectories(a:newPath) call s:Path.createParentDirectories(a:newPath)
@@ -742,7 +742,7 @@ endfunction
" value associated with 'truncateTo'. A '<' is prepended. " value associated with 'truncateTo'. A '<' is prepended.
function! s:Path.str(...) function! s:Path.str(...)
let options = a:0 ? a:1 : {} let options = a:0 ? a:1 : {}
let toReturn = "" let toReturn = ''
if has_key(options, 'format') if has_key(options, 'format')
let format = options['format'] let format = options['format']
@@ -883,13 +883,13 @@ function! s:Path.WinToUnixPath(pathstr)
let toReturn = a:pathstr let toReturn = a:pathstr
"remove the x:\ of the front "remove the x:\ of the front
let toReturn = substitute(toReturn, '^.*:\(\\\|/\)\?', '/', "") let toReturn = substitute(toReturn, '^.*:\(\\\|/\)\?', '/', '')
"remove the \\ network share from the front "remove the \\ network share from the front
let toReturn = substitute(toReturn, '^\(\\\\\|\/\/\)[^\\\/]*\(\\\|\/\)[^\\\/]*\(\\\|\/\)\?', '/', "") let toReturn = substitute(toReturn, '^\(\\\\\|\/\/\)[^\\\/]*\(\\\|\/\)[^\\\/]*\(\\\|\/\)\?', '/', '')
"convert all \ chars to / "convert all \ chars to /
let toReturn = substitute(toReturn, '\', '/', "g") let toReturn = substitute(toReturn, '\', '/', 'g')
return toReturn return toReturn
endfunction endfunction

46
lib/nerdtree/tree_dir_node.vim
View File

@@ -218,7 +218,7 @@ endfunction
function! s:TreeDirNode.getChildByIndex(indx, visible) function! s:TreeDirNode.getChildByIndex(indx, visible)
let array_to_search = a:visible? self.getVisibleChildren() : self.children let array_to_search = a:visible? self.getVisibleChildren() : self.children
if a:indx > len(array_to_search) if a:indx > len(array_to_search)
throw "NERDTree.InvalidArgumentsError: Index is out of bounds." throw 'NERDTree.InvalidArgumentsError: Index is out of bounds.'
endif endif
return array_to_search[a:indx] return array_to_search[a:indx]
endfunction endfunction
@@ -255,7 +255,7 @@ function! s:TreeDirNode.getChildIndex(path)
endfunction endfunction
" FUNCTION: TreeDirNode.getDirChildren() {{{1 " FUNCTION: TreeDirNode.getDirChildren() {{{1
" Return a list of all child nodes from "self.children" that are of type " Return a list of all child nodes from 'self.children' that are of type
" TreeDirNode. This function supports http://github.com/scrooloose/nerdtree-project-plugin.git. " TreeDirNode. This function supports http://github.com/scrooloose/nerdtree-project-plugin.git.
function! s:TreeDirNode.getDirChildren() function! s:TreeDirNode.getDirChildren()
return filter(copy(self.children), 'v:val.path.isDirectory == 1') return filter(copy(self.children), 'v:val.path.isDirectory == 1')
@@ -267,7 +267,7 @@ endfunction
" "
" Args: " Args:
" pattern: (string) the glob pattern to apply " pattern: (string) the glob pattern to apply
" all: (0 or 1) if 1, include "." and ".." if they match "pattern"; if 0, " all: (0 or 1) if 1, include '.' and '..' if they match 'pattern'; if 0,
" always exclude them " always exclude them
" "
" Note: If the pathnames in the result list are below the working directory, " Note: If the pathnames in the result list are below the working directory,
@@ -276,14 +276,14 @@ endfunction
" relative paths. " relative paths.
function! s:TreeDirNode._glob(pattern, all) function! s:TreeDirNode._glob(pattern, all)
" Construct a path specification such that "globpath()" will return " Construct a path specification such that globpath() will return
" relative pathnames, if possible. " relative pathnames, if possible.
if self.path.str() == getcwd() if self.path.str() == getcwd()
let l:pathSpec = ',' let l:pathSpec = ','
else else
let l:pathSpec = escape(fnamemodify(self.path.str({'format': 'Glob'}), ':.'), ',') let l:pathSpec = escape(fnamemodify(self.path.str({'format': 'Glob'}), ':.'), ',')
" On Windows, the drive letter may be removed by "fnamemodify()". " On Windows, the drive letter may be removed by fnamemodify().
if nerdtree#runningWindows() && l:pathSpec[0] == g:NERDTreePath.Slash() if nerdtree#runningWindows() && l:pathSpec[0] == g:NERDTreePath.Slash()
let l:pathSpec = self.path.drive . l:pathSpec let l:pathSpec = self.path.drive . l:pathSpec
endif endif
@@ -291,8 +291,8 @@ function! s:TreeDirNode._glob(pattern, all)
let l:globList = [] let l:globList = []
" See ":h version7.txt" and ":h version8.txt" for details on the " See ':h version7.txt' and ':h version8.txt' for details on the
" development of the "glob()" and "globpath()" functions. " development of the glob() and globpath() functions.
if v:version > 704 || (v:version == 704 && has('patch654')) if v:version > 704 || (v:version == 704 && has('patch654'))
let l:globList = globpath(l:pathSpec, a:pattern, !g:NERDTreeRespectWildIgnore, 1, 0) let l:globList = globpath(l:pathSpec, a:pattern, !g:NERDTreeRespectWildIgnore, 1, 0)
elseif v:version == 704 && has('patch279') elseif v:version == 704 && has('patch279')
@@ -305,7 +305,7 @@ function! s:TreeDirNode._glob(pattern, all)
let l:globList = split(l:globString, "\n") let l:globList = split(l:globString, "\n")
endif endif
" If "a:all" is false, filter "." and ".." from the output. " If a:all is false, filter '.' and '..' from the output.
if !a:all if !a:all
let l:toRemove = [] let l:toRemove = []
@@ -405,7 +405,7 @@ endfunction
" Removes all childen from this node and re-reads them " Removes all childen from this node and re-reads them
" "
" Args: " Args:
" silent: 1 if the function should not echo any "please wait" messages for " silent: 1 if the function should not echo any 'please wait' messages for
" large directories " large directories
" "
" Return: the number of child nodes read " Return: the number of child nodes read
@@ -416,7 +416,7 @@ function! s:TreeDirNode._initChildren(silent)
let files = self._glob('*', 1) + self._glob('.*', 0) let files = self._glob('*', 1) + self._glob('.*', 0)
if !a:silent && len(files) > g:NERDTreeNotificationThreshold if !a:silent && len(files) > g:NERDTreeNotificationThreshold
call nerdtree#echo("Please wait, caching a large dir ...") call nerdtree#echo('Please wait, caching a large dir ...')
endif endif
let invalidFilesFound = 0 let invalidFilesFound = 0
@@ -432,10 +432,10 @@ function! s:TreeDirNode._initChildren(silent)
call self.sortChildren() call self.sortChildren()
call nerdtree#echo("") call nerdtree#echo('')
if invalidFilesFound if invalidFilesFound
call nerdtree#echoWarning(invalidFilesFound . " file(s) could not be loaded into the NERD tree") call nerdtree#echoWarning(invalidFilesFound . ' file(s) could not be loaded into the NERD tree')
endif endif
return self.getChildCount() return self.getChildCount()
endfunction endfunction
@@ -448,7 +448,7 @@ endfunction
" nerdtree: the tree the node belongs to " nerdtree: the tree the node belongs to
function! s:TreeDirNode.New(path, nerdtree) function! s:TreeDirNode.New(path, nerdtree)
if a:path.isDirectory != 1 if a:path.isDirectory != 1
throw "NERDTree.InvalidArgumentsError: A TreeDirNode object must be instantiated with a directory Path object." throw 'NERDTree.InvalidArgumentsError: A TreeDirNode object must be instantiated with a directory Path object.'
endif endif
let newTreeNode = copy(self) let newTreeNode = copy(self)
@@ -523,8 +523,8 @@ endfunction
" Open an explorer window for this node in the previous window. The explorer " Open an explorer window for this node in the previous window. The explorer
" can be a NERDTree window or a netrw window. " can be a NERDTree window or a netrw window.
function! s:TreeDirNode.openExplorer() function! s:TreeDirNode.openExplorer()
execute "wincmd p" execute 'wincmd p'
execute "edit ".self.path.str({'format':'Edit'}) execute 'edit '.self.path.str({'format':'Edit'})
endfunction endfunction
" FUNCTION: TreeDirNode.openInNewTab(options) {{{1 " FUNCTION: TreeDirNode.openInNewTab(options) {{{1
@@ -587,7 +587,7 @@ function! s:TreeDirNode.refresh()
call self.sortChildren() call self.sortChildren()
if invalidFilesFound if invalidFilesFound
call nerdtree#echoWarning("some files could not be loaded into the NERD tree") call nerdtree#echoWarning('some files could not be loaded into the NERD tree')
endif endif
endif endif
endfunction endfunction
@@ -614,7 +614,7 @@ function! s:TreeDirNode.reveal(path, ...)
let opts = a:0 ? a:1 : {} let opts = a:0 ? a:1 : {}
if !a:path.isUnder(self.path) if !a:path.isUnder(self.path)
throw "NERDTree.InvalidArgumentsError: " . a:path.str() . " should be under " . self.path.str() throw 'NERDTree.InvalidArgumentsError: ' . a:path.str() . ' should be under ' . self.path.str()
endif endif
call self.open() call self.open()
@@ -626,7 +626,7 @@ function! s:TreeDirNode.reveal(path, ...)
call self.refresh() call self.refresh()
let n = self.findNode(a:path) let n = self.findNode(a:path)
endif endif
if has_key(opts, "open") if has_key(opts, 'open')
call n.open() call n.open()
endif endif
return n return n
@@ -642,8 +642,8 @@ function! s:TreeDirNode.reveal(path, ...)
endfunction endfunction
" FUNCTION: TreeDirNode.removeChild(treenode) {{{1 " FUNCTION: TreeDirNode.removeChild(treenode) {{{1
" Remove the given treenode from "self.children". " Remove the given treenode from self.children.
" Throws "NERDTree.ChildNotFoundError" if the node is not found. " Throws NERDTree.ChildNotFoundError if the node is not found.
" "
" Args: " Args:
" treenode: the node object to remove " treenode: the node object to remove
@@ -655,16 +655,16 @@ function! s:TreeDirNode.removeChild(treenode)
endif endif
endfor endfor
throw "NERDTree.ChildNotFoundError: child node was not found" throw 'NERDTree.ChildNotFoundError: child node was not found'
endfunction endfunction
" FUNCTION: TreeDirNode.sortChildren() {{{1 " FUNCTION: TreeDirNode.sortChildren() {{{1
" Sort "self.children" by alphabetical order and directory priority. " Sort self.children by alphabetical order and directory priority.
function! s:TreeDirNode.sortChildren() function! s:TreeDirNode.sortChildren()
if count(g:NERDTreeSortOrder, '*') < 1 if count(g:NERDTreeSortOrder, '*') < 1
call add(g:NERDTreeSortOrder, '*') call add(g:NERDTreeSortOrder, '*')
endif endif
let CompareFunc = function("nerdtree#compareNodesBySortKey") let CompareFunc = function('nerdtree#compareNodesBySortKey')
call sort(self.children, CompareFunc) call sort(self.children, CompareFunc)
let g:NERDTreeOldSortOrder = g:NERDTreeSortOrder let g:NERDTreeOldSortOrder = g:NERDTreeSortOrder
endfunction endfunction

14
lib/nerdtree/tree_file_node.vim
View File

@@ -1,7 +1,7 @@
" ============================================================================ " ============================================================================
" CLASS: TreeFileNode " CLASS: TreeFileNode
" "
" This class is the parent of the "TreeDirNode" class and is the "Component" " This class is the parent of the TreeDirNode class and is the 'Component'
" part of the composite design pattern between the NERDTree node classes. " part of the composite design pattern between the NERDTree node classes.
" ============================================================================ " ============================================================================
@@ -42,7 +42,7 @@ function! s:TreeFileNode.cacheParent()
if empty(self.parent) if empty(self.parent)
let parentPath = self.path.getParent() let parentPath = self.path.getParent()
if parentPath.equals(self.path) if parentPath.equals(self.path)
throw "NERDTree.CannotCacheParentError: already at root" throw 'NERDTree.CannotCacheParentError: already at root'
endif endif
let self.parent = s:TreeFileNode.New(parentPath, self.getNerdtree()) let self.parent = s:TreeFileNode.New(parentPath, self.getNerdtree())
endif endif
@@ -195,7 +195,7 @@ endfunction
" FUNCTION: TreeFileNode.isRoot() {{{1 " FUNCTION: TreeFileNode.isRoot() {{{1
function! s:TreeFileNode.isRoot() function! s:TreeFileNode.isRoot()
if !g:NERDTree.ExistsForBuf() if !g:NERDTree.ExistsForBuf()
throw "NERDTree.NoTreeError: No tree exists for the current buffer" throw 'NERDTree.NoTreeError: No tree exists for the current buffer'
endif endif
return self.equals(self.getNerdtree().root) return self.equals(self.getNerdtree().root)
@@ -248,8 +248,8 @@ endfunction
" FUNCTION: TreeFileNode.openExplorer() " FUNCTION: TreeFileNode.openExplorer()
function! s:TreeFileNode.openExplorer() function! s:TreeFileNode.openExplorer()
execute "wincmd p" execute 'wincmd p'
execute "edit ".self.path.getParent().str({'format':'Edit'}) execute 'edit '.self.path.getParent().str({'format':'Edit'})
endfunction endfunction
" FUNCTION: TreeFileNode.putCursorHere(isJump, recurseUpward){{{1 " FUNCTION: TreeFileNode.putCursorHere(isJump, recurseUpward){{{1
@@ -265,7 +265,7 @@ function! s:TreeFileNode.putCursorHere(isJump, recurseUpward)
if a:isJump if a:isJump
mark ' mark '
endif endif
call cursor(ln, col(".")) call cursor(ln, col('.'))
else else
if a:recurseUpward if a:recurseUpward
let node = self let node = self
@@ -317,7 +317,7 @@ endfunction
" child nodes are rendered only) " child nodes are rendered only)
" for each depth in the tree " for each depth in the tree
function! s:TreeFileNode._renderToString(depth, drawText) function! s:TreeFileNode._renderToString(depth, drawText)
let output = "" let output = ''
if a:drawText ==# 1 if a:drawText ==# 1
let treeParts = repeat(' ', a:depth - 1) let treeParts = repeat(' ', a:depth - 1)

160
lib/nerdtree/ui.vim
View File

@@ -27,94 +27,94 @@ function! s:UI._dumpHelp()
let help = "\" NERDTree (" . nerdtree#version() . ") quickhelp~\n" let help = "\" NERDTree (" . nerdtree#version() . ") quickhelp~\n"
let help .= "\" ============================\n" let help .= "\" ============================\n"
let help .= "\" File node mappings~\n" let help .= "\" File node mappings~\n"
let help .= "\" ". (g:NERDTreeMouseMode ==# 3 ? "single" : "double") ."-click,\n" let help .= '" '. (g:NERDTreeMouseMode ==# 3 ? 'single' : 'double') ."-click,\n"
if self.nerdtree.isTabTree() if self.nerdtree.isTabTree()
let help .= "\" ". g:NERDTreeMapActivateNode .": open in prev window\n" let help .= '" '. g:NERDTreeMapActivateNode .": open in prev window\n"
else else
let help .= "\" ". g:NERDTreeMapActivateNode .": open in current window\n" let help .= '" '. g:NERDTreeMapActivateNode .": open in current window\n"
endif endif
if self.nerdtree.isTabTree() if self.nerdtree.isTabTree()
let help .= "\" ". g:NERDTreeMapPreview .": preview\n" let help .= '" '. g:NERDTreeMapPreview .": preview\n"
endif endif
let help .= "\" ". g:NERDTreeMapOpenInTab.": open in new tab\n" let help .= '" '. g:NERDTreeMapOpenInTab.": open in new tab\n"
let help .= "\" ". g:NERDTreeMapOpenInTabSilent .": open in new tab silently\n" let help .= '" '. g:NERDTreeMapOpenInTabSilent .": open in new tab silently\n"
let help .= "\" middle-click,\n" let help .= "\" middle-click,\n"
let help .= "\" ". g:NERDTreeMapOpenSplit .": open split\n" let help .= '" '. g:NERDTreeMapOpenSplit .": open split\n"
let help .= "\" ". g:NERDTreeMapPreviewSplit .": preview split\n" let help .= '" '. g:NERDTreeMapPreviewSplit .": preview split\n"
let help .= "\" ". g:NERDTreeMapOpenVSplit .": open vsplit\n" let help .= '" '. g:NERDTreeMapOpenVSplit .": open vsplit\n"
let help .= "\" ". g:NERDTreeMapPreviewVSplit .": preview vsplit\n" let help .= '" '. g:NERDTreeMapPreviewVSplit .": preview vsplit\n"
let help .= "\" ". g:NERDTreeMapCustomOpen .": custom open\n" let help .= '" '. g:NERDTreeMapCustomOpen .": custom open\n"
let help .= "\"\n\" ----------------------------\n" let help .= "\"\n\" ----------------------------\n"
let help .= "\" Directory node mappings~\n" let help .= "\" Directory node mappings~\n"
let help .= "\" ". (g:NERDTreeMouseMode ==# 1 ? "double" : "single") ."-click,\n" let help .= '" '. (g:NERDTreeMouseMode ==# 1 ? 'double' : 'single') ."-click,\n"
let help .= "\" ". g:NERDTreeMapActivateNode .": open & close node\n" let help .= '" '. g:NERDTreeMapActivateNode .": open & close node\n"
let help .= "\" ". g:NERDTreeMapOpenRecursively .": recursively open node\n" let help .= '" '. g:NERDTreeMapOpenRecursively .": recursively open node\n"
let help .= "\" ". g:NERDTreeMapOpenInTab.": open in new tab\n" let help .= '" '. g:NERDTreeMapOpenInTab.": open in new tab\n"
let help .= "\" ". g:NERDTreeMapOpenInTabSilent .": open in new tab silently\n" let help .= '" '. g:NERDTreeMapOpenInTabSilent .": open in new tab silently\n"
let help .= "\" ". g:NERDTreeMapCustomOpen .": custom open\n" let help .= '" '. g:NERDTreeMapCustomOpen .": custom open\n"
let help .= "\" ". g:NERDTreeMapCloseDir .": close parent of node\n" let help .= '" '. g:NERDTreeMapCloseDir .": close parent of node\n"
let help .= "\" ". g:NERDTreeMapCloseChildren .": close all child nodes of\n" let help .= '" '. g:NERDTreeMapCloseChildren .": close all child nodes of\n"
let help .= "\" current node recursively\n" let help .= "\" current node recursively\n"
let help .= "\" middle-click,\n" let help .= "\" middle-click,\n"
let help .= "\" ". g:NERDTreeMapOpenExpl.": explore selected dir\n" let help .= '" '. g:NERDTreeMapOpenExpl.": explore selected dir\n"
let help .= "\"\n\" ----------------------------\n" let help .= "\"\n\" ----------------------------\n"
let help .= "\" Bookmark table mappings~\n" let help .= "\" Bookmark table mappings~\n"
let help .= "\" double-click,\n" let help .= "\" double-click,\n"
let help .= "\" ". g:NERDTreeMapActivateNode .": open bookmark\n" let help .= '" '. g:NERDTreeMapActivateNode .": open bookmark\n"
let help .= "\" ". g:NERDTreeMapPreview .": preview file\n" let help .= '" '. g:NERDTreeMapPreview .": preview file\n"
let help .= "\" ". g:NERDTreeMapPreview .": find dir in tree\n" let help .= '" '. g:NERDTreeMapPreview .": find dir in tree\n"
let help .= "\" ". g:NERDTreeMapOpenInTab.": open in new tab\n" let help .= '" '. g:NERDTreeMapOpenInTab.": open in new tab\n"
let help .= "\" ". g:NERDTreeMapOpenInTabSilent .": open in new tab silently\n" let help .= '" '. g:NERDTreeMapOpenInTabSilent .": open in new tab silently\n"
let help .= "\" ". g:NERDTreeMapCustomOpen .": custom open\n" let help .= '" '. g:NERDTreeMapCustomOpen .": custom open\n"
let help .= "\" ". g:NERDTreeMapDeleteBookmark .": delete bookmark\n" let help .= '" '. g:NERDTreeMapDeleteBookmark .": delete bookmark\n"
let help .= "\"\n\" ----------------------------\n" let help .= "\"\n\" ----------------------------\n"
let help .= "\" Tree navigation mappings~\n" let help .= "\" Tree navigation mappings~\n"
let help .= "\" ". g:NERDTreeMapJumpRoot .": go to root\n" let help .= '" '. g:NERDTreeMapJumpRoot .": go to root\n"
let help .= "\" ". g:NERDTreeMapJumpParent .": go to parent\n" let help .= '" '. g:NERDTreeMapJumpParent .": go to parent\n"
let help .= "\" ". g:NERDTreeMapJumpFirstChild .": go to first child\n" let help .= '" '. g:NERDTreeMapJumpFirstChild .": go to first child\n"
let help .= "\" ". g:NERDTreeMapJumpLastChild .": go to last child\n" let help .= '" '. g:NERDTreeMapJumpLastChild .": go to last child\n"
let help .= "\" ". g:NERDTreeMapJumpNextSibling .": go to next sibling\n" let help .= '" '. g:NERDTreeMapJumpNextSibling .": go to next sibling\n"
let help .= "\" ". g:NERDTreeMapJumpPrevSibling .": go to prev sibling\n" let help .= '" '. g:NERDTreeMapJumpPrevSibling .": go to prev sibling\n"
let help .= "\"\n\" ----------------------------\n" let help .= "\"\n\" ----------------------------\n"
let help .= "\" Filesystem mappings~\n" let help .= "\" Filesystem mappings~\n"
let help .= "\" ". g:NERDTreeMapChangeRoot .": change tree root to the\n" let help .= '" '. g:NERDTreeMapChangeRoot .": change tree root to the\n"
let help .= "\" selected dir\n" let help .= "\" selected dir\n"
let help .= "\" ". g:NERDTreeMapUpdir .": move tree root up a dir\n" let help .= '" '. g:NERDTreeMapUpdir .": move tree root up a dir\n"
let help .= "\" ". g:NERDTreeMapUpdirKeepOpen .": move tree root up a dir\n" let help .= '" '. g:NERDTreeMapUpdirKeepOpen .": move tree root up a dir\n"
let help .= "\" but leave old root open\n" let help .= "\" but leave old root open\n"
let help .= "\" ". g:NERDTreeMapRefresh .": refresh cursor dir\n" let help .= '" '. g:NERDTreeMapRefresh .": refresh cursor dir\n"
let help .= "\" ". g:NERDTreeMapRefreshRoot .": refresh current root\n" let help .= '" '. g:NERDTreeMapRefreshRoot .": refresh current root\n"
let help .= "\" ". g:NERDTreeMapMenu .": Show menu\n" let help .= '" '. g:NERDTreeMapMenu .": Show menu\n"
let help .= "\" ". g:NERDTreeMapChdir .":change the CWD to the\n" let help .= '" '. g:NERDTreeMapChdir .":change the CWD to the\n"
let help .= "\" selected dir\n" let help .= "\" selected dir\n"
let help .= "\" ". g:NERDTreeMapCWD .":change tree root to CWD\n" let help .= '" '. g:NERDTreeMapCWD .":change tree root to CWD\n"
let help .= "\"\n\" ----------------------------\n" let help .= "\"\n\" ----------------------------\n"
let help .= "\" Tree filtering mappings~\n" let help .= "\" Tree filtering mappings~\n"
let help .= "\" ". g:NERDTreeMapToggleHidden .": hidden files (" . (self.getShowHidden() ? "on" : "off") . ")\n" let help .= '" '. g:NERDTreeMapToggleHidden .': hidden files (' . (self.getShowHidden() ? 'on' : 'off') . ")\n"
let help .= "\" ". g:NERDTreeMapToggleFilters .": file filters (" . (self.isIgnoreFilterEnabled() ? "on" : "off") . ")\n" let help .= '" '. g:NERDTreeMapToggleFilters .': file filters (' . (self.isIgnoreFilterEnabled() ? 'on' : 'off') . ")\n"
let help .= "\" ". g:NERDTreeMapToggleFiles .": files (" . (self.getShowFiles() ? "on" : "off") . ")\n" let help .= '" '. g:NERDTreeMapToggleFiles .': files (' . (self.getShowFiles() ? 'on' : 'off') . ")\n"
let help .= "\" ". g:NERDTreeMapToggleBookmarks .": bookmarks (" . (self.getShowBookmarks() ? "on" : "off") . ")\n" let help .= '" '. g:NERDTreeMapToggleBookmarks .': bookmarks (' . (self.getShowBookmarks() ? 'on' : 'off') . ")\n"
" add quickhelp entries for each custom key map " add quickhelp entries for each custom key map
let help .= "\"\n\" ----------------------------\n" let help .= "\"\n\" ----------------------------\n"
let help .= "\" Custom mappings~\n" let help .= "\" Custom mappings~\n"
for i in g:NERDTreeKeyMap.All() for i in g:NERDTreeKeyMap.All()
if !empty(i.quickhelpText) if !empty(i.quickhelpText)
let help .= "\" ". i.key .": ". i.quickhelpText ."\n" let help .= '" '. i.key .': '. i.quickhelpText ."\n"
endif endif
endfor endfor
let help .= "\"\n\" ----------------------------\n" let help .= "\"\n\" ----------------------------\n"
let help .= "\" Other mappings~\n" let help .= "\" Other mappings~\n"
let help .= "\" ". g:NERDTreeMapQuit .": Close the NERDTree window\n" let help .= '" '. g:NERDTreeMapQuit .": Close the NERDTree window\n"
let help .= "\" ". g:NERDTreeMapToggleZoom .": Zoom (maximize-minimize)\n" let help .= '" '. g:NERDTreeMapToggleZoom .": Zoom (maximize-minimize)\n"
let help .= "\" the NERDTree window\n" let help .= "\" the NERDTree window\n"
let help .= "\" ". g:NERDTreeMapHelp .": toggle help\n" let help .= '" '. g:NERDTreeMapHelp .": toggle help\n"
let help .= "\"\n\" ----------------------------\n" let help .= "\"\n\" ----------------------------\n"
let help .= "\" Bookmark commands~\n" let help .= "\" Bookmark commands~\n"
let help .= "\" :Bookmark [<name>]\n" let help .= "\" :Bookmark [<name>]\n"
@@ -128,7 +128,7 @@ function! s:UI._dumpHelp()
let help .= "\" :EditBookmarks\n" let help .= "\" :EditBookmarks\n"
silent! put =help silent! put =help
elseif !self.isMinimal() elseif !self.isMinimal()
let help ="\" Press ". g:NERDTreeMapHelp ." for help\n" let help ='" Press '. g:NERDTreeMapHelp ." for help\n"
silent! put =help silent! put =help
endif endif
endfunction endfunction
@@ -148,8 +148,8 @@ function! s:UI.New(nerdtree)
endfunction endfunction
" FUNCTION: s:UI.getPath(ln) {{{1 " FUNCTION: s:UI.getPath(ln) {{{1
" Return the "Path" object for the node that is rendered on the given line " Return the Path object for the node that is rendered on the given line
" number. If the "up a dir" line is selected, return the "Path" object for " number. If the 'up a dir' line is selected, return the Path object for
" the parent of the root. Return the empty dictionary if the given line " the parent of the root. Return the empty dictionary if the given line
" does not reference a tree node. " does not reference a tree node.
function! s:UI.getPath(ln) function! s:UI.getPath(ln)
@@ -174,7 +174,7 @@ function! s:UI.getPath(ln)
" remove the tree parts and the leading space " remove the tree parts and the leading space
let curFile = self._stripMarkup(line) let curFile = self._stripMarkup(line)
let dir = "" let dir = ''
let lnum = a:ln let lnum = a:ln
while lnum > 0 while lnum > 0
let lnum = lnum - 1 let lnum = lnum - 1
@@ -191,7 +191,7 @@ function! s:UI.getPath(ln)
if lpindent < indent if lpindent < indent
let indent = indent - 1 let indent = indent - 1
let dir = substitute (curLineStripped,'^\\', "", "") . dir let dir = substitute (curLineStripped,'^\\', '', '') . dir
continue continue
endif endif
endif endif
@@ -226,7 +226,7 @@ function! s:UI.getLineNum(node)
let l:currentLine = self._stripMarkup(l:currentLine) let l:currentLine = self._stripMarkup(l:currentLine)
let l:currentPath = join(l:pathComponents, '/') . '/' . l:currentLine let l:currentPath = join(l:pathComponents, '/') . '/' . l:currentLine
" Directories: If the current path "starts with" the full path, then " Directories: If the current path 'starts with' the full path, then
" either the paths are equal or the line is a cascade containing the " either the paths are equal or the line is a cascade containing the
" full path. " full path.
if l:fullPath[-1:] == '/' && stridx(l:currentPath, l:fullPath) == 0 if l:fullPath[-1:] == '/' && stridx(l:currentPath, l:fullPath) == 0
@@ -313,8 +313,8 @@ endfunction
function! s:UI._renderBookmarks() function! s:UI._renderBookmarks()
if !self.isMinimal() if !self.isMinimal()
call setline(line(".")+1, ">----------Bookmarks----------") call setline(line('.')+1, '>----------Bookmarks----------')
call cursor(line(".")+1, col(".")) call cursor(line('.')+1, col('.'))
endif endif
if g:NERDTreeBookmarksSort == 1 || g:NERDTreeBookmarksSort == 2 if g:NERDTreeBookmarksSort == 1 || g:NERDTreeBookmarksSort == 2
@@ -322,12 +322,12 @@ function! s:UI._renderBookmarks()
endif endif
for i in g:NERDTreeBookmark.Bookmarks() for i in g:NERDTreeBookmark.Bookmarks()
call setline(line(".")+1, i.str()) call setline(line('.')+1, i.str())
call cursor(line(".")+1, col(".")) call cursor(line('.')+1, col('.'))
endfor endfor
call setline(line(".")+1, '') call setline(line('.')+1, '')
call cursor(line(".")+1, col(".")) call cursor(line('.')+1, col('.'))
endfunction endfunction
" FUNCTION: s:UI.restoreScreenState() {{{1 " FUNCTION: s:UI.restoreScreenState() {{{1
@@ -340,13 +340,13 @@ function! s:UI.restoreScreenState()
if !has_key(self, '_screenState') if !has_key(self, '_screenState')
return return
endif endif
call nerdtree#exec("silent vertical resize " . self._screenState['oldWindowSize'], 1) call nerdtree#exec('silent vertical resize ' . self._screenState['oldWindowSize'], 1)
let old_scrolloff=&scrolloff let old_scrolloff=&scrolloff
let &scrolloff=0 let &scrolloff=0
call cursor(self._screenState['oldTopLine'], 0) call cursor(self._screenState['oldTopLine'], 0)
normal! zt normal! zt
call setpos(".", self._screenState['oldPos']) call setpos('.', self._screenState['oldPos'])
let &scrolloff=old_scrolloff let &scrolloff=old_scrolloff
endfunction endfunction
@@ -358,10 +358,10 @@ function! s:UI.saveScreenState()
let self._screenState = {} let self._screenState = {}
try try
call g:NERDTree.CursorToTreeWin() call g:NERDTree.CursorToTreeWin()
let self._screenState['oldPos'] = getpos(".") let self._screenState['oldPos'] = getpos('.')
let self._screenState['oldTopLine'] = line("w0") let self._screenState['oldTopLine'] = line('w0')
let self._screenState['oldWindowSize']= winwidth("") let self._screenState['oldWindowSize']= winwidth('')
call nerdtree#exec(win . "wincmd w", 1) call nerdtree#exec(win . 'wincmd w', 1)
catch catch
endtry endtry
endfunction endfunction
@@ -387,9 +387,9 @@ function! s:UI.render()
" remember the top line of the buffer and the current line so we can " remember the top line of the buffer and the current line so we can
" restore the view exactly how it was " restore the view exactly how it was
let curLine = line(".") let curLine = line('.')
let curCol = col(".") let curCol = col('.')
let topLine = line("w0") let topLine = line('w0')
" delete all lines in the buffer (being careful not to clobber a register) " delete all lines in the buffer (being careful not to clobber a register)
silent 1,$delete _ silent 1,$delete _
@@ -398,8 +398,8 @@ function! s:UI.render()
" delete the blank line before the help and add one after it " delete the blank line before the help and add one after it
if !self.isMinimal() if !self.isMinimal()
call setline(line(".")+1, "") call setline(line('.')+1, '')
call cursor(line(".")+1, col(".")) call cursor(line('.')+1, col('.'))
endif endif
if self.getShowBookmarks() if self.getShowBookmarks()
@@ -408,14 +408,14 @@ function! s:UI.render()
" add the 'up a dir' line " add the 'up a dir' line
if !self.isMinimal() if !self.isMinimal()
call setline(line(".")+1, s:UI.UpDirLine()) call setline(line('.')+1, s:UI.UpDirLine())
call cursor(line(".")+1, col(".")) call cursor(line('.')+1, col('.'))
endif endif
" draw the header line " draw the header line
let header = self.nerdtree.root.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 setline(line('.')+1, header)
call cursor(line(".")+1, col(".")) call cursor(line('.')+1, col('.'))
" draw the tree " draw the tree
silent put =self.nerdtree.root.renderToString() silent put =self.nerdtree.root.renderToString()
@@ -507,12 +507,12 @@ endfunction
" FUNCTION: s:UI.toggleZoom() {{{1 " FUNCTION: s:UI.toggleZoom() {{{1
" zoom (maximize/minimize) the NERDTree window " zoom (maximize/minimize) the NERDTree window
function! s:UI.toggleZoom() function! s:UI.toggleZoom()
if exists("b:NERDTreeZoomed") && b:NERDTreeZoomed if exists('b:NERDTreeZoomed') && b:NERDTreeZoomed
let size = exists("b:NERDTreeOldWindowSize") ? b:NERDTreeOldWindowSize : g:NERDTreeWinSize let size = exists('b:NERDTreeOldWindowSize') ? b:NERDTreeOldWindowSize : g:NERDTreeWinSize
call nerdtree#exec("silent vertical resize ". size, 1) call nerdtree#exec('silent vertical resize '. size, 1)
let b:NERDTreeZoomed = 0 let b:NERDTreeZoomed = 0
else else
call nerdtree#exec("vertical resize ". get(g:, 'NERDTreeWinSizeMax', ''), 1) call nerdtree#exec('vertical resize '. get(g:, 'NERDTreeWinSizeMax', ''), 1)
let b:NERDTreeZoomed = 1 let b:NERDTreeZoomed = 1
endif endif
endfunction endfunction

4
nerdtree_plugin/exec_menuitem.vim
View File

@@ -9,7 +9,7 @@
" See http://sam.zoy.org/wtfpl/COPYING for more details. " See http://sam.zoy.org/wtfpl/COPYING for more details.
" "
" ============================================================================ " ============================================================================
if exists("g:loaded_nerdtree_exec_menuitem") if exists('g:loaded_nerdtree_exec_menuitem')
finish finish
endif endif
let g:loaded_nerdtree_exec_menuitem = 1 let g:loaded_nerdtree_exec_menuitem = 1
@@ -35,6 +35,6 @@ function! NERDTreeExecFile()
if cmd != '' if cmd != ''
exec ':!' . cmd exec ':!' . cmd
else else
echo "Aborted" echo 'Aborted'
endif endif
endfunction endfunction

138
nerdtree_plugin/fs_menu.vim
View File

@@ -9,13 +9,13 @@
" See http://sam.zoy.org/wtfpl/COPYING for more details. " See http://sam.zoy.org/wtfpl/COPYING for more details.
" "
" ============================================================================ " ============================================================================
if exists("g:loaded_nerdtree_fs_menu") if exists('g:loaded_nerdtree_fs_menu')
finish finish
endif endif
let g:loaded_nerdtree_fs_menu = 1 let g:loaded_nerdtree_fs_menu = 1
"Automatically delete the buffer after deleting or renaming a file "Automatically delete the buffer after deleting or renaming a file
if !exists("g:NERDTreeAutoDeleteBuffer") if !exists('g:NERDTreeAutoDeleteBuffer')
let g:NERDTreeAutoDeleteBuffer = 0 let g:NERDTreeAutoDeleteBuffer = 0
endif endif
@@ -23,13 +23,13 @@ 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': '(m)ove the current node', 'shortcut': 'm', 'callback': 'NERDTreeMoveNode'})
call NERDTreeAddMenuItem({'text': '(d)elete the current node', 'shortcut': 'd', 'callback': 'NERDTreeDeleteNode'}) call NERDTreeAddMenuItem({'text': '(d)elete the current node', 'shortcut': 'd', 'callback': 'NERDTreeDeleteNode'})
if has("gui_mac") || has("gui_macvim") || has("mac") 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': '(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': '(o)pen the current node with system editor', 'shortcut': 'o', 'callback': 'NERDTreeExecuteFile'})
call NERDTreeAddMenuItem({'text': '(q)uicklook the current node', 'shortcut': 'q', 'callback': 'NERDTreeQuickLook'}) call NERDTreeAddMenuItem({'text': '(q)uicklook the current node', 'shortcut': 'q', 'callback': 'NERDTreeQuickLook'})
endif endif
if executable("xdg-open") if executable('xdg-open')
call NERDTreeAddMenuItem({'text': '(r)eveal the current node in file manager', 'shortcut': 'r', 'callback': 'NERDTreeRevealFileLinux'}) call NERDTreeAddMenuItem({'text': '(r)eveal the current node in file manager', 'shortcut': 'r', 'callback': 'NERDTreeRevealFileLinux'})
call NERDTreeAddMenuItem({'text': '(o)pen the current node with system editor', 'shortcut': 'o', 'callback': 'NERDTreeExecuteFileLinux'}) call NERDTreeAddMenuItem({'text': '(o)pen the current node with system editor', 'shortcut': 'o', 'callback': 'NERDTreeExecuteFileLinux'})
endif endif
@@ -37,9 +37,9 @@ endif
if g:NERDTreePath.CopyingSupported() if g:NERDTreePath.CopyingSupported()
call NERDTreeAddMenuItem({'text': '(c)opy the current node', 'shortcut': 'c', 'callback': 'NERDTreeCopyNode'}) call NERDTreeAddMenuItem({'text': '(c)opy the current node', 'shortcut': 'c', 'callback': 'NERDTreeCopyNode'})
endif endif
call NERDTreeAddMenuItem({'text': (has("clipboard")?'copy (p)ath to clipboard':'print (p)ath to screen'), 'shortcut': 'p', 'callback': 'NERDTreeCopyPath'}) call NERDTreeAddMenuItem({'text': (has('clipboard')?'copy (p)ath to clipboard':'print (p)ath to screen'), 'shortcut': 'p', 'callback': 'NERDTreeCopyPath'})
if has("unix") || has("osx") if has('unix') || has('osx')
call NERDTreeAddMenuItem({'text': '(l)ist the current node', 'shortcut': 'l', 'callback': 'NERDTreeListNode'}) call NERDTreeAddMenuItem({'text': '(l)ist the current node', 'shortcut': 'l', 'callback': 'NERDTreeListNode'})
else else
call NERDTreeAddMenuItem({'text': '(l)ist the current node', 'shortcut': 'l', 'callback': 'NERDTreeListNodeWin32'}) call NERDTreeAddMenuItem({'text': '(l)ist the current node', 'shortcut': 'l', 'callback': 'NERDTreeListNodeWin32'})
@@ -51,37 +51,37 @@ endif
"Args: "Args:
"action: the action that is being performed, e.g. 'delete' "action: the action that is being performed, e.g. 'delete'
function! s:inputPrompt(action) function! s:inputPrompt(action)
if a:action == "add" if a:action == 'add'
let title = "Add a childnode" let title = 'Add a childnode'
let info = "Enter the dir/file name to be created. Dirs end with a '/'" let info = "Enter the dir/file name to be created. Dirs end with a '/'"
let minimal = "Add node:" let minimal = 'Add node:'
elseif a:action == "copy" elseif a:action == 'copy'
let title = "Copy the current node" let title = 'Copy the current node'
let info = "Enter the new path to copy the node to:" let info = 'Enter the new path to copy the node to:'
let minimal = "Copy to:" let minimal = 'Copy to:'
elseif a:action == "delete" elseif a:action == 'delete'
let title = "Delete the current node" let title = 'Delete the current node'
let info = "Are you sure you wish to delete the node:" let info = 'Are you sure you wish to delete the node:'
let minimal = "Delete?" let minimal = 'Delete?'
elseif a:action == "deleteNonEmpty" elseif a:action == 'deleteNonEmpty'
let title = "Delete the current node" let title = 'Delete the current node'
let info = "STOP! Directory is not empty! To delete, type 'yes'" let info = "STOP! Directory is not empty! To delete, type 'yes'"
let minimal = "Delete directory?" let minimal = 'Delete directory?'
elseif a:action == "move" elseif a:action == 'move'
let title = "Rename the current node" let title = 'Rename the current node'
let info = "Enter the new path for the node:" let info = 'Enter the new path for the node:'
let minimal = "Move to:" let minimal = 'Move to:'
endif endif
if g:NERDTreeMenuController.isMinimal() if g:NERDTreeMenuController.isMinimal()
redraw! " Clear the menu redraw! " Clear the menu
return minimal . " " return minimal . ' '
else else
let divider = "==========================================================" let divider = '=========================================================='
return title . "\n" . divider . "\n" . info . "\n" return title . "\n" . divider . "\n" . info . "\n"
end end
endfunction endfunction
@@ -114,14 +114,14 @@ function! s:promptToDelBuffer(bufnum, msg)
let l:listedBufferCount = 0 let l:listedBufferCount = 0
endif endif
if l:listedBufferCount > 1 if l:listedBufferCount > 1
call nerdtree#exec("tabdo windo if winbufnr(0) == " . a:bufnum . " | exec ':bnext! ' | endif", 1) call nerdtree#exec('tabdo windo if winbufnr(0) == ' . a:bufnum . " | exec ':bnext! ' | endif", 1)
else else
call nerdtree#exec("tabdo windo if winbufnr(0) == " . a:bufnum . " | exec ':enew! ' | endif", 1) call nerdtree#exec('tabdo windo if winbufnr(0) == ' . a:bufnum . " | exec ':enew! ' | endif", 1)
endif endif
call nerdtree#exec("tabnext " . s:originalTabNumber, 1) call nerdtree#exec('tabnext ' . s:originalTabNumber, 1)
call nerdtree#exec(s:originalWindowNumber . "wincmd w", 1) call nerdtree#exec(s:originalWindowNumber . 'wincmd w', 1)
" 3. We don't need a previous buffer anymore " 3. We don't need a previous buffer anymore
call nerdtree#exec("bwipeout! " . a:bufnum, 0) call nerdtree#exec('bwipeout! ' . a:bufnum, 0)
endif endif
endfunction endfunction
@@ -141,17 +141,17 @@ function! s:renameBuffer(bufNum, newNodeName, isDirectory)
let editStr = g:NERDTreePath.New(a:newNodeName).str({'format': 'Edit'}) let editStr = g:NERDTreePath.New(a:newNodeName).str({'format': 'Edit'})
endif endif
" 1. ensure that a new buffer is loaded " 1. ensure that a new buffer is loaded
call nerdtree#exec("badd " . quotedFileName, 1) call nerdtree#exec('badd ' . quotedFileName, 1)
" 2. ensure that all windows which display the just deleted filename " 2. ensure that all windows which display the just deleted filename
" display a buffer for a new filename. " display a buffer for a new filename.
let s:originalTabNumber = tabpagenr() let s:originalTabNumber = tabpagenr()
let s:originalWindowNumber = winnr() let s:originalWindowNumber = winnr()
call nerdtree#exec("tabdo windo if winbufnr(0) == " . a:bufNum . " | exec ':e! " . editStr . "' | endif", 1) call nerdtree#exec('tabdo windo if winbufnr(0) == ' . a:bufNum . " | exec ':e! " . editStr . "' | endif", 1)
call nerdtree#exec("tabnext " . s:originalTabNumber, 1) call nerdtree#exec('tabnext ' . s:originalTabNumber, 1)
call nerdtree#exec(s:originalWindowNumber . "wincmd w", 1) call nerdtree#exec(s:originalWindowNumber . 'wincmd w', 1)
" 3. We don't need a previous buffer anymore " 3. We don't need a previous buffer anymore
try try
call nerdtree#exec("confirm bwipeout " . a:bufNum, 0) call nerdtree#exec('confirm bwipeout ' . a:bufNum, 0)
catch catch
" This happens when answering Cancel if confirmation is needed. Do nothing. " This happens when answering Cancel if confirmation is needed. Do nothing.
endtry endtry
@@ -160,11 +160,11 @@ endfunction
"FUNCTION: NERDTreeAddNode(){{{1 "FUNCTION: NERDTreeAddNode(){{{1
function! NERDTreeAddNode() function! NERDTreeAddNode()
let curDirNode = g:NERDTreeDirNode.GetSelected() let curDirNode = g:NERDTreeDirNode.GetSelected()
let prompt = s:inputPrompt("add") let prompt = s:inputPrompt('add')
let newNodeName = input(prompt, curDirNode.path.str() . g:NERDTreePath.Slash(), "file") let newNodeName = input(prompt, curDirNode.path.str() . g:NERDTreePath.Slash(), 'file')
if newNodeName ==# '' if newNodeName ==# ''
call nerdtree#echo("Node Creation Aborted.") call nerdtree#echo('Node Creation Aborted.')
return return
endif endif
@@ -187,26 +187,26 @@ function! NERDTreeAddNode()
redraw! redraw!
catch /^NERDTree/ catch /^NERDTree/
call nerdtree#echoWarning("Node Not Created.") call nerdtree#echoWarning('Node Not Created.')
endtry endtry
endfunction endfunction
"FUNCTION: NERDTreeMoveNode(){{{1 "FUNCTION: NERDTreeMoveNode(){{{1
function! NERDTreeMoveNode() function! NERDTreeMoveNode()
let curNode = g:NERDTreeFileNode.GetSelected() let curNode = g:NERDTreeFileNode.GetSelected()
let prompt = s:inputPrompt("move") let prompt = s:inputPrompt('move')
let newNodePath = input(prompt, curNode.path.str(), "file") let newNodePath = input(prompt, curNode.path.str(), 'file')
if newNodePath ==# '' if newNodePath ==# ''
call nerdtree#echo("Node Renaming Aborted.") call nerdtree#echo('Node Renaming Aborted.')
return return
endif endif
try try
if curNode.path.isDirectory if curNode.path.isDirectory
let l:openBuffers = filter(range(1,bufnr("$")),'bufexists(v:val) && fnamemodify(bufname(v:val),":p") =~# curNode.path.str() . "/.*"') let l:openBuffers = filter(range(1,bufnr('$')),'bufexists(v:val) && fnamemodify(bufname(v:val),":p") =~# curNode.path.str() . "/.*"')
else else
let l:openBuffers = filter(range(1,bufnr("$")),'bufexists(v:val) && fnamemodify(bufname(v:val),":p") ==# curNode.path.str()') let l:openBuffers = filter(range(1,bufnr('$')),'bufexists(v:val) && fnamemodify(bufname(v:val),":p") ==# curNode.path.str()')
endif endif
call curNode.rename(newNodePath) call curNode.rename(newNodePath)
@@ -221,9 +221,9 @@ function! NERDTreeMoveNode()
" renamed files. " renamed files.
if !empty(l:openBuffers) if !empty(l:openBuffers)
if curNode.path.isDirectory if curNode.path.isDirectory
echo "\nDirectory renamed.\n\nFiles with the old directory name are open in buffers " . join(l:openBuffers, ', ') . ". Replace these buffers with the new files? (yN)" echo "\nDirectory renamed.\n\nFiles with the old directory name are open in buffers " . join(l:openBuffers, ', ') . '. Replace these buffers with the new files? (yN)'
else else
echo "\nFile renamed.\n\nThe old file is open in buffer " . l:openBuffers[0] . ". Replace this buffer with the new file? (yN)" echo "\nFile renamed.\n\nThe old file is open in buffer " . l:openBuffers[0] . '. Replace this buffer with the new file? (yN)'
endif endif
if g:NERDTreeAutoDeleteBuffer || nr2char(getchar()) ==# 'y' if g:NERDTreeAutoDeleteBuffer || nr2char(getchar()) ==# 'y'
for bufNum in l:openBuffers for bufNum in l:openBuffers
@@ -236,7 +236,7 @@ function! NERDTreeMoveNode()
redraw! redraw!
catch /^NERDTree/ catch /^NERDTree/
call nerdtree#echoWarning("Node Not Renamed.") call nerdtree#echoWarning('Node Not Renamed.')
endtry endtry
endfunction endfunction
@@ -249,11 +249,11 @@ function! NERDTreeDeleteNode()
if currentNode.path.isDirectory && ((currentNode.isOpen && currentNode.getChildCount() > 0) || if currentNode.path.isDirectory && ((currentNode.isOpen && currentNode.getChildCount() > 0) ||
\ (len(currentNode._glob('*', 1)) > 0)) \ (len(currentNode._glob('*', 1)) > 0))
let prompt = s:inputPrompt("deleteNonEmpty") . currentNode.path.str() . ": " let prompt = s:inputPrompt('deleteNonEmpty') . currentNode.path.str() . ': '
let choice = input(prompt) let choice = input(prompt)
let confirmed = choice ==# 'yes' let confirmed = choice ==# 'yes'
else else
let prompt = s:inputPrompt("delete") . currentNode.path.str() . " (yN): " let prompt = s:inputPrompt('delete') . currentNode.path.str() . ' (yN): '
echo prompt echo prompt
let choice = nr2char(getchar()) let choice = nr2char(getchar())
let confirmed = choice ==# 'y' let confirmed = choice ==# 'y'
@@ -266,18 +266,18 @@ function! NERDTreeDeleteNode()
"if the node is open in a buffer, ask the user if they want to "if the node is open in a buffer, ask the user if they want to
"close that buffer "close that buffer
let bufnum = bufnr("^".currentNode.path.str()."$") let bufnum = bufnr('^'.currentNode.path.str().'$')
if buflisted(bufnum) if buflisted(bufnum)
let prompt = "\nNode deleted.\n\nThe file is open in buffer ". bufnum . (bufwinnr(bufnum) ==# -1 ? " (hidden)" : "") .". Delete this buffer? (yN)" let prompt = "\nNode deleted.\n\nThe file is open in buffer ". bufnum . (bufwinnr(bufnum) ==# -1 ? ' (hidden)' : '') .'. Delete this buffer? (yN)'
call s:promptToDelBuffer(bufnum, prompt) call s:promptToDelBuffer(bufnum, prompt)
endif endif
redraw! redraw!
catch /^NERDTree/ catch /^NERDTree/
call nerdtree#echoWarning("Could not remove node") call nerdtree#echoWarning('Could not remove node')
endtry endtry
else else
call nerdtree#echo("delete aborted") call nerdtree#echo('delete aborted')
endif endif
let &shellslash = l:shellslash let &shellslash = l:shellslash
endfunction endfunction
@@ -286,10 +286,10 @@ endfunction
function! NERDTreeListNode() function! NERDTreeListNode()
let treenode = g:NERDTreeFileNode.GetSelected() let treenode = g:NERDTreeFileNode.GetSelected()
if !empty(treenode) if !empty(treenode)
let s:uname = system("uname") let s:uname = system('uname')
let stat_cmd = 'stat -c "%s" ' let stat_cmd = 'stat -c "%s" '
if s:uname =~? "Darwin" if s:uname =~? 'Darwin'
let stat_cmd = 'stat -f "%z" ' let stat_cmd = 'stat -f "%z" '
endif endif
@@ -300,7 +300,7 @@ function! NERDTreeListNode()
let metadata = split(system(cmd),'\n') let metadata = split(system(cmd),'\n')
call nerdtree#echo(metadata[0]) call nerdtree#echo(metadata[0])
else else
call nerdtree#echo("No information available") call nerdtree#echo('No information available')
endif endif
endfunction endfunction
@@ -310,10 +310,10 @@ function! NERDTreeListNodeWin32()
if !empty(l:node) if !empty(l:node)
let l:path = l:node.path.str() let l:path = l:node.path.str()
call nerdtree#echo(printf("%s:%s MOD:%s BYTES:%d PERMISSIONS:%s", call nerdtree#echo(printf('%s:%s MOD:%s BYTES:%d PERMISSIONS:%s',
\ toupper(getftype(l:path)), \ toupper(getftype(l:path)),
\ fnamemodify(l:path, ':t'), \ fnamemodify(l:path, ':t'),
\ strftime("%c", getftime(l:path)), \ strftime('%c', getftime(l:path)),
\ getfsize(l:path), \ getfsize(l:path),
\ getfperm(l:path))) \ getfperm(l:path)))
return return
@@ -327,16 +327,16 @@ function! NERDTreeCopyNode()
let l:shellslash = &shellslash let l:shellslash = &shellslash
let &shellslash = 0 let &shellslash = 0
let currentNode = g:NERDTreeFileNode.GetSelected() let currentNode = g:NERDTreeFileNode.GetSelected()
let prompt = s:inputPrompt("copy") let prompt = s:inputPrompt('copy')
let newNodePath = input(prompt, currentNode.path.str(), "file") let newNodePath = input(prompt, currentNode.path.str(), 'file')
if newNodePath != "" if newNodePath != ''
"strip trailing slash "strip trailing slash
let newNodePath = substitute(newNodePath, '\/$', '', '') let newNodePath = substitute(newNodePath, '\/$', '', '')
let confirmed = 1 let confirmed = 1
if currentNode.path.copyingWillOverwrite(newNodePath) if currentNode.path.copyingWillOverwrite(newNodePath)
call nerdtree#echo("Warning: copying may overwrite files! Continue? (yN)") call nerdtree#echo('Warning: copying may overwrite files! Continue? (yN)')
let choice = nr2char(getchar()) let choice = nr2char(getchar())
let confirmed = choice ==# 'y' let confirmed = choice ==# 'y'
endif endif
@@ -355,11 +355,11 @@ function! NERDTreeCopyNode()
call newNode.putCursorHere(0, 0) call newNode.putCursorHere(0, 0)
endif endif
catch /^NERDTree/ catch /^NERDTree/
call nerdtree#echoWarning("Could not copy node") call nerdtree#echoWarning('Could not copy node')
endtry endtry
endif endif
else else
call nerdtree#echo("Copy aborted.") call nerdtree#echo('Copy aborted.')
endif endif
let &shellslash = l:shellslash let &shellslash = l:shellslash
redraw! redraw!
@@ -368,15 +368,15 @@ endfunction
" FUNCTION: NERDTreeCopyPath() {{{1 " FUNCTION: NERDTreeCopyPath() {{{1
function! NERDTreeCopyPath() function! NERDTreeCopyPath()
let l:nodePath = g:NERDTreeFileNode.GetSelected().path.str() let l:nodePath = g:NERDTreeFileNode.GetSelected().path.str()
if has("clipboard") if has('clipboard')
if &clipboard == "unnamedplus" if &clipboard == 'unnamedplus'
let @+ = l:nodePath let @+ = l:nodePath
else else
let @* = l:nodePath let @* = l:nodePath
endif endif
call nerdtree#echo("The path [" . l:nodePath . "] was copied to your clipboard.") call nerdtree#echo('The path [' . l:nodePath . '] was copied to your clipboard.')
else else
call nerdtree#echo("The full path is: " . l:nodePath) call nerdtree#echo('The full path is: ' . l:nodePath)
endif endif
endfunction endfunction

4
nerdtree_plugin/vcs.vim
View File

@@ -17,7 +17,7 @@ command! -n=? -complete=dir -bar NERDTreeToggleVCS :call <SID>ToggleTabTreeVCS('
function! s:CreateTabTreeVCS(name) function! s:CreateTabTreeVCS(name)
let l:path = g:NERDTreeCreator._pathForString(a:name) let l:path = g:NERDTreeCreator._pathForString(a:name)
let l:path = s:FindParentVCSRoot(l:path) let l:path = s:FindParentVCSRoot(l:path)
call g:NERDTreeCreator.createTabTree(empty(l:path) ? "" : l:path._str()) call g:NERDTreeCreator.createTabTree(empty(l:path) ? '' : l:path._str())
endfunction endfunction
" FUNCTION: s:ToggleTabTreeVCS(a:name) {{{1 " FUNCTION: s:ToggleTabTreeVCS(a:name) {{{1
@@ -25,7 +25,7 @@ endfunction
function! s:ToggleTabTreeVCS(name) function! s:ToggleTabTreeVCS(name)
let l:path = g:NERDTreeCreator._pathForString(a:name) let l:path = g:NERDTreeCreator._pathForString(a:name)
let l:path = s:FindParentVCSRoot(l:path) let l:path = s:FindParentVCSRoot(l:path)
call g:NERDTreeCreator.toggleTabTree(empty(l:path) ? "" : l:path._str()) call g:NERDTreeCreator.toggleTabTree(empty(l:path) ? '' : l:path._str())
endfunction endfunction
" FUNCTION: s:FindParentVCSRoot(a:path) {{{1 " FUNCTION: s:FindParentVCSRoot(a:path) {{{1

172
plugin/NERD_tree.vim
View File

@@ -11,7 +11,7 @@
" "
" SECTION: Script init stuff {{{1 " SECTION: Script init stuff {{{1
"============================================================ "============================================================
if exists("loaded_nerd_tree") if exists('loaded_nerd_tree')
finish finish
endif endif
if v:version < 703 if v:version < 703
@@ -36,65 +36,65 @@ set cpo&vim
"1 if the var is set, 0 otherwise "1 if the var is set, 0 otherwise
function! s:initVariable(var, value) function! s:initVariable(var, value)
if !exists(a:var) if !exists(a:var)
exec 'let ' . a:var . ' = ' . "'" . substitute(a:value, "'", "''", "g") . "'" exec 'let ' . a:var . ' = ' . "'" . substitute(a:value, "'", "''", 'g') . "'"
return 1 return 1
endif endif
return 0 return 0
endfunction endfunction
"SECTION: Init variable calls and other random constants {{{2 "SECTION: Init variable calls and other random constants {{{2
call s:initVariable("g:NERDTreeAutoCenter", 1) call s:initVariable('g:NERDTreeAutoCenter', 1)
call s:initVariable("g:NERDTreeAutoCenterThreshold", 3) call s:initVariable('g:NERDTreeAutoCenterThreshold', 3)
call s:initVariable("g:NERDTreeCaseSensitiveSort", 0) call s:initVariable('g:NERDTreeCaseSensitiveSort', 0)
call s:initVariable("g:NERDTreeNaturalSort", 0) call s:initVariable('g:NERDTreeNaturalSort', 0)
call s:initVariable("g:NERDTreeSortHiddenFirst", 1) call s:initVariable('g:NERDTreeSortHiddenFirst', 1)
call s:initVariable("g:NERDTreeUseTCD", 0) call s:initVariable('g:NERDTreeUseTCD', 0)
call s:initVariable("g:NERDTreeChDirMode", 0) call s:initVariable('g:NERDTreeChDirMode', 0)
call s:initVariable("g:NERDTreeCreatePrefix", "silent") call s:initVariable('g:NERDTreeCreatePrefix', 'silent')
call s:initVariable("g:NERDTreeMinimalUI", 0) call s:initVariable('g:NERDTreeMinimalUI', 0)
call s:initVariable("g:NERDTreeMinimalMenu", 0) call s:initVariable('g:NERDTreeMinimalMenu', 0)
if !exists("g:NERDTreeIgnore") if !exists('g:NERDTreeIgnore')
let g:NERDTreeIgnore = ['\~$'] let g:NERDTreeIgnore = ['\~$']
endif endif
call s:initVariable("g:NERDTreeBookmarksFile", expand('$HOME') . '/.NERDTreeBookmarks') call s:initVariable('g:NERDTreeBookmarksFile', expand('$HOME') . '/.NERDTreeBookmarks')
call s:initVariable("g:NERDTreeBookmarksSort", 1) call s:initVariable('g:NERDTreeBookmarksSort', 1)
call s:initVariable("g:NERDTreeHighlightCursorline", 1) call s:initVariable('g:NERDTreeHighlightCursorline', 1)
call s:initVariable("g:NERDTreeHijackNetrw", 1) call s:initVariable('g:NERDTreeHijackNetrw', 1)
call s:initVariable('g:NERDTreeMarkBookmarks', 1) call s:initVariable('g:NERDTreeMarkBookmarks', 1)
call s:initVariable("g:NERDTreeMouseMode", 1) call s:initVariable('g:NERDTreeMouseMode', 1)
call s:initVariable("g:NERDTreeNotificationThreshold", 100) call s:initVariable('g:NERDTreeNotificationThreshold', 100)
call s:initVariable("g:NERDTreeQuitOnOpen", 0) call s:initVariable('g:NERDTreeQuitOnOpen', 0)
call s:initVariable("g:NERDTreeRespectWildIgnore", 0) call s:initVariable('g:NERDTreeRespectWildIgnore', 0)
call s:initVariable("g:NERDTreeShowBookmarks", 0) call s:initVariable('g:NERDTreeShowBookmarks', 0)
call s:initVariable("g:NERDTreeShowFiles", 1) call s:initVariable('g:NERDTreeShowFiles', 1)
call s:initVariable("g:NERDTreeShowHidden", 0) call s:initVariable('g:NERDTreeShowHidden', 0)
call s:initVariable("g:NERDTreeShowLineNumbers", 0) call s:initVariable('g:NERDTreeShowLineNumbers', 0)
call s:initVariable("g:NERDTreeSortDirs", 1) call s:initVariable('g:NERDTreeSortDirs', 1)
if !nerdtree#runningWindows() && !nerdtree#runningCygwin() if !nerdtree#runningWindows() && !nerdtree#runningCygwin()
call s:initVariable("g:NERDTreeDirArrowExpandable", "▸") call s:initVariable('g:NERDTreeDirArrowExpandable', '▸')
call s:initVariable("g:NERDTreeDirArrowCollapsible", "▾") call s:initVariable('g:NERDTreeDirArrowCollapsible', '▾')
else else
call s:initVariable("g:NERDTreeDirArrowExpandable", "+") call s:initVariable('g:NERDTreeDirArrowExpandable', '+')
call s:initVariable("g:NERDTreeDirArrowCollapsible", "~") call s:initVariable('g:NERDTreeDirArrowCollapsible', '~')
endif endif
call s:initVariable("g:NERDTreeCascadeOpenSingleChildDir", 1) call s:initVariable('g:NERDTreeCascadeOpenSingleChildDir', 1)
call s:initVariable("g:NERDTreeCascadeSingleChildDir", 1) call s:initVariable('g:NERDTreeCascadeSingleChildDir', 1)
if !exists("g:NERDTreeSortOrder") if !exists('g:NERDTreeSortOrder')
let g:NERDTreeSortOrder = ['\/$', '*', '\.swp$', '\.bak$', '\~$'] let g:NERDTreeSortOrder = ['\/$', '*', '\.swp$', '\.bak$', '\~$']
endif endif
let g:NERDTreeOldSortOrder = [] let g:NERDTreeOldSortOrder = []
call s:initVariable("g:NERDTreeGlyphReadOnly", "RO") call s:initVariable('g:NERDTreeGlyphReadOnly', 'RO')
if has("conceal") if has('conceal')
call s:initVariable("g:NERDTreeNodeDelimiter", "\x07") call s:initVariable('g:NERDTreeNodeDelimiter', "\x07")
elseif (g:NERDTreeDirArrowExpandable == "\u00a0" || g:NERDTreeDirArrowCollapsible == "\u00a0") elseif (g:NERDTreeDirArrowExpandable == "\u00a0" || g:NERDTreeDirArrowCollapsible == "\u00a0")
call s:initVariable("g:NERDTreeNodeDelimiter", "\u00b7") call s:initVariable('g:NERDTreeNodeDelimiter', "\u00b7")
else else
call s:initVariable("g:NERDTreeNodeDelimiter", "\u00a0") call s:initVariable('g:NERDTreeNodeDelimiter', "\u00a0")
endif endif
if !exists('g:NERDTreeStatusline') if !exists('g:NERDTreeStatusline')
@@ -105,60 +105,60 @@ if !exists('g:NERDTreeStatusline')
let g:NERDTreeStatusline = "%{exists('b:NERDTree')?b:NERDTree.root.path.str():''}" let g:NERDTreeStatusline = "%{exists('b:NERDTree')?b:NERDTree.root.path.str():''}"
endif endif
call s:initVariable("g:NERDTreeWinPos", "left") call s:initVariable('g:NERDTreeWinPos', 'left')
call s:initVariable("g:NERDTreeWinSize", 31) call s:initVariable('g:NERDTreeWinSize', 31)
"init the shell commands that will be used to copy nodes, and remove dir trees "init the shell commands that will be used to copy nodes, and remove dir trees
" "
"Note: the space after the command is important "Note: the space after the command is important
if nerdtree#runningWindows() if nerdtree#runningWindows()
call s:initVariable("g:NERDTreeRemoveDirCmd", 'rmdir /s /q ') call s:initVariable('g:NERDTreeRemoveDirCmd', 'rmdir /s /q ')
call s:initVariable("g:NERDTreeCopyDirCmd", 'xcopy /s /e /i /y /q ') call s:initVariable('g:NERDTreeCopyDirCmd', 'xcopy /s /e /i /y /q ')
call s:initVariable("g:NERDTreeCopyFileCmd", 'copy /y ') call s:initVariable('g:NERDTreeCopyFileCmd', 'copy /y ')
else else
call s:initVariable("g:NERDTreeRemoveDirCmd", 'rm -rf ') call s:initVariable('g:NERDTreeRemoveDirCmd', 'rm -rf ')
call s:initVariable("g:NERDTreeCopyCmd", 'cp -r ') call s:initVariable('g:NERDTreeCopyCmd', 'cp -r ')
endif endif
"SECTION: Init variable calls for key mappings {{{2 "SECTION: Init variable calls for key mappings {{{2
call s:initVariable("g:NERDTreeMapCustomOpen", "<CR>") call s:initVariable('g:NERDTreeMapCustomOpen', '<CR>')
call s:initVariable("g:NERDTreeMapActivateNode", "o") call s:initVariable('g:NERDTreeMapActivateNode', 'o')
call s:initVariable("g:NERDTreeMapChangeRoot", "C") call s:initVariable('g:NERDTreeMapChangeRoot', 'C')
call s:initVariable("g:NERDTreeMapChdir", "cd") call s:initVariable('g:NERDTreeMapChdir', 'cd')
call s:initVariable("g:NERDTreeMapCloseChildren", "X") call s:initVariable('g:NERDTreeMapCloseChildren', 'X')
call s:initVariable("g:NERDTreeMapCloseDir", "x") call s:initVariable('g:NERDTreeMapCloseDir', 'x')
call s:initVariable("g:NERDTreeMapDeleteBookmark", "D") call s:initVariable('g:NERDTreeMapDeleteBookmark', 'D')
call s:initVariable("g:NERDTreeMapMenu", "m") call s:initVariable('g:NERDTreeMapMenu', 'm')
call s:initVariable("g:NERDTreeMapHelp", "?") call s:initVariable('g:NERDTreeMapHelp', '?')
call s:initVariable("g:NERDTreeMapJumpFirstChild", "K") call s:initVariable('g:NERDTreeMapJumpFirstChild', 'K')
call s:initVariable("g:NERDTreeMapJumpLastChild", "J") call s:initVariable('g:NERDTreeMapJumpLastChild', 'J')
call s:initVariable("g:NERDTreeMapJumpNextSibling", "<C-j>") call s:initVariable('g:NERDTreeMapJumpNextSibling', '<C-j>')
call s:initVariable("g:NERDTreeMapJumpParent", "p") call s:initVariable('g:NERDTreeMapJumpParent', 'p')
call s:initVariable("g:NERDTreeMapJumpPrevSibling", "<C-k>") call s:initVariable('g:NERDTreeMapJumpPrevSibling', '<C-k>')
call s:initVariable("g:NERDTreeMapJumpRoot", "P") call s:initVariable('g:NERDTreeMapJumpRoot', 'P')
call s:initVariable("g:NERDTreeMapOpenExpl", "e") call s:initVariable('g:NERDTreeMapOpenExpl', 'e')
call s:initVariable("g:NERDTreeMapOpenInTab", "t") call s:initVariable('g:NERDTreeMapOpenInTab', 't')
call s:initVariable("g:NERDTreeMapOpenInTabSilent", "T") call s:initVariable('g:NERDTreeMapOpenInTabSilent', 'T')
call s:initVariable("g:NERDTreeMapOpenRecursively", "O") call s:initVariable('g:NERDTreeMapOpenRecursively', 'O')
call s:initVariable("g:NERDTreeMapOpenSplit", "i") call s:initVariable('g:NERDTreeMapOpenSplit', 'i')
call s:initVariable("g:NERDTreeMapOpenVSplit", "s") call s:initVariable('g:NERDTreeMapOpenVSplit', 's')
call s:initVariable("g:NERDTreeMapPreview", "g" . NERDTreeMapActivateNode) call s:initVariable('g:NERDTreeMapPreview', 'g' . NERDTreeMapActivateNode)
call s:initVariable("g:NERDTreeMapPreviewSplit", "g" . NERDTreeMapOpenSplit) call s:initVariable('g:NERDTreeMapPreviewSplit', 'g' . NERDTreeMapOpenSplit)
call s:initVariable("g:NERDTreeMapPreviewVSplit", "g" . NERDTreeMapOpenVSplit) call s:initVariable('g:NERDTreeMapPreviewVSplit', 'g' . NERDTreeMapOpenVSplit)
call s:initVariable("g:NERDTreeMapQuit", "q") call s:initVariable('g:NERDTreeMapQuit', 'q')
call s:initVariable("g:NERDTreeMapRefresh", "r") call s:initVariable('g:NERDTreeMapRefresh', 'r')
call s:initVariable("g:NERDTreeMapRefreshRoot", "R") call s:initVariable('g:NERDTreeMapRefreshRoot', 'R')
call s:initVariable("g:NERDTreeMapToggleBookmarks", "B") call s:initVariable('g:NERDTreeMapToggleBookmarks', 'B')
call s:initVariable("g:NERDTreeMapToggleFiles", "F") call s:initVariable('g:NERDTreeMapToggleFiles', 'F')
call s:initVariable("g:NERDTreeMapToggleFilters", "f") call s:initVariable('g:NERDTreeMapToggleFilters', 'f')
call s:initVariable("g:NERDTreeMapToggleHidden", "I") call s:initVariable('g:NERDTreeMapToggleHidden', 'I')
call s:initVariable("g:NERDTreeMapToggleZoom", "A") call s:initVariable('g:NERDTreeMapToggleZoom', 'A')
call s:initVariable("g:NERDTreeMapUpdir", "u") call s:initVariable('g:NERDTreeMapUpdir', 'u')
call s:initVariable("g:NERDTreeMapUpdirKeepOpen", "U") call s:initVariable('g:NERDTreeMapUpdirKeepOpen', 'U')
call s:initVariable("g:NERDTreeMapCWD", "CD") call s:initVariable('g:NERDTreeMapCWD', 'CD')
call s:initVariable("g:NERDTreeMenuDown", "j") call s:initVariable('g:NERDTreeMenuDown', 'j')
call s:initVariable("g:NERDTreeMenuUp", "k") call s:initVariable('g:NERDTreeMenuUp', 'k')
"SECTION: Load class files{{{2 "SECTION: Load class files{{{2
call nerdtree#loadClassFiles() call nerdtree#loadClassFiles()
@@ -171,16 +171,16 @@ call nerdtree#ui_glue#setupCommands()
"============================================================ "============================================================
augroup NERDTree augroup NERDTree
"Save the cursor position whenever we close the nerd tree "Save the cursor position whenever we close the nerd tree
exec "autocmd BufLeave,WinLeave ". g:NERDTreeCreator.BufNamePrefix() ."* if g:NERDTree.IsOpen() | call b:NERDTree.ui.saveScreenState() | endif" exec 'autocmd BufLeave,WinLeave '. g:NERDTreeCreator.BufNamePrefix() .'* if g:NERDTree.IsOpen() | call b:NERDTree.ui.saveScreenState() | endif'
"disallow insert mode in the NERDTree "disallow insert mode in the NERDTree
exec "autocmd BufEnter,WinEnter ". g:NERDTreeCreator.BufNamePrefix() ."* stopinsert" exec 'autocmd BufEnter,WinEnter '. g:NERDTreeCreator.BufNamePrefix() .'* stopinsert'
augroup END augroup END
if g:NERDTreeHijackNetrw if g:NERDTreeHijackNetrw
augroup NERDTreeHijackNetrw augroup NERDTreeHijackNetrw
autocmd VimEnter * silent! autocmd! FileExplorer autocmd VimEnter * silent! autocmd! FileExplorer
au BufEnter,VimEnter * call nerdtree#checkForBrowse(expand("<amatch>")) au BufEnter,VimEnter * call nerdtree#checkForBrowse(expand('<amatch>'))
augroup END augroup END
endif endif
@@ -217,7 +217,7 @@ function! NERDTreeFocus()
if g:NERDTree.IsOpen() if g:NERDTree.IsOpen()
call g:NERDTree.CursorToTreeWin() call g:NERDTree.CursorToTreeWin()
else else
call g:NERDTreeCreator.ToggleTabTree("") call g:NERDTreeCreator.ToggleTabTree('')
endif endif
endfunction endfunction

4
syntax/nerdtree.vim
View File

@@ -3,7 +3,7 @@ syn match NERDTreeIgnore #\~#
exec 'syn match NERDTreeIgnore #\['.g:NERDTreeGlyphReadOnly.'\]#' exec 'syn match NERDTreeIgnore #\['.g:NERDTreeGlyphReadOnly.'\]#'
"highlighting for the .. (up dir) line at the top of the tree "highlighting for the .. (up dir) line at the top of the tree
execute "syn match NERDTreeUp #\\V". s:tree_up_dir_line ."#" execute "syn match NERDTreeUp #\\V". s:tree_up_dir_line .'#'
"quickhelp syntax elements "quickhelp syntax elements
syn match NERDTreeHelpKey #" \{1,2\}[^ ]*:#ms=s+2,me=e-1 syn match NERDTreeHelpKey #" \{1,2\}[^ ]*:#ms=s+2,me=e-1
@@ -37,7 +37,7 @@ syn match NERDTreeFlags #^ *\zs\[[^\]]*\]# containedin=NERDTreeFile,NERDTreeExec
syn match NERDTreeFlags #\[[^\]]*\]# containedin=NERDTreeDir syn match NERDTreeFlags #\[[^\]]*\]# containedin=NERDTreeDir
"highlighing to conceal the delimiter around the file/dir name "highlighing to conceal the delimiter around the file/dir name
if has("conceal") if has('conceal')
exec 'syn match NERDTreeNodeDelimiters #\%d' . char2nr(g:NERDTreeNodeDelimiter) . '# conceal containedin=ALL' exec 'syn match NERDTreeNodeDelimiters #\%d' . char2nr(g:NERDTreeNodeDelimiter) . '# conceal containedin=ALL'
setlocal conceallevel=3 concealcursor=nvic setlocal conceallevel=3 concealcursor=nvic
else else