nerdtree_plugin/exec_menuitem.vim nerdtree_plugin/fs_menu.vim nerdtree_plugin/git_menu.vim @@ -1,3 +1,3 @@ -_vim_fuf +*~ +*.swp _vim-fuf -.VimballRecord .gitignore @@ -38,7 +38,7 @@ CONTENTS *NERDCommenterContents* 5. Issues with the script.................|NERDComIssues| 5.1 Delimiter detection heuristics....|NERDComHeuristics| 5.2 Nesting issues....................|NERDComNesting| - 6.The author..............................|NERDComAuthor| + 6.About.. ............................|NERDComAbout| 7.Changelog...............................|NERDComChangelog| 8.Credits.................................|NERDComCredits| 9.License.................................|NERDComLicense| @@ -436,8 +436,6 @@ then the script would do a sexy comment on the last visual selection. |'NERDRPlace'| Specifies what to use as the right delimiter placeholder when nesting comments. -|'NERDShutUp'| Stops "Unknown filetype" output from the - script |'NERDSpaceDelims'| Specifies whether to add extra spaces around delimiters when commenting, and whether to remove them when @@ -660,15 +658,6 @@ This option is used to specify whether place-holder delimiters should be used when creating a nested comment. ------------------------------------------------------------------------------ - *'NERDShutUp'* -Values: 0 or 1. -Default 1. - -This option is used to prevent the script from echoing "Unknown filetype" -messages. Stick this line in your vimrc: > - let NERDShutUp=1 -< ------------------------------------------------------------------------------- *'NERDSpaceDelims'* Values: 0 or 1. Default 0. @@ -785,7 +774,7 @@ will become: > for simplicity) ============================================================================== -6. The author *NERDComAuthor* +6. About *NERDComAbout* The author of the NERD commenter is Martyzillatron --- the half robot, half dinosaur bastard son of Megatron and Godzilla. He enjoys destroying @@ -795,9 +784,29 @@ Drop him a line at martin_grenfell at msn.com. He would love to hear from you. its a lonely life being the worlds premier terror machine. How would you feel if your face looked like a toaster and a t-rex put together? :( +The latest stable versions can be found at + http://www.vim.org/scripts/script.php?script_id=1218 + +The latest dev versions are on github + http://github.com/scrooloose/nerdcommenter + ============================================================================== 8. Changelog *NERDComChangelog* +2.2.2 + - remove the NERDShutup option and the message is suppresses, this makes + the plugin silently rely on &commentstring for unknown filetypes. + - add support for dhcpd, limits, ntp, resolv, rgb, sysctl, udevconf and + udevrules. Thanks to Thilo Six. + - match filetypes case insensitively + - add support for mp (metapost), thanks to Andrey Skvortsov. + - add support for htmlcheetah, thanks to Simon Hengel. + - add support for javacc, thanks to Matt Tolton. + - make <%# %> the default delims for eruby, thanks to tpope. + - add support for javascript.jquery, thanks to Ivan Devat. + - add support for cucumber and pdf. Fix sass and railslog delims, + thanks to tpope + 2.2.1 - add support for newlisp and clojure, thanks to Matthew Lee Hinman. - fix automake comments, thanks to Elias Pipping @@ -841,141 +850,54 @@ if your face looked like a toaster and a t-rex put together? :( ============================================================================== 8. Credits *NERDComCredits* -Thanks and respect to the following people: - -Thanks to Nick Brettell for his many ideas and criticisms. A bloody good -bastard. -:normal :.-2s/good// - -Thanks to Matthew Hawkins for his awesome refactoring! - -Thanks to the authors of the vimspell whose documentation -installation function I stole :) - -Thanks to Greg Searle for the idea of using place-holders for nested comments. - -Thanks to Nguyen for the suggestions and pointing the h file highlighting bug! -Also, thanks for the idea of doing sexy comments as well as his suggestions -relating to it :P -Thanks again to Nguyen for complaining about the NERD_comments menu mapping -(<Alt>-c) interfering with another mapping of his... and thus the -NERD_dont_create_menu_shortcut option was born :P -(it was then replaced with NERD_menu_mode in version 1.67 :) - -Cheers to Litchi for the idea of having a mapping that appends a comment to -the current line :) - -Thanks to jorge scandaliaris and Shufeng Zheng for telling me about some -problems with commenting in visual mode. Thanks again to Jorge for his -continued suggestions on this matter :) - -Thanks to Martin Stubenschrott for pointing out a bug with the <C-c> mapping -:) Ive gotta stop breaking this mapping! - -Thanks to Markus Erlmann for pointing out a conflict that this script was -having with the taglist plugin. - -Thanks to Brent Rice for alerting me about, and helping me track down, a bug -in the script when the "ignorecase" option in vim was set. - -Thanks to Richard Willis for telling me about how line continuation was -causing problems on cygwin. Also, thanks pointing out a bug in the help file -and for suggesting // comments for c (its about time SOMEONE did :P). May ANSI -have mercy on your soul :) - -Thanks to Igor Prischepoff for suggesting that i implement "toggle comments". -Also, thanks for his suggested improvements about toggle comments after i -implemented them. - -Thanks to harry for telling me that i broke the <leader>cn mapping in 1.53 :), -and thanks again for telling me about a bug that occurred when editing a file -in a new tab. - -Thanks to Martin (Krischikim?) for his patch that fixed a bug with the doc -install function and added support for ada comments with spaces as well as -making a couple of other small changes. - -Thanks to David Bourgeois for pointing out a bug with when commenting c files -:)... [a few days later] ok i completely misunderstood what David was talking -about and ended up fixing a completely different bug to what he was talking -about :P - -Thanks to David Bourgeois for pointing out a bug when changing buffers. - -Cheers to Eike Von Seggern for sending me a patch to fix a bug in 1.60 that -was causing spaces to be added to the end of lines with single-part -delimiters. It's nice when people do my work for me :D - -Thanks to Torsten Blix for telling me about a couple of bugs when uncommenting -sexy comments. Sexy comments dont look so sexy when they are only half removed -:P - -Thanks to Alexander "boesi" Bosecke for pointing out a bug that was stopping -the NERD_space_delim_filetype_regexp option from working with left aligned -toggle comments. And for pointing out a bug when initialising VB comments. - -Thanks to Stefano Zacchiroli for suggesting the idea of "Minimal comments". -And for suggested improvements to minimal comments. - -Thanks to Norick Chen for emailing in a patch that fixed the asp delimiters. -In 1.65 - -Thanks to Joseph Barker for the sugesting that the menu be an optional -feature. - -Thanks to Gary Church and Tim Carey-Smith for complaining about the -keymappings and causing me to introduce the NERD_mapleader option :) - -Thanks to Markus Klinik for emailing me about a bug for sexy comments where -spaces were being eaten. - -Thanks to Anders for emailing me a patch to help get rid of all the visual -bells and screen scrolling. - -Thanks to Anders and Markus Klinik for emailing me about the screen scrolling -issues and finally getting me off my ass about them :P - -Thanks to Seth Mason for sending me a patch to fix some pathing issues for the -help doc installation. - -Cheers to James Hales for the patch that made the comment maps work better with -counts, and made the script reset comment delims for a buffer when its -filetype changes. - -Cheers to heptite on #vim for helping me track down some tab-space conversion -bugs. - -Cheers to Cheng Fang for the bug reports :D - -Cheers to Yongwei Wu for a bug report about the passwd filetype. - -Thanks to David Miani for reporting a space-removal bug when using the -NERDSpaceDelims option. - -Thanks to Jeremy Hinegardner for emailing me about a bug with aligned -comments and the NERDSpaceDelims option. - -Thanks to marco for suggesting NERDDefaultNesting be set by default. - -Thanks to Ingo Karkat for the bug reports and the bugfix patch. - -Thanks to Zhang Shuhan for sending me a report about spaces not being removed -properly in some circumstances. Also, thanks for emailing me a bunch of bug -reports about sexy/toggle comments and for testing my fixes. - -Thanks to tpope for the english lesson. - -Thanks to Ben Schmidt, David Fishburn, and Erik Falor for emailing me about an -incompatibility with vim7.2. Thanks also to JaGoTerr for posting the issue. - -Thanks to Elias Pipping for sending me a bug report about haskell commenting. - -Thanks to mntnoe for pointing out incorrect delimiters for haskell. - -Thanks to Mark S. for pointing out a bug in the doc. - -Not to forget! Thanks to the following people for sending me new filetypes to -support :D +Thanks to the follow people for suggestions and patches: + +Nick Brettell +Matthew Hawkins +Mathieu Clabaut +Greg Searle +Nguyen +Litchi +Jorge Scandaliaris +Shufeng Zheng +Martin Stubenschrott +Markus Erlmann +Brent Rice +Richard Willis +Igor Prischepoff +Harry +David Bourgeois +Eike Von Seggern +Torsten Blix +Alexander Bosecke +Stefano Zacchiroli +Norick Chen +Joseph Barker +Gary Church +Tim Carey-Smith +Markus Klinik +Anders +Seth Mason +James Hales +Heptite +Cheng Fang +Yongwei Wu +David Miani +Jeremy Hinegardner +Marco +Ingo Karkat +Zhang Shuhan +tpope +Ben Schmidt +David Fishburn +Erik Falor +JaGoTerr +Elias Pipping +mntnoe +Mark S. + + +Thanks to the following people for sending me new filetypes to support: The hackers The filetypes~ Sam R verilog @@ -1055,7 +977,13 @@ David conkyrc Miguel Jaque Barbero SVNannotate Stefan Walk sieve Adam Thorsen objj - +Thilo Six dhcpd, limits, ntp, resolv, rgb, sysctl, + udevconf, udevrules +Andrey Skvortsov mp +Simon Hengel htmlcheetah +Matt Tolton javacc +Ivan Devat javascript.jquery +tpope cucumber,pdf ============================================================================== 9. License *NERDComLicense* doc/NERD_commenter.txt @@ -27,11 +27,13 @@ CONTENTS *NERDTree-contents* 2.2.2.Bookmark commands...........|NERDTreeBookmarkCommands| 2.2.3.Invalid bookmarks...........|NERDTreeInvalidBookmarks| 2.3.NERD tree mappings................|NERDTreeMappings| - 2.4.The filesystem menu...............|NERDTreeFilesysMenu| + 2.4.The NERDT tree menu...............|NERDTreeMenu| 3.Options.................................|NERDTreeOptions| 3.1.Option summary....................|NERDTreeOptionSummary| 3.2.Option details....................|NERDTreeOptionDetails| - 4.Hacking the NERD tree...................|NERDTreeHacking| + 4.The NERD tree API.......................|NERDTreeAPI| + 4.1.Key map API.......................|NERDTreeKeymapAPI| + 4.2.Menu API..........................|NERDTreeMenuAPI| 5.About...................................|NERDTreeAbout| 6.Changelog...............................|NERDTreeChangelog| 7.Credits.................................|NERDTreeCredits| @@ -68,9 +70,6 @@ The following features and functionality are provided by the NERD tree: * custom file filters to prevent e.g. vim backup files being displayed * optional displaying of hidden files (. files) * files can be "turned off" so that only directories are displayed - * A textual filesystem menu is provided which allows you to - create/delete/move file and directory nodes as well as copy (for - supported OSs) * The position and size of the NERD tree window can be customised * The order in which the nodes in the tree are listed can be customised. * A model of your filesystem is created/maintained as you explore it. This @@ -87,6 +86,12 @@ The following features and functionality are provided by the NERD tree: * By default the script overrides the default file browser (netw), so if you :edit a directory a (slighly modified) NERD tree will appear in the current window + * A programmable menu system is provided (simulates right clicking on a + node) + * one default menu plugin is provided to perform basic filesytem + operations (create/delete/move/copy files/directories) + * There's an API for adding your own keymappings + ============================================================================== 2. Functionality provided *NERDTreeFunctionality* @@ -205,12 +210,12 @@ i.......Open selected file in a split window.....................|NERDTree-i| gi......Same as i, but leave the cursor on the NERDTree..........|NERDTree-gi| s.......Open selected file in a new vsplit.......................|NERDTree-s| gs......Same as s, but leave the cursor on the NERDTree..........|NERDTree-gs| -!.......Execute the current file.................................|NERDTree-!| O.......Recursively open the selected directory..................|NERDTree-O| x.......Close the current nodes parent...........................|NERDTree-x| X.......Recursively close all children of the current node.......|NERDTree-X| e.......Edit the current dif.....................................|NERDTree-e| +<CR>...............same as |NERDTree-o|. double-click.......same as the |NERDTree-o| map. middle-click.......same as |NERDTree-i| for files, same as |NERDTree-e| for dirs. @@ -221,15 +226,15 @@ P.......Jump to the root node....................................|NERDTree-P| p.......Jump to current nodes parent.............................|NERDTree-p| K.......Jump up inside directories at the current tree depth.....|NERDTree-K| J.......Jump down inside directories at the current tree depth...|NERDTree-J| -<C-j>...Jump down to the next sibling of the current directory...|NERDTree-c-j| -<C-k>...Jump up to the previous sibling of the current directory.|NERDTree-c-k| +<C-J>...Jump down to the next sibling of the current directory...|NERDTree-C-J| +<C-K>...Jump up to the previous sibling of the current directory.|NERDTree-C-K| C.......Change the tree root to the selected dir.................|NERDTree-C| u.......Move the tree root up one directory......................|NERDTree-u| U.......Same as 'u' except the old root node is left open........|NERDTree-U| r.......Recursively refresh the current directory................|NERDTree-r| R.......Recursively refresh the current root.....................|NERDTree-R| -m.......Display the filesystem menu..............................|NERDTree-m| +m.......Display the NERD tree menu...............................|NERDTree-m| cd......Change the CWD to the dir of the selected node...........|NERDTree-cd| I.......Toggle whether hidden files displayed....................|NERDTree-I| @@ -238,6 +243,7 @@ F.......Toggle whether files are displayed.......................|NERDTree-F| B.......Toggle whether the bookmark table is displayed...........|NERDTree-B| q.......Close the NERDTree window................................|NERDTree-q| +A.......Zoom (maximize/minimize) the NERDTree window.............|NERDTree-A| ?.......Toggle the display of the quick help.....................|NERDTree-?| ------------------------------------------------------------------------------ @@ -331,14 +337,6 @@ The key combo for this mapping is always "g" + NERDTreeMapOpenVSplit (see |NERDTree-s|). ------------------------------------------------------------------------------ - *NERDTree-!* -Default key: ! -Map option: NERDTreeMapExecute -Applies to: files. - -Executes the selected file, prompting for arguments first. - ------------------------------------------------------------------------------- *NERDTree-O* Default key: O Map option: NERDTreeMapOpenRecursively @@ -430,16 +428,16 @@ If the cursor is already on the last node then do the following: * go to the last child of that node ------------------------------------------------------------------------------ - *NERDTree-c-j* -Default key: <C-j> + *NERDTree-C-J* +Default key: <C-J> Map option: NERDTreeMapJumpNextSibling Applies to: files and directories. Jump to the next sibling of the selected node. ------------------------------------------------------------------------------ - *NERDTree-c-k* -Default key: <C-k> + *NERDTree-C-K* +Default key: <C-K> Map option: NERDTreeMapJumpPrevSibling Applies to: files and directories. @@ -492,10 +490,18 @@ Recursively refresh the tree root. ------------------------------------------------------------------------------ *NERDTree-m* Default key: m -Map option: NERDTreeMapFilesystemMenu +Map option: NERDTreeMapMenu Applies to: files and directories. -Display the filesystem menu. See |NERDTreeFilesysMenu| for details. +Display the NERD tree menu. See |NERDTreeMenu| for details. + +------------------------------------------------------------------------------ + *NERDTree-cd* +Default key: cd +Map option: NERDTreeMapChdir +Applies to: files and directories. + +Change vims current working directory to that of the selected node. ------------------------------------------------------------------------------ *NERDTree-I* @@ -538,6 +544,14 @@ Applies to: no restrictions. Closes the NERDtree window. ------------------------------------------------------------------------------ + *NERDTree-A* +Default key: A +Map option: NERDTreeMapToggleZoom +Applies to: no restrictions. + +Maximize (zoom) and minimize the NERDtree window. + +------------------------------------------------------------------------------ *NERDTree-?* Default key: ? Map option: NERDTreeMapHelp @@ -546,44 +560,18 @@ Applies to: no restrictions. Toggles whether the quickhelp is displayed. ------------------------------------------------------------------------------ -2.3. The filesystem menu *NERDTreeFilesysMenu* +2.3. The NERD tree menu *NERDTreeMenu* -The purpose of the filesystem menu is to allow you to perform basic filesystem -operations quickly from the NERD tree rather than the console. +The NERD tree has a menu that can be programmed via the an API (see +|NERDTreeMenuAPI|). The idea is to simulate the "right click" menus that most +file explorers have. -The filesystem menu can be accessed with 'm' mapping and has four supported -operations: > - 1. Adding nodes. - 2. Move nodes. - 3. Deleting nodes. - 3. Copying nodes. -< -1. Adding nodes: -To add a node move the cursor onto (or anywhere inside) the directory you wish -to create the new node inside. Select the 'add node' option from the -filesystem menu and type a filename. If the filename you type ends with a '/' -character then a directory will be created. Once the operation is completed, -the cursor is placed on the new node. - -2. Move nodes: -To move/rename a node, put the cursor on it and select the 'move' option from -the filesystem menu. Enter the new location for the node and it will be -moved. If the old file is open in a buffer, you will be asked if you wish to -delete that buffer. Once the operation is complete the cursor will be placed -on the renamed node. - -3. Deleting nodes: -To delete a node put the cursor on it and select the 'delete' option from the -filesystem menu. After confirmation the node will be deleted. If a file is -deleted but still exists as a buffer you will be given the option to delete -that buffer. - -4. Copying nodes: -To copy a node put the cursor on it and select the 'copy' option from the -filesystem menu. Enter the new location and you're done. Note: copying is -currently only supported for *nix operating systems. If someone knows a -one line copying command for windows that doesnt require user confirmation -then id be grateful if you'd email me. +The script comes with two default menu plugins: exec_menuitem.vim and +fs_menu.vim. fs_menu.vim adds some basic filesystem operations to the menu for +creating/deleting/moving/copying files and dirs. exec_menuitem.vim provides a +menu item to execute executable files. + +Related tags: |NERDTree-m| |NERDTreeApi| ============================================================================== 3. Customisation *NERDTreeOptions* @@ -679,7 +667,7 @@ If set to 1, the NERD tree window will center around the cursor if it moves to within |'NERDTreeAutoCenterThreshold'| lines of the top/bottom of the window. This is ONLY done in response to tree navigation mappings, -i.e. |NERDTree-J| |NERDTree-K| |NERDTree-C-J| |NERDTree-c-K| |NERDTree-p| +i.e. |NERDTree-J| |NERDTree-K| |NERDTree-C-J| |NERDTree-C-K| |NERDTree-p| |NERDTree-P| The centering is done with a |zz| operation. @@ -742,7 +730,7 @@ Values: 0 or 1. Default: 1. If set to 1, the current cursor line in the NERD tree buffer will be -highlighted. This is done using the |cursorline| option. +highlighted. This is done using the |'cursorline'| option. ------------------------------------------------------------------------------ *'NERDTreeHijackNetrw'* @@ -929,43 +917,142 @@ Default: 31. This option is used to change the size of the NERD tree when it is loaded. ============================================================================== -4. Hacking the NERD tree *NERDTreeHacking* - -Public functions ~ - -The script provides 2 public functions for your hacking pleasure. Their -signatures are: > - function! NERDTreeGetCurrentNode() - function! NERDTreeGetCurrentPath() +4. The NERD tree API *NERDTreeAPI* + +The NERD tree script allows you to add custom key mappings and menu items via +a set of API calls. Any scripts that use this API should be placed in +~/.vim/nerdtree_plugin/ (*nix) or ~/vimfiles/nerdtree_plugin (windows). + +The script exposes some prototype objects that can be used to manipulate the +tree and/or get information from it: > + g:NERDTreePath + g:NERDTreeDirNode + g:NERDTreeFileNode + g:NERDTreeBookmark < -The first returns the node object that the cursor is currently on, while the -second returns the corresponding path object. - -This is probably a good time to mention that the script implements prototype -style OO. To see the functions that each class provides you can read look at -the code. +See the code/comments in NERD_tree.vim to find how to use these objects. The +following code conventions are used: + * class members start with a capital letter + * instance members start with a lower case letter + * private members start with an underscore -Use the node objects to manipulate the structure of the tree. Use the path -objects to access the files/directories the tree nodes represent. +See this blog post for more details: + http://got-ravings.blogspot.com/2008/09/vim-pr0n-prototype-based-objects.html -The NERD tree filetype ~ - -NERD tree buffers have a filetype of "nerdtree". You can use this to hack the -NERD tree via autocommands (on |FileType|) or via an ftplugin. - -For example, putting this code in ~/.vim/ftplugin/nerdtree.vim would override -the o mapping, making it open the selected node in a new gvim instance. > +------------------------------------------------------------------------------ +4.1. Key map API *NERDTreeKeymapAPI* + +NERDTreeAddKeyMap({options}) *NERDTreeAddKeyMap()* + Adds a new keymapping for all NERD tree buffers. + {options} must be a dictionary, and must contain the following keys: + "key" - the trigger key for the new mapping + "callback" - the function the new mapping will be bound to + "quickhelpText" - the text that will appear in the quickhelp (see + |NERDTree-?|) + + Example: > + call NERDTreeAddKeyMap({ + \ 'key': 'b', + \ 'callback': 'NERDTreeEchoCurrentNode', + \ 'quickhelpText': 'echo full path of current node' }) + + function! NERDTreeEchoCurrentNode() + let n = g:NERDTreeFileNode.GetSelected() + if n != {} + echomsg 'Current node: ' . n.path.str() + endif + endfunction +< + This code should sit in a file like ~/.vim/nerdtree_plugin/mymapping.vim. + It adds a (rather useless) mapping on 'b' which echos the full path to the + current node. - nnoremap <silent> <buffer> o :call <sid>openInNewVimInstance()<cr> - function! s:openInNewVimInstance() - let p = NERDTreeGetCurrentPath() - if p != {} - silent exec "!gvim " . p.strForOS(1) . "&" - endif - endfunction +------------------------------------------------------------------------------ +4.2. Menu API *NERDTreeMenuAPI* + +NERDTreeAddSubmenu({options}) *NERDTreeAddSubmenu()* + Creates and returns a new submenu. + + {options} must be a dictionary and must contain the following keys: + "text" - the text of the submenu that the user will see + "shortcut" - a shortcut key for the submenu (need not be unique) + + The following keys are optional: + "isActiveCallback" - a function that will be called to determine whether + this submenu item will be displayed or not. The callback function must return + 0 or 1. + "parent" - the parent submenu of the new submenu (returned from a previous + invocation of NERDTreeAddSubmenu()). If this key is left out then the new + submenu will sit under the top level menu. + + See below for an example. + +NERDTreeAddMenuItem({options}) *NERDTreeAddMenuItem()* + Adds a new menu item to the NERD tree menu (see |NERDTreeMenu|). + + {options} must be a dictionary and must contain the + following keys: + "text" - the text of the menu item which the user will see + "shortcut" - a shortcut key for the menu item (need not be unique) + "callback" - the function that will be called when the user activates the + menu item. + + The following keys are optional: + "isActiveCallback" - a function that will be called to determine whether + this menu item will be displayed or not. The callback function must return + 0 or 1. + "parent" - if the menu item belongs under a submenu then this key must be + specified. This value for this key will be the object that + was returned when the submenu was created with |NERDTreeAddSubmenu()|. + + See below for an example. + +NERDTreeAddMenuSeparator([{options}]) *NERDTreeAddMenuSeparator()* + Adds a menu separator (a row of dashes). + + {options} is an optional dictionary that may contain the following keys: + "isActiveCallback" - see description in |NERDTreeAddMenuItem()|. + +Below is an example of the menu API in action. > + call NERDTreeAddMenuSeparator() + + call NERDTreeAddMenuItem({ + \ 'text': 'a (t)op level menu item', + \ 'shortcut': 't', + \ 'callback': 'SomeFunction' }) + + let submenu = NERDTreeAddSubmenu({ + \ 'text': 'a (s)ub menu', + \ 'shortcut': 's' }) + + call NERDTreeAddMenuItem({ + \ 'text': '(n)ested item 1', + \ 'shortcut': 'n', + \ 'callback': 'SomeFunction', + \ 'parent': submenu }) + + call NERDTreeAddMenuItem({ + \ 'text': '(n)ested item 2', + \ 'shortcut': 'n', + \ 'callback': 'SomeFunction', + \ 'parent': submenu }) < -This way you can add new mappings or :commands or override any existing -mapping. +This will create the following menu: > + -------------------- + a (t)op level menu item + a (s)ub menu +< +Where selecting "a (s)ub menu" will lead to a second menu: > + (n)ested item 1 + (n)ested item 2 +< +When any of the 3 concrete menu items are selected the function "SomeFunction" +will be called. + +------------------------------------------------------------------------------ +NERDTreeRender() *NERDTreeRender()* + Re-renders the NERD tree buffer. Useful if you change the state of the + tree and you want to it to be reflected in the UI. ============================================================================== 5. About *NERDTreeAbout* @@ -988,6 +1075,30 @@ The latest dev versions are on github ============================================================================== 6. Changelog *NERDTreeChangelog* +4.0.0 + - add a new programmable menu system (see :help NERDTreeMenu). + - add new APIs to add menus/menu-items to the menu system as well as + custom key mappings to the NERD tree buffer (see :help NERDTreeAPI). + - removed the old API functions + - added a mapping to maximize/restore the size of nerd tree window, thanks + to Guillaume Duranceau for the patch. See :help NERDTree-A for details. + + - fix a bug where secondary nerd trees (netrw hijacked trees) and + NERDTreeQuitOnOpen didnt play nicely, thanks to Curtis Harvey. + - fix a bug where the script ignored directories whose name ended in a dot, + thanks to Aggelos Orfanakos for the patch. + - fix a bug when using the x mapping on the tree root, thanks to Bryan + Venteicher for the patch. + +3.1.1 + - fix a bug where a non-listed no-name buffer was getting created every + time the tree windows was created, thanks to Derek Wyatt and owen1 + - make <CR> behave the same as the 'o' mapping + - some helptag fixes in the doc, thanks strull + - fix a bug when using :set nohidden and opening a file where the previous + buf was modified. Thanks iElectric + - other minor fixes + 3.1.0 New features: - add mappings to open files in a vsplit, see :help NERDTree-s and :help @@ -1069,6 +1180,8 @@ just downloaded pr0n instead. Frederic Chanal (nach) Alf Mikula Lucas S. Buchala + Curtis Harvey + Guillaume Duranceau ============================================================================== 8. License *NERDTreeLicense* doc/NERD_tree.txt @@ -2,8 +2,8 @@ " File: NERD_commenter.vim " Description: vim global plugin that provides easy code commenting " Maintainer: Martin Grenfell <martin_grenfell at msn dot com> -" Version: 2.2.1 -" Last Change: 13th November, 2008 +" Version: 2.2.2 +" Last Change: 30th March, 2008 " License: This program is free software. It comes without any warranty, " to the extent permitted by applicable law. You can redistribute " it and/or modify it under the terms of the Do What The Fuck You @@ -22,13 +22,6 @@ if v:version < 700 endif let loaded_nerd_comments = 1 -" Section: spaces init {{{2 -" Occasionally we need to grab a string of spaces so just make one here -let s:spaces = "" -while strlen(s:spaces) < 100 - let s:spaces = s:spaces . " " -endwhile - " Function: s:InitVariable() function {{{2 " This function is used to initialise a given variable to a given value. The " variable is only initialised if it does not exist prior @@ -67,7 +60,6 @@ call s:InitVariable("g:NERDUsePlaceHolders", 1) call s:InitVariable("g:NERDRemoveAltComs", 1) call s:InitVariable("g:NERDRemoveExtraSpaces", 1) call s:InitVariable("g:NERDRPlace", "<]") -call s:InitVariable("g:NERDShutUp", '0') call s:InitVariable("g:NERDSpaceDelims", 0) call s:InitVariable("g:NERDDelimiterRequests", 1) @@ -107,841 +99,632 @@ augroup END function s:SetUpForNewFiletype(filetype, forceReset) "if we have already set the delimiters for this buffer then dont go thru "it again - if !a:forceReset && exists("b:left") && b:left != '' + if !a:forceReset && exists("b:NERDLeft") && b:NERDLeft != '' return endif - let b:sexyComMarker = '' + let b:NERDSexyComMarker = '' "check the filetype against all known filetypes to see if we have "hardcoded the comment delimiters to use - if a:filetype == "" + if a:filetype ==? "" call s:MapDelimiters('', '') - elseif a:filetype == "aap" + elseif a:filetype ==? "aap" call s:MapDelimiters('#', '') - elseif a:filetype == "abaqus" - call s:MapDelimiters('**', '') - elseif a:filetype == "abc" + elseif a:filetype ==? "abc" call s:MapDelimiters('%', '') - elseif a:filetype == "acedb" + elseif a:filetype ==? "acedb" call s:MapDelimitersWithAlternative('//','', '/*','*/') - elseif a:filetype == "actionscript" + elseif a:filetype ==? "actionscript" call s:MapDelimitersWithAlternative('//','', '/*','*/') - elseif a:filetype == "ada" + elseif a:filetype ==? "ada" call s:MapDelimitersWithAlternative('--','', '-- ', '') - elseif a:filetype == "ahdl" + elseif a:filetype ==? "ahdl" call s:MapDelimiters('--', '') - elseif a:filetype == "ahk" + elseif a:filetype ==? "ahk" call s:MapDelimitersWithAlternative(';', '', '/*', '*/') - elseif a:filetype == "amiga" + elseif a:filetype ==? "amiga" call s:MapDelimiters(';', '') - elseif a:filetype == "aml" + elseif a:filetype ==? "aml" call s:MapDelimiters('/*', '') - elseif a:filetype == "ampl" + elseif a:filetype ==? "ampl" call s:MapDelimiters('#', '') - elseif a:filetype == "ant" - call s:MapDelimiters('<!--','-->') - elseif a:filetype == "apache" + elseif a:filetype ==? "apache" call s:MapDelimiters('#', '') - elseif a:filetype == "apachestyle" + elseif a:filetype ==? "apachestyle" call s:MapDelimiters('#', '') - elseif a:filetype == "asciidoc" + elseif a:filetype ==? "asciidoc" call s:MapDelimiters('//', '') - elseif a:filetype == "applescript" + elseif a:filetype ==? "applescript" call s:MapDelimitersWithAlternative('--', '', '(*', '*)') - elseif a:filetype == "asm68k" + elseif a:filetype ==? "asm68k" call s:MapDelimiters(';', '') - elseif a:filetype == "asm" + elseif a:filetype ==? "asm" call s:MapDelimitersWithAlternative(';', '', '#', '') - elseif a:filetype == "asn" + elseif a:filetype ==? "asn" call s:MapDelimiters('--', '') - elseif a:filetype == "aspvbs" + elseif a:filetype ==? "aspvbs" call s:MapDelimiters('''', '') - elseif a:filetype == "asterisk" + elseif a:filetype ==? "asterisk" call s:MapDelimiters(';', '') - elseif a:filetype == "asy" + elseif a:filetype ==? "asy" call s:MapDelimiters('//', '') - elseif a:filetype == "atlas" + elseif a:filetype ==? "atlas" call s:MapDelimiters('C','$') - elseif a:filetype == "autohotkey" + elseif a:filetype ==? "autohotkey" call s:MapDelimiters(';','') - elseif a:filetype == "autoit" + elseif a:filetype ==? "autoit" call s:MapDelimiters(';','') - elseif a:filetype == "automake" - call s:MapDelimiters('##','') - elseif a:filetype == "ave" + elseif a:filetype ==? "ave" call s:MapDelimiters("'",'') - elseif a:filetype == "awk" + elseif a:filetype ==? "awk" call s:MapDelimiters('#','') - elseif a:filetype == "basic" + elseif a:filetype ==? "basic" call s:MapDelimitersWithAlternative("'",'', 'REM ', '') - elseif a:filetype == "b" - call s:MapDelimiters('/*','*/') - elseif a:filetype == "bbx" + elseif a:filetype ==? "bbx" call s:MapDelimiters('%', '') - elseif a:filetype == "bc" + elseif a:filetype ==? "bc" call s:MapDelimiters('#', '') - elseif a:filetype == "bdf" - call s:MapDelimiters('COMMENT ', '') - elseif a:filetype == "bib" + elseif a:filetype ==? "bib" call s:MapDelimiters('%','') - elseif a:filetype == "bindzone" + elseif a:filetype ==? "bindzone" call s:MapDelimiters(';', '') - elseif a:filetype == "bst" + elseif a:filetype ==? "bst" call s:MapDelimiters('%', '') - elseif a:filetype == "btm" + elseif a:filetype ==? "btm" call s:MapDelimiters('::', '') - elseif a:filetype == "bzr" - call s:MapDelimiters('', '') - elseif a:filetype == "caos" + elseif a:filetype ==? "caos" call s:MapDelimiters('*', '') - elseif a:filetype == "calibre" + elseif a:filetype ==? "calibre" call s:MapDelimiters('//','') - elseif a:filetype == "catalog" + elseif a:filetype ==? "catalog" call s:MapDelimiters('--','--') - elseif a:filetype == "c" + elseif a:filetype ==? "c" call s:MapDelimitersWithAlternative('/*','*/', '//', '') - elseif a:filetype == "cfg" + elseif a:filetype ==? "cfg" call s:MapDelimiters('#', '') - elseif a:filetype == "cg" + elseif a:filetype ==? "cg" call s:MapDelimitersWithAlternative('//','', '/*','*/') - elseif a:filetype == "ch" + elseif a:filetype ==? "ch" call s:MapDelimitersWithAlternative('//','', '/*','*/') - elseif a:filetype == "changelog" - call s:MapDelimiters('','') - elseif a:filetype == "cl" + elseif a:filetype ==? "cl" call s:MapDelimiters('#', '') - elseif a:filetype == "clean" + elseif a:filetype ==? "clean" call s:MapDelimitersWithAlternative('//','', '/*','*/') - elseif a:filetype == "clipper" + elseif a:filetype ==? "clipper" call s:MapDelimitersWithAlternative('//','', '/*','*/') - elseif a:filetype == "clojure" + elseif a:filetype ==? "clojure" call s:MapDelimiters(';', '') - elseif a:filetype == "cmake" + elseif a:filetype ==? "cmake" call s:MapDelimiters('#','') - elseif a:filetype == "cobol" - call s:MapDelimiters('', '') - elseif a:filetype == "conf" + elseif a:filetype ==? "conkyrc" call s:MapDelimiters('#', '') - elseif a:filetype == "config" - call s:MapDelimiters('dnl ', '') - elseif a:filetype == "conkyrc" - call s:MapDelimiters('#', '') - elseif a:filetype == "context" - call s:MapDelimiters('%','') - elseif a:filetype == "cpp" + elseif a:filetype ==? "cpp" call s:MapDelimitersWithAlternative('//','', '/*','*/') - elseif a:filetype == "crontab" + elseif a:filetype ==? "crontab" call s:MapDelimiters('#', '') - elseif a:filetype == "cs" + elseif a:filetype ==? "cs" call s:MapDelimitersWithAlternative('//','', '/*','*/') - elseif a:filetype == "csc" - call s:MapDelimiters('/*','*/') - elseif a:filetype == "csp" + elseif a:filetype ==? "csp" call s:MapDelimiters('--', '') - elseif a:filetype == "css" - call s:MapDelimiters('/*','*/') - elseif a:filetype == "cterm" + elseif a:filetype ==? "cterm" call s:MapDelimiters('*', '') - elseif a:filetype == "cupl" - call s:MapDelimiters('/*','*/') - elseif a:filetype == "csv" - call s:MapDelimiters('','') - elseif a:filetype == "cvs" + elseif a:filetype ==? "cucumber" + call s:MapDelimiters('#','') + elseif a:filetype ==? "cvs" call s:MapDelimiters('CVS:','') - elseif a:filetype == "CVSAnnotate" - call s:MapDelimiters('','') - elseif a:filetype == "CVScommit" - call s:MapDelimiters('','') - elseif a:filetype == "d" + elseif a:filetype ==? "d" call s:MapDelimitersWithAlternative('//','', '/*','*/') - elseif a:filetype == "dcl" + elseif a:filetype ==? "dcl" call s:MapDelimiters('$!', '') - elseif a:filetype == "dakota" + elseif a:filetype ==? "dakota" call s:MapDelimiters('#', '') - elseif a:filetype == "debchangelog" - call s:MapDelimiters('', '') - elseif a:filetype == "debcontrol" + elseif a:filetype ==? "debcontrol" call s:MapDelimiters('#', '') - elseif a:filetype == "debsources" + elseif a:filetype ==? "debsources" call s:MapDelimiters('#', '') - elseif a:filetype == "def" + elseif a:filetype ==? "def" call s:MapDelimiters(';', '') - elseif a:filetype == "desktop" + elseif a:filetype ==? "desktop" + call s:MapDelimiters('#', '') + elseif a:filetype ==? "dhcpd" call s:MapDelimiters('#', '') - elseif a:filetype == "diff" + elseif a:filetype ==? "diff" call s:MapDelimiters('#', '') - elseif a:filetype == "django" + elseif a:filetype ==? "django" call s:MapDelimitersWithAlternative('<!--','-->', '{#', '#}') - elseif a:filetype == "docbk" + elseif a:filetype ==? "docbk" call s:MapDelimiters('<!--', '-->') - elseif a:filetype == "dns" + elseif a:filetype ==? "dns" call s:MapDelimiters(';', '') - elseif a:filetype == "dosbatch" + elseif a:filetype ==? "dosbatch" call s:MapDelimitersWithAlternative('REM ','', '::', '') - elseif a:filetype == "dosini" + elseif a:filetype ==? "dosini" call s:MapDelimiters(';', '') - elseif a:filetype == "dot" + elseif a:filetype ==? "dot" call s:MapDelimitersWithAlternative('//','', '/*','*/') - elseif a:filetype == "dracula" + elseif a:filetype ==? "dracula" call s:MapDelimiters(';', '') - elseif a:filetype == "dsl" + elseif a:filetype ==? "dsl" call s:MapDelimiters(';', '') - elseif a:filetype == "dtd" - call s:MapDelimiters('<!--','-->') - elseif a:filetype == "dtml" + elseif a:filetype ==? "dtml" call s:MapDelimiters('<dtml-comment>','</dtml-comment>') - elseif a:filetype == "dtrace" - call s:MapDelimiters('/*','*/') - elseif a:filetype == "dylan" + elseif a:filetype ==? "dylan" call s:MapDelimitersWithAlternative('//','', '/*','*/') - elseif a:filetype == 'ebuild' + elseif a:filetype ==? 'ebuild' call s:MapDelimiters('#', '') - elseif a:filetype == "ecd" + elseif a:filetype ==? "ecd" call s:MapDelimiters('#', '') - elseif a:filetype == 'eclass' + elseif a:filetype ==? 'eclass' call s:MapDelimiters('#', '') - elseif a:filetype == "eiffel" + elseif a:filetype ==? "eiffel" call s:MapDelimiters('--', '') - elseif a:filetype == "elf" + elseif a:filetype ==? "elf" call s:MapDelimiters("'", '') - elseif a:filetype == "elmfilt" + elseif a:filetype ==? "elmfilt" call s:MapDelimiters('#', '') - elseif a:filetype == "erlang" + elseif a:filetype ==? "erlang" call s:MapDelimiters('%', '') - elseif a:filetype == "eruby" - call s:MapDelimitersWithAlternative('<!--', '-->', '<%#', '%>') - elseif a:filetype == "eterm" - call s:MapDelimiters('#', '') - elseif a:filetype == "expect" + elseif a:filetype ==? "eruby" + call s:MapDelimitersWithAlternative('<%#', '%>', '<!--', '-->') + elseif a:filetype ==? "expect" call s:MapDelimiters('#', '') - elseif a:filetype == "exports" + elseif a:filetype ==? "exports" call s:MapDelimiters('#', '') - elseif a:filetype == "factor" + elseif a:filetype ==? "factor" call s:MapDelimitersWithAlternative('! ', '', '!# ', '') - elseif a:filetype == "fetchmail" - call s:MapDelimiters('#', '') - elseif a:filetype == "fgl" + elseif a:filetype ==? "fgl" call s:MapDelimiters('#', '') - elseif a:filetype == "focexec" + elseif a:filetype ==? "focexec" call s:MapDelimiters('-*', '') - elseif a:filetype == "form" + elseif a:filetype ==? "form" call s:MapDelimiters('*', '') - elseif a:filetype == "fortran" - call s:MapDelimiters('!', '') - elseif a:filetype == "foxpro" + elseif a:filetype ==? "foxpro" call s:MapDelimiters('*', '') - elseif a:filetype == "fstab" + elseif a:filetype ==? "fstab" call s:MapDelimiters('#', '') - elseif a:filetype == "fvwm" + elseif a:filetype ==? "fvwm" call s:MapDelimiters('#', '') - elseif a:filetype == "fx" + elseif a:filetype ==? "fx" call s:MapDelimitersWithAlternative('//','', '/*','*/') - elseif a:filetype == "gams" + elseif a:filetype ==? "gams" call s:MapDelimiters('*', '') - elseif a:filetype == "gdb" + elseif a:filetype ==? "gdb" call s:MapDelimiters('#', '') - elseif a:filetype == "gdmo" + elseif a:filetype ==? "gdmo" call s:MapDelimiters('--', '') - elseif a:filetype == "geek" + elseif a:filetype ==? "geek" call s:MapDelimiters('GEEK_COMMENT:', '') - elseif a:filetype == "genshi" + elseif a:filetype ==? "genshi" call s:MapDelimitersWithAlternative('<!--','-->', '{#', '#}') - elseif a:filetype == "gentoo-conf-d" + elseif a:filetype ==? "gentoo-conf-d" call s:MapDelimiters('#', '') - elseif a:filetype == "gentoo-env-d" + elseif a:filetype ==? "gentoo-env-d" call s:MapDelimiters('#', '') - elseif a:filetype == "gentoo-init-d" + elseif a:filetype ==? "gentoo-init-d" call s:MapDelimiters('#', '') - elseif a:filetype == "gentoo-make-conf" + elseif a:filetype ==? "gentoo-make-conf" call s:MapDelimiters('#', '') - elseif a:filetype == 'gentoo-package-keywords' + elseif a:filetype ==? 'gentoo-package-keywords' call s:MapDelimiters('#', '') - elseif a:filetype == 'gentoo-package-mask' + elseif a:filetype ==? 'gentoo-package-mask' call s:MapDelimiters('#', '') - elseif a:filetype == 'gentoo-package-use' + elseif a:filetype ==? 'gentoo-package-use' call s:MapDelimiters('#', '') - elseif a:filetype == 'git' - call s:MapDelimiters('', '') - elseif a:filetype == 'gitAnnotate' - call s:MapDelimiters('', '') - elseif a:filetype == 'gitcommit' + elseif a:filetype ==? 'gitcommit' call s:MapDelimiters('#', '') - elseif a:filetype == 'gitconfig' + elseif a:filetype ==? 'gitconfig' call s:MapDelimiters(';', '') - elseif a:filetype == 'gitdiff' - call s:MapDelimiters('', '') - elseif a:filetype == 'gitrebase' + elseif a:filetype ==? 'gitrebase' call s:MapDelimiters('#', '') - elseif a:filetype == "gnuplot" + elseif a:filetype ==? "gnuplot" call s:MapDelimiters('#','') - elseif a:filetype == "groovy" + elseif a:filetype ==? "groovy" call s:MapDelimitersWithAlternative('//','', '/*','*/') - elseif a:filetype == "group" - call s:MapDelimiters('','') - elseif a:filetype == "grub" + elseif a:filetype ==? "gtkrc" call s:MapDelimiters('#', '') - elseif a:filetype == "gtkrc" - call s:MapDelimiters('#', '') - elseif a:filetype == "haskell" + elseif a:filetype ==? "haskell" call s:MapDelimitersWithAlternative('{-','-}', '--', '') - elseif a:filetype == "hb" + elseif a:filetype ==? "hb" call s:MapDelimiters('#', '') - elseif a:filetype == "h" + elseif a:filetype ==? "h" call s:MapDelimitersWithAlternative('//','', '/*','*/') - elseif a:filetype == "haml" + elseif a:filetype ==? "haml" call s:MapDelimitersWithAlternative('-#', '', '/', '') - elseif a:filetype == "help" - call s:MapDelimiters('"','') - elseif a:filetype == "hercules" + elseif a:filetype ==? "hercules" call s:MapDelimitersWithAlternative('//','', '/*','*/') - elseif a:filetype == "hog" + elseif a:filetype ==? "hog" call s:MapDelimiters('#', '') - elseif a:filetype == "hostsaccess" + elseif a:filetype ==? "hostsaccess" call s:MapDelimiters('#', '') - elseif a:filetype == "html" - call s:MapDelimitersWithAlternative('<!--','-->', '//', '') - elseif a:filetype == "htmldjango" + elseif a:filetype ==? "htmlcheetah" + call s:MapDelimiters('##','') + elseif a:filetype ==? "htmldjango" call s:MapDelimitersWithAlternative('<!--','-->', '{#', '#}') - elseif a:filetype == "htmlos" + elseif a:filetype ==? "htmlos" call s:MapDelimiters('#','/#') - elseif a:filetype == "ia64" + elseif a:filetype ==? "ia64" call s:MapDelimiters('#', '') - elseif a:filetype == "icon" + elseif a:filetype ==? "icon" call s:MapDelimiters('#', '') - elseif a:filetype == "idlang" + elseif a:filetype ==? "idlang" call s:MapDelimiters(';', '') - elseif a:filetype == "idl" + elseif a:filetype ==? "idl" call s:MapDelimitersWithAlternative('//','', '/*','*/') - elseif a:filetype == "indent" - call s:MapDelimiters('/*','*/') - elseif a:filetype == "inform" + elseif a:filetype ==? "inform" call s:MapDelimiters('!', '') - elseif a:filetype == "inittab" + elseif a:filetype ==? "inittab" call s:MapDelimiters('#', '') - elseif a:filetype == "ishd" + elseif a:filetype ==? "ishd" call s:MapDelimitersWithAlternative('//','', '/*','*/') - elseif a:filetype == "iss" + elseif a:filetype ==? "iss" call s:MapDelimiters(';', '') - elseif a:filetype == "ist" + elseif a:filetype ==? "ist" call s:MapDelimiters('%', '') - elseif a:filetype == "jam" - call s:MapDelimiters('/*','*/') - elseif a:filetype == "java" + elseif a:filetype ==? "java" + call s:MapDelimitersWithAlternative('//','', '/*','*/') + elseif a:filetype ==? "javacc" + call s:MapDelimitersWithAlternative('//','', '/*','*/') + elseif a:filetype ==? "javascript" call s:MapDelimitersWithAlternative('//','', '/*','*/') - elseif a:filetype == "javascript" + elseif a:filetype == "javascript.jquery" call s:MapDelimitersWithAlternative('//','', '/*','*/') - elseif a:filetype == "jess" + elseif a:filetype ==? "jess" call s:MapDelimiters(';', '') - elseif a:filetype == "jgraph" + elseif a:filetype ==? "jgraph" call s:MapDelimiters('(*','*)') - elseif a:filetype == "jproperties" + elseif a:filetype ==? "jproperties" call s:MapDelimiters('#','') - elseif a:filetype == "jsp" + elseif a:filetype ==? "jsp" call s:MapDelimiters('<%--', '--%>') - elseif a:filetype == "kconfig" - call s:MapDelimiters('#', '') - elseif a:filetype == "kix" + elseif a:filetype ==? "kix" call s:MapDelimiters(';', '') - elseif a:filetype == "kscript" + elseif a:filetype ==? "kscript" call s:MapDelimitersWithAlternative('//','', '/*','*/') - elseif a:filetype == "lace" + elseif a:filetype ==? "lace" call s:MapDelimiters('--', '') - elseif a:filetype == "ldif" - call s:MapDelimiters('#', '') - elseif a:filetype == "lex" - call s:MapDelimiters('/*','*/') - elseif a:filetype == "lftp" + elseif a:filetype ==? "ldif" call s:MapDelimiters('#', '') - elseif a:filetype == "lhaskell" - call s:MapDelimiters('','') - elseif a:filetype == "lifelines" - call s:MapDelimiters('/*','*/') - elseif a:filetype == "lilo" + elseif a:filetype ==? "lilo" call s:MapDelimiters('#', '') - elseif a:filetype == "lilypond" + elseif a:filetype ==? "lilypond" call s:MapDelimiters('%', '') - elseif a:filetype == "liquid" + elseif a:filetype ==? "liquid" call s:MapDelimiters('{%', '%}') - elseif a:filetype == "lisp" + elseif a:filetype ==? "lisp" call s:MapDelimitersWithAlternative(';','', '#|', '|#') - elseif a:filetype == "lite" - call s:MapDelimiters('/*','*/') - elseif a:filetype == "llvm" + elseif a:filetype ==? "llvm" call s:MapDelimiters(';','') - elseif a:filetype == "lookupfile" - call s:MapDelimiters('', '') - elseif a:filetype == "lotos" + elseif a:filetype ==? "lotos" call s:MapDelimiters('(*','*)') - elseif a:filetype == "lout" + elseif a:filetype ==? "lout" call s:MapDelimiters('#', '') - elseif a:filetype == "lprolog" + elseif a:filetype ==? "lprolog" call s:MapDelimiters('%', '') - elseif a:filetype == "lscript" + elseif a:filetype ==? "lscript" call s:MapDelimiters("'", '') - elseif a:filetype == "lss" + elseif a:filetype ==? "lss" call s:MapDelimiters('#', '') - elseif a:filetype == "lua" + elseif a:filetype ==? "lua" call s:MapDelimitersWithAlternative('--','', '--[[', ']]') - elseif a:filetype == "lynx" + elseif a:filetype ==? "lynx" call s:MapDelimiters('#', '') - elseif a:filetype == "lytex" + elseif a:filetype ==? "lytex" call s:MapDelimiters('%', '') - elseif a:filetype == "m4" - call s:MapDelimiters('dnl ', '') - elseif a:filetype == "mail" + elseif a:filetype ==? "mail" call s:MapDelimiters('> ','') - elseif a:filetype == "mailcap" - call s:MapDelimiters('#','') - elseif a:filetype == "make" - call s:MapDelimiters('#','') - elseif a:filetype == "mako" + elseif a:filetype ==? "mako" call s:MapDelimiters('##', '') - elseif a:filetype == "man" + elseif a:filetype ==? "man" call s:MapDelimiters('."', '') - elseif a:filetype == "map" + elseif a:filetype ==? "map" call s:MapDelimiters('%', '') - elseif a:filetype == "maple" + elseif a:filetype ==? "maple" call s:MapDelimiters('#', '') - elseif a:filetype == "markdown" + elseif a:filetype ==? "markdown" call s:MapDelimiters('<!--', '-->') - elseif a:filetype == "masm" + elseif a:filetype ==? "masm" call s:MapDelimiters(';', '') - elseif a:filetype == "mason" + elseif a:filetype ==? "mason" call s:MapDelimiters('<% #', '%>') - elseif a:filetype == "master" + elseif a:filetype ==? "master" call s:MapDelimiters('$', '') - elseif a:filetype == "matlab" + elseif a:filetype ==? "matlab" call s:MapDelimiters('%', '') - elseif a:filetype == "mel" + elseif a:filetype ==? "mel" call s:MapDelimitersWithAlternative('//','', '/*','*/') - elseif a:filetype == "mf" - call s:MapDelimiters('%', '') - elseif a:filetype == "mib" + elseif a:filetype ==? "mib" call s:MapDelimiters('--', '') - elseif a:filetype == "mkd" + elseif a:filetype ==? "mkd" call s:MapDelimiters('>', '') - elseif a:filetype == "mma" + elseif a:filetype ==? "mma" call s:MapDelimiters('(*','*)') - elseif a:filetype == "modconf" - call s:MapDelimiters('#', '') - elseif a:filetype == "model" + elseif a:filetype ==? "model" call s:MapDelimiters('$','$') elseif a:filetype =~ "moduala." call s:MapDelimiters('(*','*)') - elseif a:filetype == "modula2" + elseif a:filetype ==? "modula2" call s:MapDelimiters('(*','*)') - elseif a:filetype == "modula3" + elseif a:filetype ==? "modula3" call s:MapDelimiters('(*','*)') - elseif a:filetype == "monk" + elseif a:filetype ==? "monk" call s:MapDelimiters(';', '') - elseif a:filetype == "mplayerconf" + elseif a:filetype ==? "mush" call s:MapDelimiters('#', '') - elseif a:filetype == "mrxvtrc" - call s:MapDelimiters('#', '') - elseif a:filetype == "mush" - call s:MapDelimiters('#', '') - elseif a:filetype == "muttrc" - call s:MapDelimiters('#', '') - elseif a:filetype == "named" + elseif a:filetype ==? "named" call s:MapDelimitersWithAlternative('//','', '/*','*/') - elseif a:filetype == "nasm" + elseif a:filetype ==? "nasm" call s:MapDelimiters(';', '') - elseif a:filetype == "nastran" + elseif a:filetype ==? "nastran" call s:MapDelimiters('$', '') - elseif a:filetype == "natural" + elseif a:filetype ==? "natural" call s:MapDelimiters('/*', '') - elseif a:filetype == "ncf" + elseif a:filetype ==? "ncf" call s:MapDelimiters(';', '') - elseif a:filetype == "nerdtree" - call s:MapDelimiters('', '') - elseif a:filetype == "netdict" - call s:MapDelimiters('', '') - elseif a:filetype == "netrw" - call s:MapDelimiters('', '') - elseif a:filetype == "newlisp" + elseif a:filetype ==? "newlisp" call s:MapDelimiters(';','') - elseif a:filetype == "nqc" - call s:MapDelimiters('/*','*/') - elseif a:filetype == "nroff" + elseif a:filetype ==? "nroff" call s:MapDelimiters('\"', '') - elseif a:filetype == "nsis" + elseif a:filetype ==? "nsis" + call s:MapDelimiters('#', '') + elseif a:filetype ==? "ntp" call s:MapDelimiters('#', '') - elseif a:filetype == "objc" + elseif a:filetype ==? "objc" call s:MapDelimitersWithAlternative('//','', '/*','*/') - elseif a:filetype == "objcpp" + elseif a:filetype ==? "objcpp" call s:MapDelimitersWithAlternative('//','', '/*','*/') - elseif a:filetype == "objj" + elseif a:filetype ==? "objj" call s:MapDelimitersWithAlternative('//','', '/*','*/') - elseif a:filetype == "ocaml" + elseif a:filetype ==? "ocaml" call s:MapDelimiters('(*','*)') - elseif a:filetype == "occam" + elseif a:filetype ==? "occam" call s:MapDelimiters('--','') - elseif a:filetype == "omlet" + elseif a:filetype ==? "omlet" call s:MapDelimiters('(*','*)') - elseif a:filetype == "omnimark" + elseif a:filetype ==? "omnimark" call s:MapDelimiters(';', '') - elseif a:filetype == "openroad" + elseif a:filetype ==? "openroad" call s:MapDelimiters('//', '') - elseif a:filetype == "opl" + elseif a:filetype ==? "opl" call s:MapDelimiters("REM", "") - elseif a:filetype == "ora" + elseif a:filetype ==? "ora" call s:MapDelimiters('#', '') - elseif a:filetype == "otl" - call s:MapDelimiters('', '') - elseif a:filetype == "ox" + elseif a:filetype ==? "ox" call s:MapDelimiters('//', '') - elseif a:filetype == "pamconf" - call s:MapDelimiters('#', '') - elseif a:filetype == "pascal" + elseif a:filetype ==? "pascal" call s:MapDelimitersWithAlternative('{','}', '(*', '*)') - elseif a:filetype == "passwd" - call s:MapDelimiters('','') - elseif a:filetype == "patran" + elseif a:filetype ==? "patran" call s:MapDelimitersWithAlternative('$','','/*', '*/') - elseif a:filetype == "pcap" + elseif a:filetype ==? "pcap" call s:MapDelimiters('#', '') - elseif a:filetype == "pccts" + elseif a:filetype ==? "pccts" call s:MapDelimitersWithAlternative('//','', '/*','*/') - elseif a:filetype == "perl" - call s:MapDelimiters('#', '') - elseif a:filetype == "pfmain" + elseif a:filetype ==? "pdf" + call s:MapDelimiters('%', '') + elseif a:filetype ==? "pfmain" call s:MapDelimiters('//', '') - elseif a:filetype == "php" + elseif a:filetype ==? "php" call s:MapDelimitersWithAlternative('//','','/*', '*/') - elseif a:filetype == "phtml" - call s:MapDelimiters('/*','*/') - elseif a:filetype == "pic" + elseif a:filetype ==? "pic" call s:MapDelimiters(';', '') - elseif a:filetype == "pike" + elseif a:filetype ==? "pike" call s:MapDelimitersWithAlternative('//','', '/*','*/') - elseif a:filetype == "pilrc" + elseif a:filetype ==? "pilrc" call s:MapDelimitersWithAlternative('//','', '/*','*/') - elseif a:filetype == "pine" + elseif a:filetype ==? "pine" call s:MapDelimiters('#', '') - elseif a:filetype == "plaintex" - call s:MapDelimiters('%','') - elseif a:filetype == "plm" + elseif a:filetype ==? "plm" call s:MapDelimitersWithAlternative('//','', '/*','*/') - elseif a:filetype == "plsql" + elseif a:filetype ==? "plsql" call s:MapDelimitersWithAlternative('--', '', '/*', '*/') - elseif a:filetype == "po" + elseif a:filetype ==? "po" call s:MapDelimiters('#', '') - elseif a:filetype == "postscr" + elseif a:filetype ==? "postscr" call s:MapDelimiters('%', '') - elseif a:filetype == "potwiki" - call s:MapDelimiters('', '') - elseif a:filetype == "pov" + elseif a:filetype ==? "pov" call s:MapDelimitersWithAlternative('//','', '/*','*/') - elseif a:filetype == "povini" + elseif a:filetype ==? "povini" call s:MapDelimiters(';', '') - elseif a:filetype == "ppd" + elseif a:filetype ==? "ppd" call s:MapDelimiters('%', '') - elseif a:filetype == "ppwiz" + elseif a:filetype ==? "ppwiz" call s:MapDelimiters(';;', '') - elseif a:filetype == "processing" + elseif a:filetype ==? "processing" call s:MapDelimitersWithAlternative('//','', '/*','*/') - elseif a:filetype == "procmail" - call s:MapDelimiters('#', '') - elseif a:filetype == "progress" - call s:MapDelimiters('/*','*/') - elseif a:filetype == "prolog" + elseif a:filetype ==? "prolog" call s:MapDelimitersWithAlternative('%','','/*','*/') - elseif a:filetype == "ps1" + elseif a:filetype ==? "ps1" call s:MapDelimiters('#', '') - elseif a:filetype == "psf" + elseif a:filetype ==? "psf" call s:MapDelimiters('#', '') - elseif a:filetype == "ptcap" + elseif a:filetype ==? "ptcap" call s:MapDelimiters('#', '') - elseif a:filetype == "pyrex" - call s:MapDelimiters('#','') - elseif a:filetype == "python" - call s:MapDelimiters('#','') - elseif a:filetype == "qf" - call s:MapDelimiters('','') - elseif a:filetype == "radiance" + elseif a:filetype ==? "radiance" call s:MapDelimiters('#', '') - elseif a:filetype == "Rails-log" - call s:MapDelimiters('', '') - elseif a:filetype == "ratpoison" + elseif a:filetype ==? "ratpoison" call s:MapDelimiters('#', '') - elseif a:filetype == "r" + elseif a:filetype ==? "r" call s:MapDelimiters('#', '') - elseif a:filetype == "rc" + elseif a:filetype ==? "rc" call s:MapDelimitersWithAlternative('//','', '/*','*/') - elseif a:filetype == "readline" - call s:MapDelimiters('#', '') - elseif a:filetype == "rebol" + elseif a:filetype ==? "rebol" call s:MapDelimiters(';', '') - elseif a:filetype == "registry" + elseif a:filetype ==? "registry" call s:MapDelimiters(';', '') - elseif a:filetype == "remind" + elseif a:filetype ==? "remind" call s:MapDelimiters('#', '') - elseif a:filetype == "rexx" - call s:MapDelimiters('/*','*/') - elseif a:filetype == "rib" - call s:MapDelimiters('#','') - elseif a:filetype == "robots" + elseif a:filetype ==? "resolv" call s:MapDelimiters('#', '') - elseif a:filetype == "rpl" - call s:MapDelimiters('/*','*/') - elseif a:filetype == "rst" - call s:MapDelimiters('..', '') - elseif a:filetype == "rtf" - call s:MapDelimiters('', '') - elseif a:filetype == "ruby" + elseif a:filetype ==? "rgb" + call s:MapDelimiters('!', '') + elseif a:filetype ==? "rib" call s:MapDelimiters('#','') - elseif a:filetype == "sa" + elseif a:filetype ==? "robots" + call s:MapDelimiters('#', '') + elseif a:filetype ==? "sa" call s:MapDelimiters('--','') - elseif a:filetype == "samba" + elseif a:filetype ==? "samba" call s:MapDelimitersWithAlternative(';','', '#', '') - elseif a:filetype == "sas" - call s:MapDelimiters('/*','*/') - elseif a:filetype == "sass" + elseif a:filetype ==? "sass" call s:MapDelimitersWithAlternative('//','', '/*', '') - elseif a:filetype == "sather" + elseif a:filetype ==? "sather" call s:MapDelimiters('--', '') - elseif a:filetype == "scala" + elseif a:filetype ==? "scala" call s:MapDelimitersWithAlternative('//','', '/*','*/') - elseif a:filetype == "scheme" - call s:MapDelimiters(';', '') - elseif a:filetype == "scilab" + elseif a:filetype ==? "scilab" call s:MapDelimiters('//', '') - elseif a:filetype == "screen" - call s:MapDelimiters('#', '') - elseif a:filetype == "scsh" + elseif a:filetype ==? "scsh" call s:MapDelimiters(';', '') - elseif a:filetype == "sdl" - call s:MapDelimiters('/*','*/') - elseif a:filetype == "sed" + elseif a:filetype ==? "sed" call s:MapDelimiters('#', '') - elseif a:filetype == "selectbuf" - call s:MapDelimiters('', '') - elseif a:filetype == "services" - call s:MapDelimiters('#', '') - elseif a:filetype == "sgml" - call s:MapDelimiters('<!','>') - elseif a:filetype == "sgmldecl" + elseif a:filetype ==? "sgmldecl" call s:MapDelimiters('--','--') - elseif a:filetype == "sgmllnx" + elseif a:filetype ==? "sgmllnx" call s:MapDelimiters('<!--','-->') - elseif a:filetype == "sicad" + elseif a:filetype ==? "sicad" call s:MapDelimiters('*', '') - elseif a:filetype == "sieve" - call s:MapDelimiters('#', '') - elseif a:filetype == "simula" + elseif a:filetype ==? "simula" call s:MapDelimitersWithAlternative('%', '', '--', '') - elseif a:filetype == "sinda" + elseif a:filetype ==? "sinda" call s:MapDelimiters('$', '') - elseif a:filetype == "skill" + elseif a:filetype ==? "skill" call s:MapDelimiters(';', '') - elseif a:filetype == "slang" + elseif a:filetype ==? "slang" call s:MapDelimiters('%', '') - elseif a:filetype == "sl" - call s:MapDelimiters('/*','*/') - elseif a:filetype == "slice" + elseif a:filetype ==? "slice" call s:MapDelimitersWithAlternative('//','', '/*','*/') - elseif a:filetype == "slrnrc" + elseif a:filetype ==? "slrnrc" call s:MapDelimiters('%', '') - elseif a:filetype == "sm" + elseif a:filetype ==? "sm" call s:MapDelimiters('#', '') - elseif a:filetype == "smarty" + elseif a:filetype ==? "smarty" call s:MapDelimiters('{*', '*}') - elseif a:filetype == "smil" + elseif a:filetype ==? "smil" call s:MapDelimiters('<!','>') - elseif a:filetype == "smith" + elseif a:filetype ==? "smith" call s:MapDelimiters(';', '') - elseif a:filetype == "sml" + elseif a:filetype ==? "sml" call s:MapDelimiters('(*','*)') - elseif a:filetype == "snnsnet" + elseif a:filetype ==? "snnsnet" call s:MapDelimiters('#', '') - elseif a:filetype == "snnspat" + elseif a:filetype ==? "snnspat" call s:MapDelimiters('#', '') - elseif a:filetype == "snnsres" + elseif a:filetype ==? "snnsres" call s:MapDelimiters('#', '') - elseif a:filetype == "snobol4" + elseif a:filetype ==? "snobol4" call s:MapDelimiters('*', '') - elseif a:filetype == "spec" + elseif a:filetype ==? "spec" call s:MapDelimiters('#', '') - elseif a:filetype == "specman" + elseif a:filetype ==? "specman" call s:MapDelimiters('//', '') - elseif a:filetype == "spectre" + elseif a:filetype ==? "spectre" call s:MapDelimitersWithAlternative('//', '', '*', '') - elseif a:filetype == "spice" + elseif a:filetype ==? "spice" call s:MapDelimiters('$', '') - elseif a:filetype == "sql" + elseif a:filetype ==? "sql" call s:MapDelimiters('--', '') - elseif a:filetype == "sqlforms" + elseif a:filetype ==? "sqlforms" call s:MapDelimiters('--', '') - elseif a:filetype == "sqlj" + elseif a:filetype ==? "sqlj" call s:MapDelimiters('--', '') - elseif a:filetype == "sqr" + elseif a:filetype ==? "sqr" call s:MapDelimiters('!', '') - elseif a:filetype == "squid" + elseif a:filetype ==? "squid" call s:MapDelimiters('#', '') - elseif a:filetype == "st" + elseif a:filetype ==? "st" call s:MapDelimiters('"','') - elseif a:filetype == "stata" - call s:MapDelimiters('/*','*/') - elseif a:filetype == "stp" + elseif a:filetype ==? "stp" call s:MapDelimiters('--', '') - elseif a:filetype == "strace" - call s:MapDelimiters('/*','*/') - elseif a:filetype == "sudoers" - call s:MapDelimiters('#', '') - elseif a:filetype == "SVKAnnotate" - call s:MapDelimiters('','') - elseif a:filetype == "svn" - call s:MapDelimiters('','') - elseif a:filetype == "SVNannotate" - call s:MapDelimiters('','') - elseif a:filetype == "SVNAnnotate" - call s:MapDelimiters('','') - elseif a:filetype == "SVNcommit" - call s:MapDelimiters('','') - elseif a:filetype == "SVNcommitlog" - call s:MapDelimiters('','') - elseif a:filetype == "SVNdiff" - call s:MapDelimiters('','') - elseif a:filetype == "SVNinfo" - call s:MapDelimiters('','') - elseif a:filetype == "systemverilog" + elseif a:filetype ==? "systemverilog" call s:MapDelimitersWithAlternative('//','', '/*','*/') - elseif a:filetype == "tads" + elseif a:filetype ==? "tads" call s:MapDelimitersWithAlternative('//','', '/*','*/') - elseif a:filetype == "taglist" - call s:MapDelimiters('', '') - elseif a:filetype == "tags" + elseif a:filetype ==? "tags" call s:MapDelimiters(';', '') - elseif a:filetype == "tak" + elseif a:filetype ==? "tak" call s:MapDelimiters('$', '') - elseif a:filetype == "tar" - call s:MapDelimiters('', '') - elseif a:filetype == "tasm" + elseif a:filetype ==? "tasm" call s:MapDelimiters(';', '') - elseif a:filetype == "tcl" + elseif a:filetype ==? "tcl" call s:MapDelimiters('#','') - elseif a:filetype == "terminfo" - call s:MapDelimiters('#', '') - elseif a:filetype == "tex" - call s:MapDelimiters('%','') - elseif a:filetype == "text" - call s:MapDelimiters('','') - elseif a:filetype == "texinfo" + elseif a:filetype ==? "texinfo" call s:MapDelimiters("@c ", "") - elseif a:filetype == "texmf" + elseif a:filetype ==? "texmf" call s:MapDelimiters('%', '') - elseif a:filetype == "tf" + elseif a:filetype ==? "tf" call s:MapDelimiters(';', '') - elseif a:filetype == "tidy" + elseif a:filetype ==? "tidy" call s:MapDelimiters('#', '') - elseif a:filetype == "tli" + elseif a:filetype ==? "tli" call s:MapDelimiters('#', '') - elseif a:filetype == "trasys" + elseif a:filetype ==? "trasys" call s:MapDelimiters("$", "") - elseif a:filetype == "tsalt" + elseif a:filetype ==? "tsalt" call s:MapDelimitersWithAlternative('//','', '/*','*/') - elseif a:filetype == "tsscl" + elseif a:filetype ==? "tsscl" call s:MapDelimiters('#', '') - elseif a:filetype == "tssgm" + elseif a:filetype ==? "tssgm" call s:MapDelimiters("comment = '","'") - elseif a:filetype == "txt2tags" + elseif a:filetype ==? "txt2tags" call s:MapDelimiters('%','') - elseif a:filetype == "uc" + elseif a:filetype ==? "uc" call s:MapDelimitersWithAlternative('//','', '/*','*/') - elseif a:filetype == "uil" + elseif a:filetype ==? "uil" call s:MapDelimiters('!', '') - elseif a:filetype == "vb" + elseif a:filetype ==? "vb" call s:MapDelimiters("'","") - elseif a:filetype == "vcscommit" - call s:MapDelimiters('','') - elseif a:filetype == "velocity" + elseif a:filetype ==? "velocity" call s:MapDelimitersWithAlternative("##","", '#*', '*#') - elseif a:filetype == "vera" + elseif a:filetype ==? "vera" call s:MapDelimitersWithAlternative('/*','*/','//','') - elseif a:filetype == "verilog" + elseif a:filetype ==? "verilog" call s:MapDelimitersWithAlternative('//','', '/*','*/') - elseif a:filetype == "verilog_systemverilog" + elseif a:filetype ==? "verilog_systemverilog" call s:MapDelimitersWithAlternative('//','', '/*','*/') - elseif a:filetype == "vgrindefs" + elseif a:filetype ==? "vgrindefs" call s:MapDelimiters('#', '') - elseif a:filetype == "vhdl" + elseif a:filetype ==? "vhdl" call s:MapDelimiters('--', '') - elseif a:filetype == "vim" - call s:MapDelimiters('"','') - elseif a:filetype == "viminfo" - call s:MapDelimiters('','') - elseif a:filetype == "vimperator" + elseif a:filetype ==? "vimperator" call s:MapDelimiters('"','') - elseif a:filetype == "virata" + elseif a:filetype ==? "virata" call s:MapDelimiters('%', '') - elseif a:filetype == "vo_base" - call s:MapDelimiters('', '') - elseif a:filetype == "vrml" + elseif a:filetype ==? "vrml" call s:MapDelimiters('#', '') - elseif a:filetype == "vsejcl" + elseif a:filetype ==? "vsejcl" call s:MapDelimiters('/*', '') - elseif a:filetype == "webmacro" + elseif a:filetype ==? "webmacro" call s:MapDelimiters('##', '') - elseif a:filetype == "wget" + elseif a:filetype ==? "wget" call s:MapDelimiters('#', '') elseif a:filetype ==? "Wikipedia" call s:MapDelimiters('<!--','-->') - elseif a:filetype == "winbatch" + elseif a:filetype ==? "winbatch" call s:MapDelimiters(';', '') - elseif a:filetype == "wml" - call s:MapDelimiters('#', '') - elseif a:filetype =~ "[^w]*sh" + elseif a:filetype ==? "wml" call s:MapDelimiters('#', '') - elseif a:filetype == "wvdial" + elseif a:filetype ==? "wvdial" call s:MapDelimiters(';', '') - elseif a:filetype == "xdefaults" + elseif a:filetype ==? "xdefaults" call s:MapDelimiters('!', '') - elseif a:filetype == "xf86conf" - call s:MapDelimiters('#', '') - elseif a:filetype == "xhtml" - call s:MapDelimiters('<!--', '-->') - elseif a:filetype == "xkb" + elseif a:filetype ==? "xkb" call s:MapDelimiters('//', '') - elseif a:filetype == "xmath" + elseif a:filetype ==? "xmath" call s:MapDelimiters('#', '') - elseif a:filetype == "xml" - call s:MapDelimiters('<!--','-->') - elseif a:filetype == "xmodmap" - call s:MapDelimiters('!', '') - elseif a:filetype == "xpm2" + elseif a:filetype ==? "xpm2" call s:MapDelimiters('!', '') - elseif a:filetype == "xpm" - call s:MapDelimiters('/*','*/') - elseif a:filetype == "xsd" - call s:MapDelimiters('<!--','-->') - elseif a:filetype == "xslt" - call s:MapDelimiters('<!--','-->') - elseif a:filetype == "yacc" - call s:MapDelimiters('/*','*/') - elseif a:filetype == "yaml" - call s:MapDelimiters('#','') - elseif a:filetype == "xquery" + elseif a:filetype ==? "xquery" call s:MapDelimiters('(:',':)') - elseif a:filetype == "z8a" + elseif a:filetype ==? "z8a" call s:MapDelimiters(';', '') - elseif a:filetype == "" - call s:MapDelimitersWithAlternative("","", "", "") - - "we have not hardcoded the comment delimiters to use for this filetype so - "get them from &commentstring. else - "print a disclaimer to the user :) - if !g:NERDShutUp - call s:NerdEcho("Unknown filetype '".a:filetype."', setting delimiters by &commentstring.\nPleeeeease email the author of the NERD commenter with this filetype\nand its delimiters!", 0) - endif "extract the delims from &commentstring - let left= substitute(&commentstring, '\(.*\)%s.*', '\1', '') - let right= substitute(&commentstring, '.*%s\(.*\)', '\1', 'g') - + let left= substitute(&commentstring, '\([^ \t]*\)\s*%s.*', '\1', '') + let right= substitute(&commentstring, '.*%s\s*\(.*\)', '\1', 'g') call s:MapDelimiters(left,right) + endif endfunction @@ -966,15 +749,15 @@ endfunction " -rightAlt: the string for the alternative comment style defining the comment end delimiter function s:MapDelimitersWithAlternative(left, right, leftAlt, rightAlt) if !exists('g:NERD_' . &filetype . '_alt_style') - let b:left = a:left - let b:right = a:right - let b:leftAlt = a:leftAlt - let b:rightAlt = a:rightAlt + let b:NERDLeft = a:left + let b:NERDRight = a:right + let b:NERDLeftAlt = a:leftAlt + let b:NERDRightAlt = a:rightAlt else - let b:left = a:leftAlt - let b:right = a:rightAlt - let b:leftAlt = a:left - let b:rightAlt = a:right + let b:NERDLeft = a:leftAlt + let b:NERDRight = a:rightAlt + let b:NERDLeftAlt = a:left + let b:NERDRightAlt = a:right endif endfunction @@ -990,7 +773,7 @@ endfunction function s:SwitchToAlternativeDelimiters(printMsgs) "if both of the alternative delimiters are empty then there is no "alternative comment style so bail out - if b:leftAlt == "" && b:rightAlt == "" + if b:NERDLeftAlt == "" && b:NERDRightAlt == "" if a:printMsgs call s:NerdEcho("Cannot use alternative delimiters, none are specified", 0) endif @@ -998,21 +781,21 @@ function s:SwitchToAlternativeDelimiters(printMsgs) endif "save the current delimiters - let tempLeft = b:left - let tempRight = b:right + let tempLeft = b:NERDLeft + let tempRight = b:NERDRight "swap current delimiters for alternative - let b:left = b:leftAlt - let b:right = b:rightAlt + let b:NERDLeft = b:NERDLeftAlt + let b:NERDRight = b:NERDRightAlt "set the previously current delimiters to be the new alternative ones - let b:leftAlt = tempLeft - let b:rightAlt = tempRight + let b:NERDLeftAlt = tempLeft + let b:NERDRightAlt = tempRight "tell the user what comment delimiters they are now using if a:printMsgs - let leftNoEsc = b:left - let rightNoEsc = b:right + let leftNoEsc = b:NERDLeft + let rightNoEsc = b:NERDRight call s:NerdEcho("Now using " . leftNoEsc . " " . rightNoEsc . " to delimit comments", 1) endif @@ -1142,19 +925,19 @@ function s:CommentBlock(top, bottom, lSide, rSide, forceNested ) "stick the right delimiter down let theLine = strpart(theLine, 0, rSide+strlen(leftSpaced)) . rightSpaced . strpart(theLine, rSide+strlen(leftSpaced)) - let firstLeftDelim = s:FindDelimiterIndex(b:left, theLine) - let lastRightDelim = s:LastIndexOfDelim(b:right, theLine) + let firstLeftDelim = s:FindDelimiterIndex(b:NERDLeft, theLine) + let lastRightDelim = s:LastIndexOfDelim(b:NERDRight, theLine) if firstLeftDelim != -1 && lastRightDelim != -1 let searchStr = strpart(theLine, 0, lastRightDelim) - let searchStr = strpart(searchStr, firstLeftDelim+strlen(b:left)) + let searchStr = strpart(searchStr, firstLeftDelim+strlen(b:NERDLeft)) "replace the outter most delims in searchStr with "place-holders - let theLineWithPlaceHolders = s:ReplaceDelims(b:left, b:right, g:NERDLPlace, g:NERDRPlace, searchStr) + let theLineWithPlaceHolders = s:ReplaceDelims(b:NERDLeft, b:NERDRight, g:NERDLPlace, g:NERDRPlace, searchStr) "add the right delimiter onto the line - let theLine = strpart(theLine, 0, firstLeftDelim+strlen(b:left)) . theLineWithPlaceHolders . strpart(theLine, lastRightDelim) + let theLine = strpart(theLine, 0, firstLeftDelim+strlen(b:NERDLeft)) . theLineWithPlaceHolders . strpart(theLine, lastRightDelim) endif endif endif @@ -1213,7 +996,7 @@ function s:CommentLines(forceNested, align, firstLine, lastLine) " find out if the line is commented using normal delims and/or " alternate ones - let isCommented = s:IsCommented(b:left, b:right, theLine) || s:IsCommented(b:leftAlt, b:rightAlt, theLine) + let isCommented = s:IsCommented(b:NERDLeft, b:NERDRight, theLine) || s:IsCommented(b:NERDLeftAlt, b:NERDRightAlt, theLine) " check if we can comment this line if !isCommented || g:NERDUsePlaceHolders || s:Multipart() @@ -1362,13 +1145,13 @@ function s:CommentLinesSexy(topline, bottomline) " add the left delimiter one line above the lines that are to be commented call cursor(a:topline, 1) execute 'normal! O' - call setline(a:topline, strpart(s:spaces, 0, leftAlignIndx) . left ) + call setline(a:topline, repeat(' ', leftAlignIndx) . left ) " add the right delimiter after bottom line (we have to add 1 cos we moved " the lines down when we added the left delim call cursor(a:bottomline+1, 1) execute 'normal! o' - call setline(a:bottomline+2, strpart(s:spaces, 0, leftAlignIndx) . strpart(s:spaces, 0, strlen(left)-strlen(sexyComMarker)) . right ) + call setline(a:bottomline+2, repeat(' ', leftAlignIndx) . repeat(' ', strlen(left)-strlen(sexyComMarker)) . right ) endif @@ -1386,7 +1169,7 @@ function s:CommentLinesSexy(topline, bottomline) let theLine = s:SwapOutterMultiPartDelimsForPlaceHolders(theLine) " add the sexyComMarker - let theLine = strpart(s:spaces, 0, leftAlignIndx) . strpart(s:spaces, 0, strlen(left)-strlen(sexyComMarker)) . sexyComMarkerSpaced . strpart(theLine, leftAlignIndx) + let theLine = repeat(' ', leftAlignIndx) . repeat(' ', strlen(left)-strlen(sexyComMarker)) . sexyComMarkerSpaced . strpart(theLine, leftAlignIndx) if lineHasTabs let theLine = s:ConvertLeadingSpacesToTabs(theLine) @@ -1482,7 +1265,7 @@ function s:CommentRegion(topLine, topCol, bottomLine, bottomCol, forceNested) endif "stick the cursor back on the char it was on before the comment - call cursor(a:topLine, a:topCol + strlen(b:left) + g:NERDSpaceDelims) + call cursor(a:topLine, a:topCol + strlen(b:NERDLeft) + g:NERDSpaceDelims) "if we switched delims then we gotta go back to what they were before if switchedDelims == 1 @@ -1507,7 +1290,7 @@ function s:InvertComment(firstLine, lastLine) let sexyComBounds = s:FindBoundingLinesOfSexyCom(currentLine) " if the line is commented normally, uncomment it - if s:IsCommentedFromStartOfLine(b:left, theLine) || s:IsCommentedFromStartOfLine(b:leftAlt, theLine) + if s:IsCommentedFromStartOfLine(b:NERDLeft, theLine) || s:IsCommentedFromStartOfLine(b:NERDLeftAlt, theLine) call s:UncommentLines(currentLine, currentLine) let currentLine = currentLine + 1 @@ -1590,7 +1373,7 @@ function! NERDComment(isVisual, type) range elseif a:type == 'toggle' let theLine = getline(firstLine) - if s:IsInSexyComment(firstLine) || s:IsCommentedFromStartOfLine(b:left, theLine) || s:IsCommentedFromStartOfLine(b:leftAlt, theLine) + if s:IsInSexyComment(firstLine) || s:IsCommentedFromStartOfLine(b:NERDLeft, theLine) || s:IsCommentedFromStartOfLine(b:NERDLeftAlt, theLine) call s:UncommentLines(firstLine, lastLine) else call s:CommentLinesToggle(forceNested, firstLine, lastLine) @@ -1907,54 +1690,54 @@ function s:UncommentLineNormal(line) let line = a:line "get the comment status on the line so we know how it is commented - let lineCommentStatus = s:IsCommentedOuttermost(b:left, b:right, b:leftAlt, b:rightAlt, line) + let lineCommentStatus = s:IsCommentedOuttermost(b:NERDLeft, b:NERDRight, b:NERDLeftAlt, b:NERDRightAlt, line) - "it is commented with b:left and b:right so remove these delims + "it is commented with b:NERDLeft and b:NERDRight so remove these delims if lineCommentStatus == 1 - let line = s:RemoveDelimiters(b:left, b:right, line) + let line = s:RemoveDelimiters(b:NERDLeft, b:NERDRight, line) - "it is commented with b:leftAlt and b:rightAlt so remove these delims + "it is commented with b:NERDLeftAlt and b:NERDRightAlt so remove these delims elseif lineCommentStatus == 2 && g:NERDRemoveAltComs - let line = s:RemoveDelimiters(b:leftAlt, b:rightAlt, line) + let line = s:RemoveDelimiters(b:NERDLeftAlt, b:NERDRightAlt, line) "it is not properly commented with any delims so we check if it has "any random left or right delims on it and remove the outtermost ones else "get the positions of all delim types on the line - let indxLeft = s:FindDelimiterIndex(b:left, line) - let indxLeftAlt = s:FindDelimiterIndex(b:leftAlt, line) - let indxRight = s:FindDelimiterIndex(b:right, line) - let indxRightAlt = s:FindDelimiterIndex(b:rightAlt, line) + let indxLeft = s:FindDelimiterIndex(b:NERDLeft, line) + let indxLeftAlt = s:FindDelimiterIndex(b:NERDLeftAlt, line) + let indxRight = s:FindDelimiterIndex(b:NERDRight, line) + let indxRightAlt = s:FindDelimiterIndex(b:NERDRightAlt, line) "remove the outter most left comment delim if indxLeft != -1 && (indxLeft < indxLeftAlt || indxLeftAlt == -1) - let line = s:RemoveDelimiters(b:left, '', line) + let line = s:RemoveDelimiters(b:NERDLeft, '', line) elseif indxLeftAlt != -1 - let line = s:RemoveDelimiters(b:leftAlt, '', line) + let line = s:RemoveDelimiters(b:NERDLeftAlt, '', line) endif "remove the outter most right comment delim if indxRight != -1 && (indxRight < indxRightAlt || indxRightAlt == -1) - let line = s:RemoveDelimiters('', b:right, line) + let line = s:RemoveDelimiters('', b:NERDRight, line) elseif indxRightAlt != -1 - let line = s:RemoveDelimiters('', b:rightAlt, line) + let line = s:RemoveDelimiters('', b:NERDRightAlt, line) endif endif - let indxLeft = s:FindDelimiterIndex(b:left, line) - let indxLeftAlt = s:FindDelimiterIndex(b:leftAlt, line) + let indxLeft = s:FindDelimiterIndex(b:NERDLeft, line) + let indxLeftAlt = s:FindDelimiterIndex(b:NERDLeftAlt, line) let indxLeftPlace = s:FindDelimiterIndex(g:NERDLPlace, line) let indxRightPlace = s:FindDelimiterIndex(g:NERDRPlace, line) - let indxRightAlt = s:FindDelimiterIndex(b:rightAlt, line) + let indxRightAlt = s:FindDelimiterIndex(b:NERDRightAlt, line) let indxRightPlace = s:FindDelimiterIndex(g:NERDRPlace, line) - let right = b:right - let left = b:left + let right = b:NERDRight + let left = b:NERDLeft if !s:Multipart() - let right = b:rightAlt - let left = b:leftAlt + let right = b:NERDRightAlt + let left = b:NERDLeftAlt endif @@ -2008,7 +1791,7 @@ function s:AddLeftDelimAligned(delim, theLine, alignIndx) "so we can align the delim properly let theLine = a:theLine if strlen(theLine) < a:alignIndx - let theLine = strpart(s:spaces, 0, a:alignIndx - strlen(theLine)) + let theLine = repeat(' ', a:alignIndx - strlen(theLine)) endif return strpart(theLine, 0, a:alignIndx) . a:delim . strpart(theLine, a:alignIndx) @@ -2035,7 +1818,7 @@ function s:AddRightDelimAligned(delim, theLine, alignIndx) " so we get a string containing the needed spaces (it " could be empty) let extraSpaces = '' - let extraSpaces = strpart(s:spaces, 0, a:alignIndx-strlen(a:theLine)) + let extraSpaces = repeat(' ', a:alignIndx-strlen(a:theLine)) " add the right delim return substitute(a:theLine, '$', extraSpaces . a:delim, '') @@ -2045,7 +1828,7 @@ endfunction " Function: s:AltMultipart() {{{2 " returns 1 if the alternative delims are multipart function s:AltMultipart() - return b:rightAlt != '' + return b:NERDRightAlt != '' endfunction " Function: s:CanCommentLine(forceNested, line) {{{2 @@ -2116,7 +1899,7 @@ endfunction " -lineNum: the line num of the line to check for commentability function s:CanToggleCommentLine(forceNested, lineNum) let theLine = getline(a:lineNum) - if (s:IsCommentedFromStartOfLine(b:left, theLine) || s:IsCommentedFromStartOfLine(b:leftAlt, theLine)) && !a:forceNested + if (s:IsCommentedFromStartOfLine(b:NERDLeft, theLine) || s:IsCommentedFromStartOfLine(b:NERDLeftAlt, theLine)) && !a:forceNested return 0 endif @@ -2236,9 +2019,9 @@ endfunction function s:DoesBlockHaveMultipartDelim(top, bottom) if s:HasMultipartDelims() if s:Multipart() - return s:DoesBlockHaveDelim(b:left, a:top, a:bottom) || s:DoesBlockHaveDelim(b:right, a:top, a:bottom) + return s:DoesBlockHaveDelim(b:NERDLeft, a:top, a:bottom) || s:DoesBlockHaveDelim(b:NERDRight, a:top, a:bottom) else - return s:DoesBlockHaveDelim(b:leftAlt, a:top, a:bottom) || s:DoesBlockHaveDelim(b:rightAlt, a:top, a:bottom) + return s:DoesBlockHaveDelim(b:NERDLeftAlt, a:top, a:bottom) || s:DoesBlockHaveDelim(b:NERDRightAlt, a:top, a:bottom) endif endif return 0 @@ -2388,13 +2171,13 @@ endfunction " (the space string will only be added if NERDSpaceDelims is set) " -esc: specifies whether the tricky chars in the delim should be ESCed function s:GetLeft(alt, space, esc) - let delim = b:left + let delim = b:NERDLeft if a:alt - if b:leftAlt == '' + if b:NERDLeftAlt == '' return '' else - let delim = b:leftAlt + let delim = b:NERDLeftAlt endif endif if delim == '' @@ -2420,13 +2203,13 @@ endfunction " (the space string will only be added if NERDSpaceDelims is set) " -esc: specifies whether the tricky chars in the delim should be ESCed function s:GetRight(alt, space, esc) - let delim = b:right + let delim = b:NERDRight if a:alt if !s:AltMultipart() return '' else - let delim = b:rightAlt + let delim = b:NERDRightAlt endif endif if delim == '' @@ -2457,7 +2240,7 @@ endfunction " (the space string will only be added if NERDSpaceDelims is set) " -esc: specifies whether the tricky chars in the marker are to be ESCed function s:GetSexyComMarker(space, esc) - let sexyComMarker = b:sexyComMarker + let sexyComMarker = b:NERDSexyComMarker "if there is no hardcoded marker then we find one if sexyComMarker == '' @@ -2469,14 +2252,14 @@ function s:GetSexyComMarker(space, esc) else "find a comment marker by getting the longest available left delim "(that has a corresponding right delim) and taking the last char - let lenLeft = strlen(b:left) - let lenLeftAlt = strlen(b:leftAlt) + let lenLeft = strlen(b:NERDLeft) + let lenLeftAlt = strlen(b:NERDLeftAlt) let left = '' let right = '' if s:Multipart() && lenLeft >= lenLeftAlt - let left = b:left + let left = b:NERDLeft elseif s:AltMultipart() - let left = b:leftAlt + let left = b:NERDLeftAlt else return -1 endif @@ -2505,8 +2288,8 @@ endfunction " (the space string will only be added if NERDSpaceDelims is set) " -esc: specifies whether the tricky chars in the string are ESCed function s:GetSexyComLeft(space, esc) - let lenLeft = strlen(b:left) - let lenLeftAlt = strlen(b:leftAlt) + let lenLeft = strlen(b:NERDLeft) + let lenLeftAlt = strlen(b:NERDLeftAlt) let left = '' "assume c style sexy comments if possible @@ -2515,9 +2298,9 @@ function s:GetSexyComLeft(space, esc) else "grab the longest left delim that has a right if s:Multipart() && lenLeft >= lenLeftAlt - let left = b:left + let left = b:NERDLeft elseif s:AltMultipart() - let left = b:leftAlt + let left = b:NERDLeftAlt else return -1 endif @@ -2543,8 +2326,8 @@ endfunction " is specified for the current filetype) " -esc: specifies whether the tricky chars in the string are ESCed function s:GetSexyComRight(space, esc) - let lenLeft = strlen(b:left) - let lenLeftAlt = strlen(b:leftAlt) + let lenLeft = strlen(b:NERDLeft) + let lenLeftAlt = strlen(b:NERDLeftAlt) let right = '' "assume c style sexy comments if possible @@ -2553,9 +2336,9 @@ function s:GetSexyComRight(space, esc) else "grab the right delim that pairs with the longest left delim if s:Multipart() && lenLeft >= lenLeftAlt - let right = b:right + let right = b:NERDRight elseif s:AltMultipart() - let right = b:rightAlt + let right = b:NERDRightAlt else return -1 endif @@ -2591,7 +2374,7 @@ endfunction " Function: s:HasCStyleComments() {{{2 " Returns 1 iff the current filetype has c style comment delimiters function s:HasCStyleComments() - return (b:left == '/*' && b:right == '*/') || (b:leftAlt == '/*' && b:rightAlt == '*/') + return (b:NERDLeft == '/*' && b:NERDRight == '*/') || (b:NERDLeftAlt == '/*' && b:NERDRightAlt == '*/') endfunction " Function: s:IsCommentedNormOrSexy(lineNum) {{{2 @@ -2604,7 +2387,7 @@ function s:IsCommentedNormOrSexy(lineNum) let theLine = getline(a:lineNum) "if the line is commented normally return 1 - if s:IsCommented(b:left, b:right, theLine) || s:IsCommented(b:leftAlt, b:rightAlt, theLine) + if s:IsCommented(b:NERDLeft, b:NERDRight, theLine) || s:IsCommented(b:NERDLeftAlt, b:NERDRightAlt, theLine) return 1 endif @@ -2820,11 +2603,11 @@ function s:IsSexyComment(topline, bottomline) let left = '' let right = '' if s:Multipart() - let left = b:left - let right = b:right + let left = b:NERDLeft + let right = b:NERDRight elseif s:AltMultipart() - let left = b:leftAlt - let right = b:rightAlt + let left = b:NERDLeftAlt + let right = b:NERDRightAlt else return 0 endif @@ -2949,7 +2732,7 @@ function s:LeftMostIndx(countCommentedLines, countEmptyLines, topline, bottomlin " commented, check it let theLine = getline(currentLine) if a:countEmptyLines || theLine !~ '^[ \t]*$' - if a:countCommentedLines || (!s:IsCommented(b:left, b:right, theLine) && !s:IsCommented(b:leftAlt, b:rightAlt, theLine)) + if a:countCommentedLines || (!s:IsCommented(b:NERDLeft, b:NERDRight, theLine) && !s:IsCommented(b:NERDLeftAlt, b:NERDRightAlt, theLine)) " convert spaces to tabs and get the number of leading spaces for " this line and update leftMostIndx if need be let theLine = s:ConvertLeadingTabsToSpaces(theLine) @@ -2974,7 +2757,7 @@ endfunction " Function: s:Multipart() {{{2 " returns 1 if the current delims are multipart function s:Multipart() - return b:right != '' + return b:NERDRight != '' endfunction " Function: s:NerdEcho(msg, typeOfMsg) {{{2 @@ -3105,7 +2888,7 @@ function s:RightMostIndx(countCommentedLines, countEmptyLines, topline, bottomli let theLine = getline(currentLine) if a:countEmptyLines || theLine !~ '^[ \t]*$' - if a:countCommentedLines || (!s:IsCommented(b:left, b:right, theLine) && !s:IsCommented(b:leftAlt, b:rightAlt, theLine)) + if a:countCommentedLines || (!s:IsCommented(b:NERDLeft, b:NERDRight, theLine) && !s:IsCommented(b:NERDLeftAlt, b:NERDRightAlt, theLine)) " update rightMostIndx if need be let theLine = s:ConvertLeadingTabsToSpaces(theLine) @@ -3140,20 +2923,20 @@ endfunction function s:SwapOutterMultiPartDelimsForPlaceHolders(line) " find out if the line is commented using normal delims and/or " alternate ones - let isCommented = s:IsCommented(b:left, b:right, a:line) - let isCommentedAlt = s:IsCommented(b:leftAlt, b:rightAlt, a:line) + let isCommented = s:IsCommented(b:NERDLeft, b:NERDRight, a:line) + let isCommentedAlt = s:IsCommented(b:NERDLeftAlt, b:NERDRightAlt, a:line) let line2 = a:line "if the line is commented and there is a right delimiter, replace "the delims with place-holders if isCommented && s:Multipart() - let line2 = s:ReplaceDelims(b:left, b:right, g:NERDLPlace, g:NERDRPlace, a:line) + let line2 = s:ReplaceDelims(b:NERDLeft, b:NERDRight, g:NERDLPlace, g:NERDRPlace, a:line) "similarly if the line is commented with the alternative "delimiters elseif isCommentedAlt && s:AltMultipart() - let line2 = s:ReplaceDelims(b:leftAlt, b:rightAlt, g:NERDLPlace, g:NERDRPlace, a:line) + let line2 = s:ReplaceDelims(b:NERDLeftAlt, b:NERDRightAlt, g:NERDLPlace, g:NERDRPlace, a:line) endif return line2 @@ -3169,11 +2952,11 @@ function s:SwapOutterPlaceHoldersForMultiPartDelims(line) let left = '' let right = '' if s:Multipart() - let left = b:left - let right = b:right + let left = b:NERDLeft + let right = b:NERDRight elseif s:AltMultipart() - let left = b:leftAlt - let right = b:rightAlt + let left = b:NERDLeftAlt + let right = b:NERDRightAlt endif let line = s:ReplaceDelims(g:NERDLPlace, g:NERDRPlace, left, right, a:line) plugin/NERD_commenter.vim @@ -2,7 +2,7 @@ " File: NERD_tree.vim " Description: vim global plugin that provides a nice tree explorer " Maintainer: Martin Grenfell <martin_grenfell at msn dot com> -" Last Change: 27 Jan, 2009 +" Last Change: 7 Jun, 2009 " License: This program is free software. It comes without any warranty, " to the extent permitted by applicable law. You can redistribute " it and/or modify it under the terms of the Do What The Fuck You @@ -10,7 +10,7 @@ " See http://sam.zoy.org/wtfpl/COPYING for more details. " " ============================================================================ -let s:NERD_tree_version = '3.1.0' +let s:NERD_tree_version = '3.1.1' " SECTION: Script init stuff {{{1 "============================================================ @@ -79,7 +79,9 @@ endif "once here let s:NERDTreeSortStarIndex = index(g:NERDTreeSortOrder, '*') -call s:initVariable("g:NERDTreeStatusline", "%{b:NERDTreeRoot.path.strForOS(0)}") +if !exists('g:NERDTreeStatusline') + let g:NERDTreeStatusline = "%{b:NERDTreeRoot.path.str()}" +endif call s:initVariable("g:NERDTreeWinPos", "left") call s:initVariable("g:NERDTreeWinSize", 31) @@ -103,8 +105,7 @@ call s:initVariable("g:NERDTreeMapChdir", "cd") call s:initVariable("g:NERDTreeMapCloseChildren", "X") call s:initVariable("g:NERDTreeMapCloseDir", "x") call s:initVariable("g:NERDTreeMapDeleteBookmark", "D") -call s:initVariable("g:NERDTreeMapExecute", "!") -call s:initVariable("g:NERDTreeMapFilesystemMenu", "m") +call s:initVariable("g:NERDTreeMapMenu", "m") call s:initVariable("g:NERDTreeMapHelp", "?") call s:initVariable("g:NERDTreeMapJumpFirstChild", "K") call s:initVariable("g:NERDTreeMapJumpLastChild", "J") @@ -128,6 +129,7 @@ call s:initVariable("g:NERDTreeMapToggleBookmarks", "B") call s:initVariable("g:NERDTreeMapToggleFiles", "F") call s:initVariable("g:NERDTreeMapToggleFilters", "f") call s:initVariable("g:NERDTreeMapToggleHidden", "I") +call s:initVariable("g:NERDTreeMapToggleZoom", "A") call s:initVariable("g:NERDTreeMapUpdir", "u") call s:initVariable("g:NERDTreeMapUpdirKeepOpen", "U") @@ -139,11 +141,6 @@ let s:tree_wid = 2 let s:tree_markup_reg = '^[ `|]*[\-+~]' let s:tree_up_dir_line = '.. (up a dir)' -let s:os_slash = '/' -if s:running_windows - let s:os_slash = '\' -endif - "the number to add to the nerd tree buffer name to make the buf name unique let s:next_buffer_number = 1 @@ -154,7 +151,7 @@ command! -n=? -complete=dir -bar NERDTree :call s:initNerdTree('<args>') command! -n=? -complete=dir -bar NERDTreeToggle :call s:toggle('<args>') command! -n=0 -bar NERDTreeClose :call s:closeTreeIfOpen() command! -n=1 -complete=customlist,s:completeBookmarks -bar NERDTreeFromBookmark call s:initNerdTree('<args>') -command! -n=0 -complete=customlist,s:completeNERDTreeMirrors -bar NERDTreeMirror call s:initNerdTreeMirror() +command! -n=0 -bar NERDTreeMirror call s:initNerdTreeMirror() " SECTION: Auto commands {{{1 "============================================================ augroup NERDTree @@ -162,6 +159,9 @@ augroup NERDTree exec "autocmd BufWinLeave *". s:NERDTreeBufName ." call <SID>saveScreenState()" "cache bookmarks when vim loads autocmd VimEnter * call s:Bookmark.CacheBookmarks(0) + + "load all nerdtree plugins after vim starts + autocmd VimEnter * runtime! nerdtree_plugin/**/*.vim augroup END if g:NERDTreeHijackNetrw @@ -176,6 +176,17 @@ endif "CLASS: Bookmark {{{2 "============================================================ let s:Bookmark = {} +" FUNCTION: Bookmark.activate() {{{3 +function! s:Bookmark.activate() + if self.path.isDirectory + call self.toRoot() + else + if self.validate() + let n = s:TreeFileNode.New(self.path) + call n.open() + endif + endif +endfunction " FUNCTION: Bookmark.AddBookmark(name, path) {{{3 " Class method to add a new bookmark to the list, if a previous bookmark exists " with the same name, just update the path for that bookmark @@ -330,7 +341,7 @@ function! s:Bookmark.mustExist() if !self.path.exists() call s:Bookmark.CacheBookmarks(1) throw "NERDTree.BookmarkPointsToInvalidLocationError: the bookmark \"". - \ self.name ."\" points to a non existing location: \"". self.path.strForOS(0) + \ self.name ."\" points to a non existing location: \"". self.path.str() endif endfunction " FUNCTION: Bookmark.New(name, path) {{{3 @@ -364,7 +375,7 @@ function! s:Bookmark.str() let pathStrMaxLen = pathStrMaxLen - &numberwidth endif - let pathStr = self.path.strForOS(0) + let pathStr = self.path.str({'format': 'UI'}) if len(pathStr) > pathStrMaxLen let pathStr = '<' . strpart(pathStr, len(pathStr) - pathStrMaxLen) endif @@ -409,7 +420,7 @@ endfunction function! s:Bookmark.Write() let bookmarkStrings = [] for i in s:Bookmark.Bookmarks() - call add(bookmarkStrings, i.name . ' ' . i.path.strForOS(0)) + call add(bookmarkStrings, i.name . ' ' . i.path.str()) endfor "add a blank line before the invalid ones @@ -420,12 +431,341 @@ function! s:Bookmark.Write() endfor call writefile(bookmarkStrings, g:NERDTreeBookmarksFile) endfunction +"CLASS: KeyMap {{{2 +"============================================================ +let s:KeyMap = {} +"FUNCTION: KeyMap.All() {{{3 +function! s:KeyMap.All() + if !exists("s:keyMaps") + let s:keyMaps = [] + endif + return s:keyMaps +endfunction + +"FUNCTION: KeyMap.BindAll() {{{3 +function! s:KeyMap.BindAll() + for i in s:KeyMap.All() + call i.bind() + endfor +endfunction + +"FUNCTION: KeyMap.bind() {{{3 +function! s:KeyMap.bind() + exec "nnoremap <silent> <buffer> ". self.key ." :call ". self.callback ."()<cr>" +endfunction + +"FUNCTION: KeyMap.Create(options) {{{3 +function! s:KeyMap.Create(options) + let newKeyMap = {} + let newKeyMap = copy(self) + let newKeyMap.key = a:options['key'] + let newKeyMap.quickhelpText = a:options['quickhelpText'] + let newKeyMap.callback = a:options['callback'] + call add(s:KeyMap.All(), newKeyMap) +endfunction +"CLASS: MenuController {{{2 +"============================================================ +let s:MenuController = {} +"FUNCTION: MenuController.New(menuItems) {{{3 +"create a new menu controller that operates on the given menu items +function! s:MenuController.New(menuItems) + let newMenuController = copy(self) + if a:menuItems[0].isSeparator() + let newMenuController.menuItems = a:menuItems[1:-1] + else + let newMenuController.menuItems = a:menuItems + endif + return newMenuController +endfunction + +"FUNCTION: MenuController.showMenu() {{{3 +"start the main loop of the menu and get the user to choose/execute a menu +"item +function! s:MenuController.showMenu() + call self._saveOptions() + + try + let self.selection = 0 + + let done = 0 + while !done + redraw! + call self._echoPrompt() + let key = nr2char(getchar()) + let done = self._handleKeypress(key) + endwhile + finally + call self._restoreOptions() + endtry + + if self.selection != -1 + let m = self._current() + call m.execute() + endif +endfunction + +"FUNCTION: MenuController._echoPrompt() {{{3 +function! s:MenuController._echoPrompt() + echo "NERDTree Menu. Use j/k/enter and the shortcuts indicated" + echo "==========================================================" + + for i in range(0, len(self.menuItems)-1) + if self.selection == i + echohl todo + echo "> " . self.menuItems[i].text + echohl normal + else + echo " " . self.menuItems[i].text + endif + endfor +endfunction + +"FUNCTION: MenuController._current(key) {{{3 +"get the MenuItem that is curently selected +function! s:MenuController._current() + return self.menuItems[self.selection] +endfunction + +"FUNCTION: MenuController._handleKeypress(key) {{{3 +"change the selection (if appropriate) and return 1 if the user has made +"their choice, 0 otherwise +function! s:MenuController._handleKeypress(key) + if a:key == 'j' + call self._cursorDown() + elseif a:key == 'k' + call self._cursorUp() + elseif a:key == nr2char(27) "escape + let self.selection = -1 + return 1 + elseif a:key == "\r" || a:key == "\n" "enter and ctrl-j + return 1 + else + let index = self._nextIndexFor(a:key) + if index != -1 + let self.selection = index + if len(self._allIndexesFor(a:key)) == 1 + return 1 + endif + endif + endif + + return 0 +endfunction + +"FUNCTION: MenuController._allIndexesFor(shortcut) {{{3 +"get indexes to all menu items with the given shortcut +function! s:MenuController._allIndexesFor(shortcut) + let toReturn = [] + + for i in range(0, len(self.menuItems)-1) + if self.menuItems[i].shortcut == a:shortcut + call add(toReturn, i) + endif + endfor + + return toReturn +endfunction + +"FUNCTION: MenuController._nextIndexFor(shortcut) {{{3 +"get the index to the next menu item with the given shortcut, starts from the +"current cursor location and wraps around to the top again if need be +function! s:MenuController._nextIndexFor(shortcut) + for i in range(self.selection+1, len(self.menuItems)-1) + if self.menuItems[i].shortcut == a:shortcut + return i + endif + endfor + + for i in range(0, self.selection) + if self.menuItems[i].shortcut == a:shortcut + return i + endif + endfor + + return -1 +endfunction + +"FUNCTION: MenuController._setCmdheight() {{{3 +"sets &cmdheight to whatever is needed to display the menu +function! s:MenuController._setCmdheight() + let &cmdheight = len(self.menuItems) + 3 +endfunction + +"FUNCTION: MenuController._saveOptions() {{{3 +"set any vim options that are required to make the menu work (saving their old +"values) +function! s:MenuController._saveOptions() + let self._oldLazyredraw = &lazyredraw + let self._oldCmdheight = &cmdheight + set nolazyredraw + call self._setCmdheight() +endfunction + +"FUNCTION: MenuController._restoreOptions() {{{3 +"restore the options we saved in _saveOptions() +function! s:MenuController._restoreOptions() + let &cmdheight = self._oldCmdheight + let &lazyredraw = self._oldLazyredraw +endfunction + +"FUNCTION: MenuController._cursorDown() {{{3 +"move the cursor to the next menu item, skipping separators +function! s:MenuController._cursorDown() + let done = 0 + while !done + if self.selection < len(self.menuItems)-1 + let self.selection += 1 + else + let self.selection = 0 + endif + + if !self._current().isSeparator() + let done = 1 + endif + endwhile +endfunction + +"FUNCTION: MenuController._cursorUp() {{{3 +"move the cursor to the previous menu item, skipping separators +function! s:MenuController._cursorUp() + let done = 0 + while !done + if self.selection > 0 + let self.selection -= 1 + else + let self.selection = len(self.menuItems)-1 + endif + + if !self._current().isSeparator() + let done = 1 + endif + endwhile +endfunction + +"CLASS: MenuItem {{{2 +"============================================================ +let s:MenuItem = {} +"FUNCTION: MenuItem.All() {{{3 +"get all top level menu items +function! s:MenuItem.All() + if !exists("s:menuItems") + let s:menuItems = [] + endif + return s:menuItems +endfunction + +"FUNCTION: MenuItem.AllEnabled() {{{3 +"get all top level menu items that are currently enabled +function! s:MenuItem.AllEnabled() + let toReturn = [] + for i in s:MenuItem.All() + if i.enabled() + call add(toReturn, i) + endif + endfor + return toReturn +endfunction + +"FUNCTION: MenuItem.Create(options) {{{3 +"make a new menu item and add it to the global list +function! s:MenuItem.Create(options) + let newMenuItem = copy(self) + + let newMenuItem.text = a:options['text'] + let newMenuItem.shortcut = a:options['shortcut'] + let newMenuItem.children = [] + + let newMenuItem.isActiveCallback = -1 + if has_key(a:options, 'isActiveCallback') + let newMenuItem.isActiveCallback = a:options['isActiveCallback'] + endif + + let newMenuItem.callback = -1 + if has_key(a:options, 'callback') + let newMenuItem.callback = a:options['callback'] + endif + + if has_key(a:options, 'parent') + call add(a:options['parent'].children, newMenuItem) + else + call add(s:MenuItem.All(), newMenuItem) + endif + + return newMenuItem +endfunction + +"FUNCTION: MenuItem.CreateSeparator(options) {{{3 +"make a new separator menu item and add it to the global list +function! s:MenuItem.CreateSeparator(options) + let standard_options = { 'text': '--------------------', + \ 'shortcut': -1, + \ 'callback': -1 } + let options = extend(a:options, standard_options, "force") + + return s:MenuItem.Create(options) +endfunction + +"FUNCTION: MenuItem.CreateSubmenu(options) {{{3 +"make a new submenu and add it to global list +function! s:MenuItem.CreateSubmenu(options) + let standard_options = { 'callback': -1 } + let options = extend(a:options, standard_options, "force") + + return s:MenuItem.Create(options) +endfunction + +"FUNCTION: MenuItem.enabled() {{{3 +"return 1 if this menu item should be displayed +" +"delegates off to the isActiveCallback, and defaults to 1 if no callback was +"specified +function! s:MenuItem.enabled() + if self.isActiveCallback != -1 + return {self.isActiveCallback}() + endif + return 1 +endfunction + +"FUNCTION: MenuItem.execute() {{{3 +"perform the action behind this menu item, if this menuitem has children then +"display a new menu for them, otherwise deletegate off to the menuitem's +"callback +function! s:MenuItem.execute() + if len(self.children) + let mc = s:MenuController.New(self.children) + call mc.showMenu() + else + if self.callback != -1 + call {self.callback}() + endif + endif +endfunction + +"FUNCTION: MenuItem.isSeparator() {{{3 +"return 1 if this menuitem is a separator +function! s:MenuItem.isSeparator() + return self.callback == -1 && self.children == [] +endfunction + +"FUNCTION: MenuItem.isSubmenu() {{{3 +"return 1 if this menuitem is a submenu +function! s:MenuItem.isSubmenu() + return self.callback == -1 && !empty(self.children) +endfunction + "CLASS: TreeFileNode {{{2 "This class is the parent of the TreeDirNode class and constitures the "'Component' part of the composite design pattern between the treenode "classes. "============================================================ let s:TreeFileNode = {} +"FUNCTION: TreeFileNode.activate(forceKeepWinOpen) {{{3 +function! s:TreeFileNode.activate(forceKeepWinOpen) + call self.open() + if !a:forceKeepWinOpen + call s:closeTreeIfQuitOnOpen() + end +endfunction "FUNCTION: TreeFileNode.bookmark(name) {{{3 "bookmark this node with a:name function! s:TreeFileNode.bookmark(name) @@ -489,83 +829,17 @@ function! s:TreeFileNode.delete() call self.parent.removeChild(self) endfunction -"FUNCTION: TreeFileNode.renderToString {{{3 -"returns a string representation for this tree to be rendered in the view -function! s:TreeFileNode.renderToString() - return self._renderToString(0, 0, [], self.getChildCount() ==# 1) +"FUNCTION: TreeFileNode.displayString() {{{3 +" +"Returns a string that specifies how the node should be represented as a +"string +" +"Return: +"a string that can be used in the view to represent this node +function! s:TreeFileNode.displayString() + return self.path.displayString() endfunction - -"Args: -"depth: the current depth in the tree for this call -"drawText: 1 if we should actually draw the line for this node (if 0 then the -"child nodes are rendered only) -"vertMap: a binary array that indicates whether a vertical bar should be draw -"for each depth in the tree -"isLastChild:true if this curNode is the last child of its parent -function! s:TreeFileNode._renderToString(depth, drawText, vertMap, isLastChild) - let output = "" - if a:drawText ==# 1 - - let treeParts = '' - - "get all the leading spaces and vertical tree parts for this line - if a:depth > 1 - for j in a:vertMap[0:-2] - if j ==# 1 - let treeParts = treeParts . '| ' - else - let treeParts = treeParts . ' ' - endif - endfor - endif - - "get the last vertical tree part for this line which will be different - "if this node is the last child of its parent - if a:isLastChild - let treeParts = treeParts . '`' - else - let treeParts = treeParts . '|' - endif - - - "smack the appropriate dir/file symbol on the line before the file/dir - "name itself - if self.path.isDirectory - if self.isOpen - let treeParts = treeParts . '~' - else - let treeParts = treeParts . '+' - endif - else - let treeParts = treeParts . '-' - endif - let line = treeParts . self.strDisplay() - - let output = output . line . "\n" - endif - - "if the node is an open dir, draw its children - if self.path.isDirectory ==# 1 && self.isOpen ==# 1 - - let childNodesToDraw = self.getVisibleChildren() - if len(childNodesToDraw) > 0 - - "draw all the nodes children except the last - let lastIndx = len(childNodesToDraw)-1 - if lastIndx > 0 - for i in childNodesToDraw[0:lastIndx-1] - let output = output . i._renderToString(a:depth + 1, 1, add(copy(a:vertMap), 1), 0) - endfor - endif - - "draw the last child, indicating that it IS the last - let output = output . childNodesToDraw[lastIndx]._renderToString(a:depth + 1, 1, add(copy(a:vertMap), 0), 1) - endif - endif - - return output -endfunction "FUNCTION: TreeFileNode.equals(treenode) {{{3 " "Compares this treenode to the input treenode and returns 1 if they are the @@ -577,7 +851,7 @@ endfunction "Args: "treenode: the other treenode to compare to function! s:TreeFileNode.equals(treenode) - return self.path.str(1) ==# a:treenode.path.str(1) + return self.path.str() ==# a:treenode.path.str() endfunction "FUNCTION: TreeFileNode.findNode(path) {{{3 @@ -667,11 +941,11 @@ function! s:TreeFileNode.getLineNum() let totalLines = line("$") "the path components we have matched so far - let pathcomponents = [substitute(b:NERDTreeRoot.path.str(0), '/ *$', '', '')] + let pathcomponents = [substitute(b:NERDTreeRoot.path.str({'format': 'UI'}), '/ *$', '', '')] "the index of the component we are searching for let curPathComponent = 1 - let fullpath = self.path.str(0) + let fullpath = self.path.str({'format': 'UI'}) let lnum = s:TreeFileNode.GetRootLineNum() @@ -758,7 +1032,7 @@ function! s:TreeFileNode.makeRoot() "change dir to the dir of the new root if instructed to if g:NERDTreeChDirMode ==# 2 - exec "cd " . b:NERDTreeRoot.path.strForEditCmd() + exec "cd " . b:NERDTreeRoot.path.str({'format': 'Edit'}) endif endfunction "FUNCTION: TreeFileNode.New(path) {{{3 @@ -786,29 +1060,29 @@ endfunction "treenode: file node to open function! s:TreeFileNode.open() if b:NERDTreeType ==# "secondary" - exec 'edit ' . self.path.strForEditCmd() + exec 'edit ' . self.path.str({'format': 'Edit'}) return endif "if the file is already open in this tab then just stick the cursor in it - let winnr = bufwinnr('^' . self.path.strForOS(0) . '$') + let winnr = bufwinnr('^' . self.path.str() . '$') if winnr != -1 call s:exec(winnr . "wincmd w") else - if !s:isWindowUsable(winnr("#")) && s:firstNormalWindow() ==# -1 + if !s:isWindowUsable(winnr("#")) && s:firstUsableWindow() ==# -1 call self.openSplit() else try if !s:isWindowUsable(winnr("#")) - call s:exec(s:firstNormalWindow() . "wincmd w") + call s:exec(s:firstUsableWindow() . "wincmd w") else call s:exec('wincmd p') endif - exec ("edit " . self.path.strForEditCmd()) + exec ("edit " . self.path.str({'format': 'Edit'})) catch /^Vim\%((\a\+)\)\=:E37/ call s:putCursorInTreeWin() - throw "NERDTree.FileAlreadyOpenAndModifiedError: ". self.path.str(0) ." is already open and modified." + throw "NERDTree.FileAlreadyOpenAndModifiedError: ". self.path.str() ." is already open and modified." catch /^Vim\%((\a\+)\)\=:/ echo v:exception endtry @@ -820,7 +1094,7 @@ endfunction function! s:TreeFileNode.openSplit() if b:NERDTreeType ==# "secondary" - exec "split " . self.path.strForEditCmd() + exec "split " . self.path.str({'format': 'Edit'}) return endif @@ -861,10 +1135,10 @@ function! s:TreeFileNode.openSplit() " Open the new window try - exec(splitMode." sp " . self.path.strForEditCmd()) + exec(splitMode." sp " . self.path.str({'format': 'Edit'})) catch /^Vim\%((\a\+)\)\=:E37/ call s:putCursorInTreeWin() - throw "NERDTree.FileAlreadyOpenAndModifiedError: ". self.path.str(0) ." is already open and modified." + throw "NERDTree.FileAlreadyOpenAndModifiedError: ". self.path.str() ." is already open and modified." catch /^Vim\%((\a\+)\)\=:/ "do nothing endtry @@ -885,7 +1159,7 @@ endfunction "Open this node in a new vertical window function! s:TreeFileNode.openVSplit() if b:NERDTreeType ==# "secondary" - exec "vnew " . self.path.strForEditCmd() + exec "vnew " . self.path.str({'format': 'Edit'}) return endif @@ -895,7 +1169,7 @@ function! s:TreeFileNode.openVSplit() endif call s:exec("wincmd p") - exec "vnew " . self.path.strForEditCmd() + exec "vnew " . self.path.str({'format': 'Edit'}) "resize the nerd tree back to the original size call s:putCursorInTreeWin() @@ -940,7 +1214,7 @@ function! s:TreeFileNode.rename(newName) call self.path.rename(newName) call self.parent.removeChild(self) - let parentPath = self.path.getPathTrunk() + let parentPath = self.path.getParent() let newParent = b:NERDTreeRoot.findNode(parentPath) if newParent != {} @@ -948,17 +1222,83 @@ function! s:TreeFileNode.rename(newName) call newParent.refresh() endif endfunction -"FUNCTION: TreeFileNode.strDisplay() {{{3 -" -"Returns a string that specifies how the node should be represented as a -"string -" -"Return: -"a string that can be used in the view to represent this node -function! s:TreeFileNode.strDisplay() - return self.path.strDisplay() +"FUNCTION: TreeFileNode.renderToString {{{3 +"returns a string representation for this tree to be rendered in the view +function! s:TreeFileNode.renderToString() + return self._renderToString(0, 0, [], self.getChildCount() ==# 1) endfunction + +"Args: +"depth: the current depth in the tree for this call +"drawText: 1 if we should actually draw the line for this node (if 0 then the +"child nodes are rendered only) +"vertMap: a binary array that indicates whether a vertical bar should be draw +"for each depth in the tree +"isLastChild:true if this curNode is the last child of its parent +function! s:TreeFileNode._renderToString(depth, drawText, vertMap, isLastChild) + let output = "" + if a:drawText ==# 1 + + let treeParts = '' + + "get all the leading spaces and vertical tree parts for this line + if a:depth > 1 + for j in a:vertMap[0:-2] + if j ==# 1 + let treeParts = treeParts . '| ' + else + let treeParts = treeParts . ' ' + endif + endfor + endif + + "get the last vertical tree part for this line which will be different + "if this node is the last child of its parent + if a:isLastChild + let treeParts = treeParts . '`' + else + let treeParts = treeParts . '|' + endif + + + "smack the appropriate dir/file symbol on the line before the file/dir + "name itself + if self.path.isDirectory + if self.isOpen + let treeParts = treeParts . '~' + else + let treeParts = treeParts . '+' + endif + else + let treeParts = treeParts . '-' + endif + let line = treeParts . self.displayString() + + let output = output . line . "\n" + endif + + "if the node is an open dir, draw its children + if self.path.isDirectory ==# 1 && self.isOpen ==# 1 + + let childNodesToDraw = self.getVisibleChildren() + if len(childNodesToDraw) > 0 + + "draw all the nodes children except the last + let lastIndx = len(childNodesToDraw)-1 + if lastIndx > 0 + for i in childNodesToDraw[0:lastIndx-1] + let output = output . i._renderToString(a:depth + 1, 1, add(copy(a:vertMap), 1), 0) + endfor + endif + + "draw the last child, indicating that it IS the last + let output = output . childNodesToDraw[lastIndx]._renderToString(a:depth + 1, 1, add(copy(a:vertMap), 0), 1) + endif + endif + + return output +endfunction "CLASS: TreeDirNode {{{2 "This class is a child of the TreeFileNode class and constitutes the "'Composite' part of the composite design pattern between the treenode @@ -974,6 +1314,13 @@ function! s:TreeDirNode.AbsoluteTreeRoot() endwhile return currentNode endfunction +"FUNCTION: TreeDirNode.activate(forceKeepWinOpen) {{{3 +unlet s:TreeDirNode.activate +function! s:TreeDirNode.activate(forceKeepWinOpen) + call self.toggleOpen() + call s:renderView() + call self.putCursorHere(0, 0) +endfunction "FUNCTION: TreeDirNode.addChild(treenode, inOrder) {{{3 "Adds the given treenode to the list of children for this node " @@ -1032,7 +1379,7 @@ function! s:TreeDirNode.findNode(path) if a:path.equals(self.path) return self endif - if stridx(a:path.str(1), self.path.str(1), 0) ==# -1 + if stridx(a:path.str(), self.path.str(), 0) ==# -1 return {} endif @@ -1061,7 +1408,7 @@ endfunction "Args: "path: a path object function! s:TreeDirNode.getChild(path) - if stridx(a:path.str(1), self.path.str(1), 0) ==# -1 + if stridx(a:path.str(), self.path.str(), 0) ==# -1 return {} endif @@ -1097,7 +1444,7 @@ endfunction "Args: "path: a path object function! s:TreeDirNode.getChildIndex(path) - if stridx(a:path.str(1), self.path.str(1), 0) ==# -1 + if stridx(a:path.str(), self.path.str(), 0) ==# -1 return -1 endif @@ -1173,7 +1520,8 @@ function! s:TreeDirNode._initChildren(silent) "get an array of all the files in the nodes dir let dir = self.path - let filesStr = globpath(dir.strForGlob(), '*') . "\n" . globpath(dir.strForGlob(), '.*') + let globDir = dir.str({'format': 'Glob'}) + let filesStr = globpath(globDir, '*') . "\n" . globpath(globDir, '.*') let files = split(filesStr, "\n") if !a:silent && len(files) > g:NERDTreeNotificationThreshold @@ -1186,7 +1534,7 @@ function! s:TreeDirNode._initChildren(silent) "filter out the .. and . directories "Note: we must match .. AND ../ cos sometimes the globpath returns "../ for path with strange chars (eg $) - if i !~ '\.\.\/\?$' && i !~ '\.\/\?$' + if i !~ '\/\.\.\/\?$' && i !~ '\/\.\/\?$' "put the next file in a new node and attach it try @@ -1254,7 +1602,7 @@ function! s:TreeDirNode.openExplorer() call s:exec('wincmd p') call self.openSplit() else - exec ("silent edit " . self.path.strForEditCmd()) + exec ("silent edit " . self.path.str({'format': 'Edit'})) endif endfunction "FUNCTION: TreeDirNode.openRecursively() {{{3 @@ -1300,10 +1648,14 @@ function! s:TreeDirNode.refresh() let newChildNodes = [] let invalidFilesFound = 0 let dir = self.path - let filesStr = globpath(dir.strForGlob(), '*') . "\n" . globpath(dir.strForGlob(), '.*') + let globDir = dir.str({'format': 'Glob'}) + let filesStr = globpath(globDir, '*') . "\n" . globpath(globDir, '.*') let files = split(filesStr, "\n") for i in files - if i !~ '\.\.$' && i !~ '\.$' + "filter out the .. and . directories + "Note: we must match .. AND ../ cos sometimes the globpath returns + "../ for path with strange chars (eg $) + if i !~ '\/\.\.\/\?$' && i !~ '\/\.\/\?$' try "create a new path and see if it exists in this nodes children @@ -1407,7 +1759,7 @@ function! s:Path.AbsolutePathFor(str) let toReturn = a:str if prependCWD - let toReturn = getcwd() . s:os_slash . a:str + let toReturn = getcwd() . s:Path.Slash() . a:str endif return toReturn @@ -1449,7 +1801,7 @@ endfunction function! s:Path.changeToDir() let dir = self.strForCd() if self.isDirectory ==# 0 - let dir = self.getPathTrunk().strForCd() + let dir = self.getParent().strForCd() endif try @@ -1549,10 +1901,10 @@ function! s:Path.copy(dest) let dest = s:Path.WinToUnixPath(a:dest) - let cmd = g:NERDTreeCopyCmd . " " . self.strForOS(0) . " " . dest + let cmd = g:NERDTreeCopyCmd . " " . self.str() . " " . dest let success = system(cmd) if success != 0 - throw "NERDTree.CopyError: Could not copy ''". self.strForOS(0) ."'' to: '" . a:dest . "'" + throw "NERDTree.CopyError: Could not copy ''". self.str() ."'' to: '" . a:dest . "'" endif endfunction @@ -1593,22 +1945,16 @@ endfunction function! s:Path.delete() if self.isDirectory - let cmd = "" - if s:running_windows - "if we are runnnig windows then put quotes around the pathstring - let cmd = g:NERDTreeRemoveDirCmd . self.strForOS(1) - else - let cmd = g:NERDTreeRemoveDirCmd . self.strForOS(1) - endif + let cmd = g:NERDTreeRemoveDirCmd . self.str('escape': 1}) let success = system(cmd) if v:shell_error != 0 - throw "NERDTree.PathDeletionError: Could not delete directory: '" . self.strForOS(0) . "'" + throw "NERDTree.PathDeletionError: Could not delete directory: '" . self.str() . "'" endif else - let success = delete(self.strForOS(0)) + let success = delete(self.str()) if success != 0 - throw "NERDTree.PathDeletionError: Could not delete file: '" . self.str(0) . "'" + throw "NERDTree.PathDeletionError: Could not delete file: '" . self.str() . "'" endif endif @@ -1619,6 +1965,17 @@ function! s:Path.delete() endfor endfunction +"FUNCTION: Path.displayString() {{{3 +" +"Returns a string that specifies how the path should be represented as a +"string +function! s:Path.displayString() + if self.cachedDisplayString ==# "" + call self.cacheDisplayString() + endif + + return self.cachedDisplayString +endfunction "FUNCTION: Path.extractDriveLetter(fullpath) {{{3 " "If running windows, cache the drive letter for this path @@ -1633,7 +1990,8 @@ endfunction "FUNCTION: Path.exists() {{{3 "return 1 if this path points to a location that is readable or is a directory function! s:Path.exists() - return filereadable(self.strForOS(0)) || isdirectory(self.strForOS(0)) + let p = self.str() + return filereadable(p) || isdirectory(p) endfunction "FUNCTION: Path.getDir() {{{3 " @@ -1676,12 +2034,6 @@ function! s:Path.getLastPathComponent(dirSlash) return toReturn endfunction -"FUNCTION: Path.getPathTrunk() {{{3 -"Gets the path without the last segment on the end. -function! s:Path.getPathTrunk() - return s:Path.New(self.strTrunk()) -endfunction - "FUNCTION: Path.getSortOrderIndex() {{{3 "returns the index of the pattern in g:NERDTreeSortOrder that this path matches function! s:Path.getSortOrderIndex() @@ -1738,7 +2090,7 @@ endfunction "Args: "path: the other path obj to compare this with function! s:Path.equals(path) - return self.str(0) ==# a:path.str(0) + return self.str() ==# a:path.str() endfunction "FUNCTION: Path.New() {{{3 @@ -1753,6 +2105,12 @@ function! s:Path.New(path) return newPath endfunction +"FUNCTION: Path.Slash() {{{3 +"return the slash to use for the current OS +function! s:Path.Slash() + return s:running_windows ? '\' : '/' +endfunction + "FUNCTION: Path.readInfoFromDisk(fullpath) {{{3 " " @@ -1809,7 +2167,7 @@ endfunction "FUNCTION: Path.refresh() {{{3 function! s:Path.refresh() - call self.readInfoFromDisk(self.strForOS(0)) + call self.readInfoFromDisk(self.str()) call self.cacheDisplayString() endfunction @@ -1821,9 +2179,9 @@ function! s:Path.rename(newPath) throw "NERDTree.InvalidArgumentsError: Invalid newPath for renaming = ". a:newPath endif - let success = rename(self.strForOS(0), a:newPath) + let success = rename(self.str(), a:newPath) if success != 0 - throw "NERDTree.PathRenameError: Could not rename: '" . self.strForOS(0) . "'" . 'to:' . a:newPath + throw "NERDTree.PathRenameError: Could not rename: '" . self.str() . "'" . 'to:' . a:newPath endif call self.readInfoFromDisk(a:newPath) @@ -1834,76 +2192,81 @@ function! s:Path.rename(newPath) call s:Bookmark.Write() endfunction -"FUNCTION: Path.str(esc) {{{3 +"FUNCTION: Path.str() {{{3 " -"Gets the actual string path that this obj represents. +"Returns a string representation of this Path " -"Args: -"esc: if 1 then all the tricky chars in the returned string will be escaped -function! s:Path.str(esc) - let toReturn = '/' . join(self.pathSegments, '/') - if self.isDirectory && toReturn != '/' - let toReturn = toReturn . '/' +"Takes an optional dictionary param to specify how the output should be +"formatted. +" +"The dict may have the following keys: +" 'format' +" 'escape' +" +"The 'format' key may have a value of: +" 'Cd' - a string to be used with the :cd command +" 'Edit' - a string to be used with :e :sp :new :tabedit etc +" 'UI' - a string used in the NERD tree UI +" +"If not specified, a generic unix style path string will be returned +" +"The 'escape' key, if specified will cause the output to be escaped with +"shellescape() +function! s:Path.str(...) + let options = a:0 ? a:1 : {} + let toReturn = "" + + if has_key(options, 'format') + let format = options['format'] + if has_key(self, '_strFor' . format) + exec 'let toReturn = self._strFor' . format . '()' + else + raise 'NERDTree.UnknownFormatError: unknown format "'. format .'"' + endif + else + let toReturn = self._str() endif - if a:esc - let toReturn = escape(toReturn, s:escape_chars) + if has_key(options, 'escape') && options['escape'] + let toReturn = shellescape(toReturn) endif + return toReturn endfunction -"FUNCTION: Path.strAbs() {{{3 -" -"Returns a string representing this path with all the symlinks resolved -" -"Return: -"string -function! s:Path.strAbs() - return resolve(self.str(1)) +"FUNCTION: Path._strForUI() {{{3 +function! s:Path._strForUI() + let toReturn = '/' . join(self.pathSegments, '/') + if self.isDirectory && toReturn != '/' + let toReturn = toReturn . '/' + endif + return toReturn endfunction -"FUNCTION: Path.strForCd() {{{3 +"FUNCTION: Path._strForCd() {{{3 " " returns a string that can be used with :cd -" -"Return: -"a string that can be used in the view to represent this path -function! s:Path.strForCd() +function! s:Path._strForCd() if s:running_windows - return self.strForOS(0) + return self.str() else - return self.strForOS(1) + return self.str({'escape': 1}) endif endfunction -"FUNCTION: Path.strDisplay() {{{3 -" -"Returns a string that specifies how the path should be represented as a -"string -" -"Return: -"a string that can be used in the view to represent this path -function! s:Path.strDisplay() - if self.cachedDisplayString ==# "" - call self.cacheDisplayString() - endif - - return self.cachedDisplayString -endfunction - -"FUNCTION: Path.strForEditCmd() {{{3 +"FUNCTION: Path._strForEdit() {{{3 " "Return: the string for this path that is suitable to be used with the :edit "command -function! s:Path.strForEditCmd() - let p = self.str(1) +function! s:Path._strForEdit() + let p = self.str({'format': 'UI'}) let cwd = getcwd() if s:running_windows - let p = tolower(self.strForOS(0)) + let p = tolower(self.str()) let cwd = tolower(getcwd()) endif - let cwd = cwd . s:os_slash + let cwd = cwd . s:Path.Slash() "return a relative path if we can if stridx(p, cwd) ==# 0 @@ -1917,49 +2280,36 @@ function! s:Path.strForEditCmd() return p endfunction -"FUNCTION: Path.strForGlob() {{{3 -function! s:Path.strForGlob() - let lead = s:os_slash +"FUNCTION: Path._strForGlob() {{{3 +function! s:Path._strForGlob() + let lead = s:Path.Slash() "if we are running windows then slap a drive letter on the front if s:running_windows let lead = self.drive . '\' endif - let toReturn = lead . join(self.pathSegments, s:os_slash) + let toReturn = lead . join(self.pathSegments, s:Path.Slash()) if !s:running_windows let toReturn = escape(toReturn, s:escape_chars) endif return toReturn endfunction -"FUNCTION: Path.strForOS(esc) {{{3 +"FUNCTION: Path._str() {{{3 " "Gets the string path for this path object that is appropriate for the OS. "EG, in windows c:\foo\bar " in *nix /foo/bar -" -"Args: -"esc: if 1 then all the tricky chars in the returned string will be -" escaped. If we are running windows then the str is double quoted instead. -function! s:Path.strForOS(esc) - let lead = s:os_slash +function! s:Path._str() + let lead = s:Path.Slash() "if we are running windows then slap a drive letter on the front if s:running_windows let lead = self.drive . '\' endif - let toReturn = lead . join(self.pathSegments, s:os_slash) - - if a:esc - if s:running_windows - let toReturn = '"' . toReturn . '"' - else - let toReturn = escape(toReturn, s:escape_chars) - endif - endif - return toReturn + return lead . join(self.pathSegments, s:Path.Slash()) endfunction "FUNCTION: Path.strTrunk() {{{3 @@ -2057,7 +2407,7 @@ function! s:initNerdTree(name) "hack to get an absolute path if a relative path is given if dir =~ '^\.' - let dir = getcwd() . s:os_slash . dir + let dir = getcwd() . s:Path.Slash() . dir endif let dir = resolve(dir) @@ -2158,7 +2508,7 @@ function! s:initNerdTreeInPlace(dir) call s:bindMappings() setfiletype nerdtree " syntax highlighting - if has("syntax") && exists("g:syntax_on") && !has("syntax_items") + if has("syntax") && exists("g:syntax_on") call s:setupSyntaxHighlighting() endif @@ -2184,7 +2534,7 @@ function! s:initNerdTreeMirror() while i < len(treeBufNames) let bufName = treeBufNames[i] let treeRoot = getbufvar(bufName, "NERDTreeRoot") - let options[i+1 . '. ' . treeRoot.path.strForOS(0) . ' (buf name: ' . bufName . ')'] = bufName + let options[i+1 . '. ' . treeRoot.path.str() . ' (buf name: ' . bufName . ')'] = bufName let i = i + 1 endwhile @@ -2262,45 +2612,32 @@ function! s:unique(list) endfor return uniqlist endfunction -" SECTION: Public Functions {{{1 +" SECTION: Public API {{{1 "============================================================ -"Returns the node that the cursor is currently on. -" -"If the cursor is not in the NERDTree window, it is temporarily put there. -" -"If no NERD tree window exists for the current tab, a NERDTree.NoTreeForTab -"exception is thrown. -" -"If the cursor is not on a node then an empty dictionary {} is returned. -function! NERDTreeGetCurrentNode() - if !s:treeExistsForTab() || !s:isTreeOpen() - throw "NERDTree.NoTreeForTabError: there is no NERD tree open for the current tab" - endif +let g:NERDTreePath = s:Path +let g:NERDTreeDirNode = s:TreeDirNode +let g:NERDTreeFileNode = s:TreeFileNode +let g:NERDTreeBookmark = s:Bookmark - let winnr = winnr() - if winnr != s:getTreeWinNum() - call s:putCursorInTreeWin() - endif +function! NERDTreeAddMenuItem(options) + call s:MenuItem.Create(a:options) +endfunction - let treenode = s:TreeFileNode.GetSelected() +function! NERDTreeAddMenuSeparator(...) + let opts = a:0 ? a:1 : {} + call s:MenuItem.CreateSeparator(opts) +endfunction - if winnr != winnr() - call s:exec('wincmd w') - endif +function! NERDTreeAddSubmenu(options) + return s:MenuItem.Create(a:options) +endfunction - return treenode +function! NERDTreeAddKeyMap(options) + call s:KeyMap.Create(a:options) endfunction -"Returns the path object for the current node. -" -"Subject to the same conditions as NERDTreeGetCurrentNode -function! NERDTreeGetCurrentPath() - let node = NERDTreeGetCurrentNode() - if node != {} - return node.path - else - return {} - endif +function! NERDTreeRender() + call s:renderView() endfunction " SECTION: View Functions {{{1 @@ -2344,7 +2681,7 @@ endfunction "FUNCTION: s:closeTreeIfQuitOnOpen() {{{2 "Closes the NERD tree window if the close on open option is set function! s:closeTreeIfQuitOnOpen() - if g:NERDTreeQuitOnOpen + if g:NERDTreeQuitOnOpen && s:isTreeOpen() call s:closeTree() endif endfunction @@ -2355,12 +2692,13 @@ function! s:createTreeWin() "create the nerd tree window let splitLocation = g:NERDTreeWinPos ==# "left" ? "topleft " : "botright " let splitSize = g:NERDTreeWinSize - silent! exec splitLocation . 'vertical ' . splitSize . ' new' if !exists('t:NERDTreeBufName') let t:NERDTreeBufName = s:nextBufferName() + silent! exec splitLocation . 'vertical ' . splitSize . ' new' silent! exec "edit " . t:NERDTreeBufName else + silent! exec splitLocation . 'vertical ' . splitSize . ' split' silent! exec "buffer " . t:NERDTreeBufName endif @@ -2390,7 +2728,7 @@ function! s:createTreeWin() call s:bindMappings() setfiletype nerdtree " syntax highlighting - if has("syntax") && exists("g:syntax_on") && !has("syntax_items") + if has("syntax") && exists("g:syntax_on") call s:setupSyntaxHighlighting() endif endfunction @@ -2404,6 +2742,7 @@ function! s:dumpHelp() let @h=@h."\" ============================\n" let @h=@h."\" File node mappings~\n" let @h=@h."\" ". (g:NERDTreeMouseMode ==# 3 ? "single" : "double") ."-click,\n" + let @h=@h."\" <CR>,\n" if b:NERDTreeType ==# "primary" let @h=@h."\" ". g:NERDTreeMapActivateNode .": open in prev window\n" else @@ -2419,7 +2758,6 @@ function! s:dumpHelp() let @h=@h."\" ". g:NERDTreeMapPreviewSplit .": preview split\n" let @h=@h."\" ". g:NERDTreeMapOpenVSplit .": open vsplit\n" let @h=@h."\" ". g:NERDTreeMapPreviewVSplit .": preview vsplit\n" - let @h=@h."\" ". g:NERDTreeMapExecute.": Execute file\n" let @h=@h."\"\n\" ----------------------------\n" let @h=@h."\" Directory node mappings~\n" @@ -2458,7 +2796,7 @@ function! s:dumpHelp() let @h=@h."\" but leave old root open\n" let @h=@h."\" ". g:NERDTreeMapRefresh .": refresh cursor dir\n" let @h=@h."\" ". g:NERDTreeMapRefreshRoot .": refresh current root\n" - let @h=@h."\" ". g:NERDTreeMapFilesystemMenu .": Show filesystem menu\n" + let @h=@h."\" ". g:NERDTreeMapMenu .": Show menu\n" let @h=@h."\" ". g:NERDTreeMapChdir .":change the CWD to the\n" let @h=@h."\" selected dir\n" @@ -2469,9 +2807,20 @@ function! s:dumpHelp() let @h=@h."\" ". g:NERDTreeMapToggleFiles .": files (" . (b:NERDTreeShowFiles ? "on" : "off") . ")\n" let @h=@h."\" ". g:NERDTreeMapToggleBookmarks .": bookmarks (" . (b:NERDTreeShowBookmarks ? "on" : "off") . ")\n" + "add quickhelp entries for each custom key map + if len(s:KeyMap.All()) + let @h=@h."\"\n\" ----------------------------\n" + let @h=@h."\" Custom mappings~\n" + for i in s:KeyMap.All() + let @h=@h."\" ". i.key .": ". i.quickhelpText ."\n" + endfor + endif + let @h=@h."\"\n\" ----------------------------\n" let @h=@h."\" Other mappings~\n" let @h=@h."\" ". g:NERDTreeMapQuit .": Close the NERDTree window\n" + let @h=@h."\" ". g:NERDTreeMapToggleZoom .": Zoom (maximize-minimize)\n" + let @h=@h."\" the NERDTree window\n" let @h=@h."\" ". g:NERDTreeMapHelp .": toggle help\n" let @h=@h."\"\n\" ----------------------------\n" let @h=@h."\" Bookmark commands~\n" @@ -2516,14 +2865,15 @@ function! s:echoError(msg) call s:echo(a:msg) echohl normal endfunction -"FUNCTION: s:firstNormalWindow(){{{2 +"FUNCTION: s:firstUsableWindow(){{{2 "find the window number of the first normal window -function! s:firstNormalWindow() +function! s:firstUsableWindow() let i = 1 while i <= winnr("$") let bnum = winbufnr(i) if bnum != -1 && getbufvar(bnum, '&buftype') ==# '' \ && !getwinvar(i, '&previewwindow') + \ && (!getbufvar(bnum, '&modified') || &hidden) return i endif @@ -2630,8 +2980,8 @@ function! s:isTreeOpen() return s:getTreeWinNum() != -1 endfunction "FUNCTION: s:isWindowUsable(winnumber) {{{2 -"Returns 1 if opening a file from the tree in the given window requires it to -"be split +"Returns 0 if opening a file from the tree in the given window requires it to +"be split, 1 otherwise " "Args: "winnumber: the number of the window in question @@ -2778,7 +3128,7 @@ function! s:renderView() call cursor(line(".")+1, col(".")) "draw the header line - call setline(line(".")+1, b:NERDTreeRoot.path.str(0)) + call setline(line(".")+1, b:NERDTreeRoot.path.str({'format': 'UI'})) call cursor(line(".")+1, col(".")) "draw the tree @@ -3025,26 +3375,11 @@ function! s:activateNode(forceKeepWindowOpen) let treenode = s:TreeFileNode.GetSelected() if treenode != {} - if treenode.path.isDirectory - call treenode.toggleOpen() - call s:renderView() - call treenode.putCursorHere(0, 0) - else - call treenode.open() - if !a:forceKeepWindowOpen - call s:closeTreeIfQuitOnOpen() - end - endif + call treenode.activate(a:forceKeepWindowOpen) else let bookmark = s:getSelectedBookmark() if !empty(bookmark) - if bookmark.path.isDirectory - call bookmark.toRoot() - else - if bookmark.validate() - call (s:TreeFileNode.New(bookmark.path)).open() - endif - endif + call bookmark.activate() endif endif endfunction @@ -3058,6 +3393,7 @@ function! s:bindMappings() exec "nnoremap <silent> <buffer> ". g:NERDTreeMapActivateNode . " :call <SID>activateNode(0)<cr>" exec "nnoremap <silent> <buffer> ". g:NERDTreeMapOpenSplit ." :call <SID>openEntrySplit(0,0)<cr>" + exec "nnoremap <silent> <buffer> <cr> :call <SID>activateNode(0)<cr>" exec "nnoremap <silent> <buffer> ". g:NERDTreeMapPreview ." :call <SID>previewNode(0)<cr>" exec "nnoremap <silent> <buffer> ". g:NERDTreeMapPreviewSplit ." :call <SID>previewNode(1)<cr>" @@ -3065,8 +3401,6 @@ function! s:bindMappings() exec "nnoremap <silent> <buffer> ". g:NERDTreeMapOpenVSplit ." :call <SID>openEntrySplit(1,0)<cr>" exec "nnoremap <silent> <buffer> ". g:NERDTreeMapPreviewVSplit ." :call <SID>previewNode(2)<cr>" - exec "nnoremap <silent> <buffer> ". g:NERDTreeMapExecute ." :call <SID>executeNode()<cr>" - exec "nnoremap <silent> <buffer> ". g:NERDTreeMapOpenRecursively ." :call <SID>openNodeRecursively()<cr>" exec "nnoremap <silent> <buffer> ". g:NERDTreeMapUpdirKeepOpen ." :call <SID>upDir(1)<cr>" @@ -3081,6 +3415,7 @@ function! s:bindMappings() exec "nnoremap <silent> <buffer> ". g:NERDTreeMapRefresh ." :call <SID>refreshCurrent()<cr>" exec "nnoremap <silent> <buffer> ". g:NERDTreeMapHelp ." :call <SID>displayHelp()<cr>" + exec "nnoremap <silent> <buffer> ". g:NERDTreeMapToggleZoom ." :call <SID>toggleZoom()<cr>" exec "nnoremap <silent> <buffer> ". g:NERDTreeMapToggleHidden ." :call <SID>toggleShowHidden()<cr>" exec "nnoremap <silent> <buffer> ". g:NERDTreeMapToggleFilters ." :call <SID>toggleIgnoreFilter()<cr>" exec "nnoremap <silent> <buffer> ". g:NERDTreeMapToggleFiles ." :call <SID>toggleShowFiles()<cr>" @@ -3089,7 +3424,7 @@ function! s:bindMappings() exec "nnoremap <silent> <buffer> ". g:NERDTreeMapCloseDir ." :call <SID>closeCurrentDir()<cr>" exec "nnoremap <silent> <buffer> ". g:NERDTreeMapCloseChildren ." :call <SID>closeChildren()<cr>" - exec "nnoremap <silent> <buffer> ". g:NERDTreeMapFilesystemMenu ." :call <SID>showFileSystemMenu()<cr>" + exec "nnoremap <silent> <buffer> ". g:NERDTreeMapMenu ." :call <SID>showMenu()<cr>" exec "nnoremap <silent> <buffer> ". g:NERDTreeMapJumpParent ." :call <SID>jumpToParent()<cr>" exec "nnoremap <silent> <buffer> ". g:NERDTreeMapJumpNextSibling ." :call <SID>jumpToSibling(1)<cr>" @@ -3105,6 +3440,9 @@ function! s:bindMappings() exec "nnoremap <silent> <buffer> ". g:NERDTreeMapDeleteBookmark ." :call <SID>deleteBookmark()<cr>" + "bind all the user custom maps + call s:KeyMap.BindAll() + command! -buffer -nargs=1 Bookmark :call <SID>bookmarkNode('<args>') command! -buffer -complete=customlist,s:completeBookmarks -nargs=1 RevealBookmark :call <SID>revealBookmark('<args>') command! -buffer -complete=customlist,s:completeBookmarks -nargs=1 OpenBookmark :call <SID>openBookmark('<args>') @@ -3225,7 +3563,7 @@ function! s:closeCurrentDir() endif let parent = treenode.parent - if parent.isRoot() + if parent ==# {} || parent.isRoot() call s:echo("cannot close tree root") else call treenode.parent.close() @@ -3246,45 +3584,6 @@ function! s:closeTreeWindow() endif endif endfunction -" FUNCTION: s:copyNode() {{{2 -function! s:copyNode() - let currentNode = s:TreeFileNode.GetSelected() - if currentNode ==# {} - call s:echo("Put the cursor on a file node first") - return - endif - - let newNodePath = input("Copy the current node\n" . - \ "==========================================================\n" . - \ "Enter the new path to copy the node to: \n" . - \ "", currentNode.path.str(0)) - - if newNodePath != "" - "strip trailing slash - let newNodePath = substitute(newNodePath, '\/$', '', '') - - let confirmed = 1 - if currentNode.path.copyingWillOverwrite(newNodePath) - call s:echo("\nWarning: copying may overwrite files! Continue? (yN)") - let choice = nr2char(getchar()) - let confirmed = choice ==# 'y' - endif - - if confirmed - try - let newNode = currentNode.copy(newNodePath) - call s:renderView() - call newNode.putCursorHere(0, 0) - catch /^NERDTree/ - call s:echoWarning("Could not copy node") - endtry - endif - else - call s:echo("Copy aborted.") - endif - redraw -endfunction - " FUNCTION: s:deleteBookmark() {{{2 " if the cursor is on a bookmark, prompt to delete function! s:deleteBookmark() @@ -3310,57 +3609,6 @@ function! s:deleteBookmark() endfunction -" FUNCTION: s:deleteNode() {{{2 -" if the current node is a file, pops up a dialog giving the user the option -" to delete it -function! s:deleteNode() - let currentNode = s:TreeFileNode.GetSelected() - if currentNode ==# {} - call s:echo("Put the cursor on a file node first") - return - endif - - let confirmed = 0 - - if currentNode.path.isDirectory - let choice =input("Delete the current node\n" . - \ "==========================================================\n" . - \ "STOP! To delete this entire directory, type 'yes'\n" . - \ "" . currentNode.path.strForOS(0) . ": ") - let confirmed = choice ==# 'yes' - else - echo "Delete the current node\n" . - \ "==========================================================\n". - \ "Are you sure you wish to delete the node:\n" . - \ "" . currentNode.path.strForOS(0) . " (yN):" - let choice = nr2char(getchar()) - let confirmed = choice ==# 'y' - endif - - - if confirmed - try - call currentNode.delete() - call s:renderView() - - "if the node is open in a buffer, ask the user if they want to - "close that buffer - let bufnum = bufnr(currentNode.path.str(0)) - if buflisted(bufnum) - 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) - endif - - redraw - catch /^NERDTree/ - call s:echoWarning("Could not remove node") - endtry - else - call s:echo("delete aborted" ) - endif - -endfunction - " FUNCTION: s:displayHelp() {{{2 " toggles the help display function! s:displayHelp() @@ -3369,26 +3617,6 @@ function! s:displayHelp() call s:centerView() endfunction -" FUNCTION: s:executeNode() {{{2 -function! s:executeNode() - let treenode = s:TreeFileNode.GetSelected() - if treenode ==# {} || treenode.path.isDirectory - call s:echo("Select an executable file node first" ) - else - echo "NERDTree executor\n" . - \ "==========================================================\n". - \ "Complete the command to execute (add arguments etc): \n\n" - let cmd = treenode.path.strForOS(1) - let cmd = input(':!', cmd . ' ') - - if cmd != '' - exec ':!' . cmd - else - call s:echo("command aborted") - endif - endif -endfunction - " FUNCTION: s:handleMiddleMouse() {{{2 function! s:handleMiddleMouse() let curNode = s:TreeFileNode.GetSelected() @@ -3405,40 +3633,6 @@ function! s:handleMiddleMouse() endfunction -" FUNCTION: s:insertNewNode() {{{2 -" Adds a new node to the filesystem and then into the tree -function! s:insertNewNode() - let curDirNode = s:TreeDirNode.GetSelected() - if curDirNode ==# {} - call s:echo("Put the cursor on a node first" ) - return - endif - - let newNodeName = input("Add a childnode\n". - \ "==========================================================\n". - \ "Enter the dir/file name to be created. Dirs end with a '/'\n" . - \ "", curDirNode.path.strForGlob() . s:os_slash) - - if newNodeName ==# '' - call s:echo("Node Creation Aborted.") - return - endif - - try - let newPath = s:Path.Create(newNodeName) - let parentNode = b:NERDTreeRoot.findNode(newPath.getPathTrunk()) - - let newTreeNode = s:TreeFileNode.New(newPath) - if parentNode.isOpen || !empty(parentNode.children) - call parentNode.addChild(newTreeNode, 1) - call s:renderView() - call newTreeNode.putCursorHere(1, 0) - endif - catch /^NERDTree/ - call s:echoWarning("Node Not Created.") - endtry -endfunction - " FUNCTION: s:jumpToFirstChild() {{{2 " wrapper for the jump to child method function! s:jumpToFirstChild() @@ -3556,9 +3750,9 @@ function! s:openInNewTab(stayCurrentTab) if treenode != {} if treenode.path.isDirectory tabnew - call s:initNerdTree(treenode.path.strForOS(0)) + call s:initNerdTree(treenode.path.str()) else - exec "tabedit " . treenode.path.strForEditCmd() + exec "tabedit " . treenode.path.str({'format': 'Edit'}) endif else let bookmark = s:getSelectedBookmark() @@ -3567,7 +3761,7 @@ function! s:openInNewTab(stayCurrentTab) tabnew call s:initNerdTree(bookmark.name) else - exec "tabedit " . bookmark.path.strForEditCmd() + exec "tabedit " . bookmark.path.str({'format': 'Edit'}) endif endif endif @@ -3641,80 +3835,16 @@ function! s:refreshCurrent() redraw call s:echo("Refreshing node. This could take a while... DONE") endfunction -" FUNCTION: s:renameCurrent() {{{2 -" allows the user to rename the current node -function! s:renameCurrent() - let curNode = s:TreeFileNode.GetSelected() - if curNode ==# {} - call s:echo("Put the cursor on a node first" ) - return - endif - - let newNodePath = input("Rename the current node\n" . - \ "==========================================================\n" . - \ "Enter the new path for the node: \n" . - \ "", curNode.path.strForOS(0)) - - if newNodePath ==# '' - call s:echo("Node Renaming Aborted.") - return - endif - - try - let bufnum = bufnr(curNode.path.str(0)) - - call curNode.rename(newNodePath) - call s:renderView() - - "if the node is open in a buffer, ask the user if they want to - "close that buffer - if bufnum != -1 - let prompt = "\nNode renamed.\n\nThe old file is open in buffer ". bufnum . (bufwinnr(bufnum) ==# -1 ? " (hidden)" : "") .". Delete this buffer? (yN)" - call s:promptToDelBuffer(bufnum, prompt) - endif - - call curNode.putCursorHere(1, 0) - - redraw - catch /^NERDTree/ - call s:echoWarning("Node Not Renamed.") - endtry -endfunction - -" FUNCTION: s:showFileSystemMenu() {{{2 -function! s:showFileSystemMenu() +" FUNCTION: s:showMenu() {{{2 +function! s:showMenu() let curNode = s:TreeFileNode.GetSelected() if curNode ==# {} call s:echo("Put the cursor on a node first" ) return endif - - let prompt = "NERDTree Filesystem Menu\n" . - \ "==========================================================\n". - \ "Select the desired operation: \n" . - \ " (a)dd a childnode\n". - \ " (m)ove the current node\n". - \ " (d)elete the current node\n" - if s:Path.CopyingSupported() - let prompt = prompt . " (c)opy the current node\n\n" - else - let prompt = prompt . " \n" - endif - - echo prompt - - let choice = nr2char(getchar()) - - if choice ==? "a" - call s:insertNewNode() - elseif choice ==? "m" - call s:renameCurrent() - elseif choice ==? "d" - call s:deleteNode() - elseif choice ==? "c" && s:Path.CopyingSupported() - call s:copyNode() - endif + let mc = s:MenuController.New(s:MenuItem.AllEnabled()) + call mc.showMenu() endfunction " FUNCTION: s:toggleIgnoreFilter() {{{2 @@ -3753,6 +3883,19 @@ function! s:toggleShowHidden() call s:centerView() endfunction +" FUNCTION: s:toggleZoom() {{2 +" zoom (maximize/minimize) the NERDTree window +function! s:toggleZoom() + if exists("b:NERDTreeZoomed") && b:NERDTreeZoomed + let size = exists("b:NERDTreeOldWindowSize") ? b:NERDTreeOldWindowSize : g:NERDTreeWinSize + exec "silent vertical resize ". size + let b:NERDTreeZoomed = 0 + else + exec "vertical resize" + let b:NERDTreeZoomed = 1 + endif +endfunction + "FUNCTION: s:upDir(keepState) {{{2 "moves the tree up a level " @@ -3760,7 +3903,7 @@ endfunction "keepState: 1 if the current root should be left open when the tree is "re-rendered function! s:upDir(keepState) - let cwd = b:NERDTreeRoot.path.str(0) + let cwd = b:NERDTreeRoot.path.str({'format': 'UI'}) if cwd ==# "/" || cwd =~ '^[^/]..$' call s:echo("already at top dir") else @@ -3771,7 +3914,7 @@ function! s:upDir(keepState) let oldRoot = b:NERDTreeRoot if empty(b:NERDTreeRoot.parent) - let path = b:NERDTreeRoot.path.getPathTrunk() + let path = b:NERDTreeRoot.path.getParent() let newRoot = s:TreeDirNode.New(path) call newRoot.open() call newRoot.transplantChild(b:NERDTreeRoot) plugin/NERD_tree.vim 0ede6d1d2e9f18cd2f30fb085a9baa1874bedeb2 unknown v-vixavi@.southamerica.corp.microsoft.com http://github.com/vcx/vimfiles/commit/4923587a9d329fc03495668975b3f74f2708249a 4923587a9d329fc03495668975b3f74f2708249a 2009-09-09T12:26:11-07:00 2009-09-09T12:26:11-07:00 update plugins nerd_commenter and nerd_tree a2b19052f18df2710f743a6365b693c109e004c6 unknown v-vixavi@.southamerica.corp.microsoft.com