move some rendering and cursor moving functions out of autoload

lib/nerdtree/ui.vim

@@ -171,7 +171,7 @@ function! s:UI.getPath(ln)
     let indent = self._indentLevelFor(line)
 
     "remove the tree parts and the leading space
-    let curFile = nerdtree#stripMarkupFromLine(line, 0)
+    let curFile = self._stripMarkup(line, 0)
 
     let wasdir = 0
     if curFile =~# '/$'
@@ -184,7 +184,7 @@ function! s:UI.getPath(ln)
     while lnum > 0
         let lnum = lnum - 1
         let curLine = getline(lnum)
-        let curLineStripped = nerdtree#stripMarkupFromLine(curLine, 1)
+        let curLineStripped = self._stripMarkup(curLine, 1)
 
         "have we reached the top of the tree?
         if lnum == rootLine
@@ -235,7 +235,7 @@ function! s:UI.getLineNum(file_node)
 
         let indent = self._indentLevelFor(curLine)
         if indent ==# curPathComponent
-            let curLine = nerdtree#stripMarkupFromLine(curLine, 1)
+            let curLine = self._stripMarkup(curLine, 1)
 
             let curPath =  join(pathcomponents, '/') . '/' . curLine
             if stridx(fullpath, curPath, 0) ==# 0
@@ -289,6 +289,23 @@ function! s:UI.MarkupReg()
     return '^[ `|]*[\-+~]'
 endfunction
 
+"FUNCTION: s:UI._renderBookmarks {{{1
+function! s:UI._renderBookmarks()
+
+    if g:NERDTreeMinimalUI == 0
+        call setline(line(".")+1, ">----------Bookmarks----------")
+        call cursor(line(".")+1, col("."))
+    endif
+
+    for i in g:NERDTreeBookmark.Bookmarks()
+        call setline(line(".")+1, i.str())
+        call cursor(line(".")+1, col("."))
+    endfor
+
+    call setline(line(".")+1, '')
+    call cursor(line(".")+1, col("."))
+endfunction
+
 "FUNCTION: s:UI.restoreScreenState() {{{1
 "
 "Sets the screen state back to what it was when nerdtree#saveScreenState was last
@@ -315,7 +332,7 @@ endfunction
 function! s:UI.saveScreenState()
     let win = winnr()
     try
-        call nerdtree#putCursorInTreeWin()
+        call g:NERDTree.CursorToTreeWin()
         let self._screenState = {}
         let self._screenState['oldPos'] = getpos(".")
         let self._screenState['oldTopLine'] = line("w0")
@@ -325,6 +342,46 @@ function! s:UI.saveScreenState()
     endtry
 endfunction
 
+"FUNCTION: s:UI._stripMarkup(line, removeLeadingSpaces){{{1
+"returns the given line with all the tree parts stripped off
+"
+"Args:
+"line: the subject line
+"removeLeadingSpaces: 1 if leading spaces are to be removed (leading spaces =
+"any spaces before the actual text of the node)
+function! s:UI._stripMarkup(line, removeLeadingSpaces)
+    let line = a:line
+    "remove the tree parts and the leading space
+    let line = substitute (line, g:NERDTreeUI.MarkupReg(),"","")
+
+    "strip off any read only flag
+    let line = substitute (line, ' \[RO\]', "","")
+
+    "strip off any bookmark flags
+    let line = substitute (line, ' {[^}]*}', "","")
+
+    "strip off any executable flags
+    let line = substitute (line, '*\ze\($\| \)', "","")
+
+    "strip off any generic flags
+    let line = substitute (line, '\[[^]]*\]', "","")
+
+    let wasdir = 0
+    if line =~# '/$'
+        let wasdir = 1
+    endif
+    let line = substitute (line,' -> .*',"","") " remove link to
+    if wasdir ==# 1
+        let line = substitute (line, '/\?$', '/', "")
+    endif
+
+    if a:removeLeadingSpaces
+        let line = substitute (line, '^ *', '', '')
+    endif
+
+    return line
+endfunction
+
 "FUNCTION: s:UI.render() {{{1
 function! s:UI.render()
     setlocal modifiable
@@ -347,7 +404,7 @@ function! s:UI.render()
     endif
 
     if b:NERDTreeShowBookmarks
-        call nerdtree#renderBookmarks()
+        call self._renderBookmarks()
     endif
 
     "add the 'up a dir' line
@@ -415,7 +472,7 @@ function! s:UI.toggleShowBookmarks()
     let b:NERDTreeShowBookmarks = !b:NERDTreeShowBookmarks
     if b:NERDTreeShowBookmarks
         call b:NERDTree.render()
-        call nerdtree#putCursorOnBookmarkTable()
+        call g:NERDTree.CursorToBookmarkTable()
     else
         call b:NERDTree.ui.renderViewSavingPosition()
     endif