diff --git a/README.rst b/README.rst index f48c7fb..a5c261f 100644 --- a/README.rst +++ b/README.rst @@ -1,24 +1,15 @@ UltiSnips ========= -This is the official repository for UltiSnips on GitHub. It is held in sync -with the official bzr repository over at Launchpad [1] and is meant as a -convenience for contributors. Send Pull request to this repository, not -the automatic clone from vim-scripts. - -Note that we do not use the Issue tracker here on GitHub because the one on -Launchpad is superior and already has a significant history. Please report -`issues over there`_. - -[1] http://launchpad.net/ultisnips - -.. _issues over there: https://bugs.launchpad.net/ultisnips +This is the official repository for UltiSnips. Send Pull request to +SirVer/ultisnips, not the automatic clone from vim-scripts or any +other fork of this project. Screencasts ----------- The blog posts of the screencasts contain more advanced examples of the things -discussed in the video. +discussed in the videos. * `Episode 1: What are snippets and do I need them?`__ * `Episode 2: Creating Basic Snippets`__ @@ -29,5 +20,3 @@ __ http://www.sirver.net/blog/2011/12/30/first-episode-of-ultisnips-screencast/ __ http://www.sirver.net/blog/2012/01/08/second-episode-of-ultisnips-screencast/ __ http://www.sirver.net/blog/2012/02/05/third-episode-of-ultisnips-screencast/ __ http://www.sirver.net/blog/2012/03/31/fourth-episode-of-ultisnips-screencast/ - - diff --git a/doc/UltiSnips.txt b/doc/UltiSnips.txt index 66cff83..2f4b4fa 100644 --- a/doc/UltiSnips.txt +++ b/doc/UltiSnips.txt @@ -124,6 +124,9 @@ permission to use his snippets. ============================================================================= 2. Installation and Updating *UltiSnips-installnupdate* +The recommended way of getting ultisnips is to track SirVer/ultisnips on +github. The master branch is always stable. + Using Pathogen: *UltiSnips-using-pathogen* If you are a pathogen user, you can track the official mirror of UltiSnips on @@ -135,19 +138,10 @@ github: > See the pathogen documentation for more details on how to update a bundle. -Using Bzr: *UltiSnips-using-bzr* +Using a downloaded packet: *UltiSnips-using-a-downloaded-packet* -To track the main repository on github, you will need bzr -(http://bazaar-vcs.org/). bzr is available in all major Linux distributions -(packaged as bzr or bazaar) and can be easily installed under Mac OS X: > - $ pip install bzr - -Using bzr, checkout UltiSnips into a directory of your choice. > - $ cd ~/.vim/ - $ bzr get lp:ultisnips ultisnips_rep - -Then add this directory to your Vim runtime path by adding this line to your -vimrc file. > +Download the packet and unpack into a directory of your choice. Then add this +directory to your Vim runtime path by adding this line to your vimrc file. > set runtimepath+=~/.vim/ultisnips_rep UltiSnips also needs that Vim sources files from the ftdetect/ directory. @@ -160,15 +154,6 @@ Restart Vim and UltiSnips should work. To access the help, use > :helptags ~/.vim/ultisnips_rep/doc :help UltiSnips -To update an installation, simply pull the latest revision: > - $ cd ~/.vim/ultisnips_rep - $ bzr pull - -Using a downloaded packet: *UltiSnips-using-a-downloaded-packet* - -Download the packet and unpack into a directory of your choice. Add the path -to runtimepath. See |UltiSnips-using-bzr| for an example. - ============================================================================= 3. Settings & Commands *UltiSnips-settings* @@ -1285,6 +1270,9 @@ that are aware of UltiSnips and use it to improve the user experience. This is an incomplete list - if you want to have your plugin listed here, just sent me a pull request. +YouCompleteMe - comes with out of the box completion support for UltiSnips. It +offers a really nice completion dialogue for snippets. + Supertab - UltiSnips has built-in support for Supertab. Just use a recent enough version of both plugins and will either expand a snippet or defer to Supertab for expansion. @@ -1305,8 +1293,6 @@ You can contribute snippets or patches in various ways. The methods are listed below in order of convenience for me. Please be as convenient as you can be :) -* Clone the repository on launchpad (bzr clone lp:ultisnips), make fixes, push - the branch and send a merge request on launchpad. * Clone the repository on GitHub (git clone git@github.com:SirVer/ultisnips.git), make your changes and send a pull request on GitHub. * Make a patch, report a bug/feature request (see below) and attach the patch @@ -1315,8 +1301,7 @@ can be :) * Send me an Email with the changed files only. You can contribute by fixing or reporting bugs in our issue tracker: -https://bugs.launchpad.net/ultisnips - +https://github.com/sirver/ultisnips/issues If you like this plugin, please vote for it on its Vim script page > http://www.vim.org/scripts/script.php?script_id=2715 @@ -1326,10 +1311,7 @@ It is life-changing for me. Maybe it is for you too. ============================================================================= 7. Contact *UltiSnips-contact* -You can reach me at SirVer -AT- gmx -ADOT- de. You can also contact me through -the UltiSnips launchpad project page at https://launchpad.net/ultisnips/. The -launchpad project has an 'Answers' page where you can ask me questions and a -bug tracker where you can report bugs and issues. +You can reach me at SirVer -AT- gmx -ADOT- de. This project aims to be the one-for-all solution for Snippets for Vim. If you miss a feature or find a bug, please contact me or file a support ticket. diff --git a/pythonx/UltiSnips/snippet_manager.py b/pythonx/UltiSnips/snippet_manager.py index a694985..81b168c 100755 --- a/pythonx/UltiSnips/snippet_manager.py +++ b/pythonx/UltiSnips/snippet_manager.py @@ -50,7 +50,7 @@ def err_to_scratch_buffer(func): msg = \ """An error occured. This is either a bug in UltiSnips or a bug in a snippet definition. If you think this is a bug, please report it to -https://bugs.launchpad.net/ultisnips/+filebug. +https://github.com/SirVer/ultisnips/issues/new. Following is the full stack trace: """ diff --git a/test.py b/test.py index c94fc09..ff31384 100755 --- a/test.py +++ b/test.py @@ -1915,7 +1915,7 @@ class RecTabStops_MirroredZeroTS_ECR(_VimTest): JF + "three" + JF + "four" + JF + "end" wanted = "[ [ one three three two ] four ]end" class RecTabStops_ChildTriggerContainsParentTextObjects(_VimTest): - # https://bugs.launchpad.net/ultisnips/+bug/1191617 + # https://bugs.launchpad.net/bugs/1191617 snippets_test_file = ("all", r""" global !p def complete(t, opts): @@ -2502,8 +2502,8 @@ longer text that should wrapend""" +# Tests for https://bugs.launchpad.net/bugs/719998 class FOTextAfter_ExceptCorrectResult(_FormatoptionsBase): - """Testcase for lp:719998""" snippets = ("test", "${1:longer expand}after\nstart$1end") keys = ("test" + EX + "This is a longer snippet that should wrap properly " "and the mirror below should work as well") @@ -2520,7 +2520,6 @@ the mirror below should work as wellend""" class FOWrapOnLongWord_ExceptCorrectResult(_FormatoptionsBase): - """Testcase for lp:719998""" snippets = ("test", "${1:longer expand}after\nstart$1end") keys = ("test" + EX + "This is a longersnippet that should wrap properly") wanted = \