Commit Graph

1214 Commits

Author SHA1 Message Date
Stanislav Seletskiy
fc080b4fd5 add g:UltiSnipsEnableSnipMate 2014-12-18 12:05:52 +06:00
Holger Rapp
67630f4aea Merge pull request #414 from Pyrohh/master
Check if Neovim is being used when setting snippet directory.
2014-12-08 07:19:49 +01:00
Michael Reed
c050d68e5a Check if editor is Neovim when setting snippet_dir 2014-12-06 00:41:13 -05:00
Holger Rapp
b26f2c97b7 Merge pull request #413 from lencioni/documentation
Fix typo "endglobals" in documentation
2014-12-03 08:42:38 +01:00
Joe Lencioni
bbb07646a3 Fix typo "endglobals" in documentation
I was working on some snippets and looking at the documentation and
noticed a typo. "endglobals" should be "endglobal".
2014-12-02 09:39:50 -08:00
Holger Rapp
6907b2444c Merge pull request #410 from tho/master
Fix list of trigger functions in documentation
2014-12-01 21:59:22 +01:00
Tim Hofmann
185f96c4db Fix list of trigger functions in documentation 2014-11-30 16:20:18 -05:00
Holger Rapp
6dd476750b Merge pull request #406 from jszakmeister/dont-rely-on-cwd
Don't rely on having the tmux/screen cwd being in the project directory.
2014-11-25 07:34:56 +01:00
Holger Rapp
e3159ce0d1 Merge pull request #407 from jszakmeister/update-documentation
Update documentation.
2014-11-25 07:34:12 +01:00
Holger Rapp
d85f0b0c2e Merge pull request #408 from tinypenguin/master
Added a terminal emulator warning line for using c-tab combo.
2014-11-25 07:26:10 +01:00
ibabarovic
d9691a9125 Added a terminal emulator warning line for using c-tab combo with usnips 2014-11-24 17:32:10 +01:00
John Szakmeister
eb82c66916 Add some documentation on running the test suite. 2014-11-24 04:47:57 -05:00
John Szakmeister
1f3f1ce641 Don't rely on having the tmux/screen cwd being in the project directory.
Instead, let's just change the runtime path to include a pointer to the
top of the tree.
2014-11-24 04:45:37 -05:00
John Szakmeister
e502c9ba84 Fix a couple of typos. 2014-11-24 04:06:31 -05:00
Holger Rapp
9028abd95e Fixes for Unicode issues by jszakmeister. 2014-11-24 09:37:47 +01:00
John Szakmeister
8b2115ec26 Fix #171: UltiSnips crashes in new file with text containing 0x80 char
It turns out that vim.eval() will attempt to do Unicode conversion and
can fail when raw bytes are present in the unnamed register.  To avoid
this problem, let's not carry the value across the bridge, and instead
store the cached value in Vim directly.  This successfully sidesteps the
issue entirely, and provides the correct save and restore behavior.

This also adds a test case for the issue.  Since expansion can finish
(despite the errors), the test has to capture the error messages and
examine them for a failure.
2014-11-21 06:09:49 -05:00
John Szakmeister
f4df1bd9e8 Teach _vim_enc to handle UnicodeDecodeErrors.
It's possible that when using _vim_dec with Python 2 that we fail to
convert the string to Unicode and just return the raw string instead.
This could happen, for instance, when there was arbitrary data in the
unnamed register during the save/restore process.  During restoration,
we'd attempt to encode the string, but this may fail with a
UnicodeDecodeError as Python attempts to first convert to Unicode and
then to the requested encoding.

To fix this, let's also catch `UnicodeDecodeError` and return the raw
string if we fail to convert.
2014-11-21 06:09:18 -05:00
John Szakmeister
56aa817be0 Reset the unnamed register at the start of a test.
Any test that alters the unnamed register can cause subsequent tests to
fail if there is an issues saving and restoring the register.  Let's
make the test infrastructure more robust against this issue by resetting
the unnamed register to an empty string.
2014-11-15 04:30:52 -05:00
Holger Rapp
cb8536d724 Merge pull request #394 from michamos/master
Map <c-r> in select mode
2014-11-03 06:24:17 +01:00
Micha Moskovic
f179fcf99a Map <c-r> in select mode
This works exactly as in insert mode, only the " character over the next letter is not shown
2014-10-29 18:42:58 +01:00
Holger Rapp
1ad970379e Support for sw=0 in newer Vim versions. 2014-10-11 15:23:34 +02:00
Holger Rapp
4e72a5d081 Merge pull request #388 from blueyed/doc-ref-triggers
doc: add tags for trigger vars
2014-10-11 14:43:01 +02:00
Glenn Griffin
e3abd6678f Added test case for shiftwidth=0 and added myself to contributors list. 2014-10-08 10:30:40 -07:00
Daniel Hahler
14e5b4638b doc: add tags for trigger vars 2014-10-08 15:08:33 +02:00
Glenn Griffin
482650a009 Use shiftwidth() where available. This allows UltiSnips to work properly when
shiftwidth is zero. Per ":help shiftwidth":

shiftwidth()                                            shiftwidth()
                Returns the effective value of 'shiftwidth'. This is the
                'shiftwidth' value unless it is zero, in which case it is the
                'tabstop' value.  To be backwards compatible in indent
                plugins, use this:
                        if exists('*shiftwidth')
                          func s:sw()
                            return shiftwidth()
                          endfunc
                        else
                          func s:sw()
                            return &sw
                          endfunc
                        endif
                And then use s:sw() instead of &sw.
2014-10-07 17:24:55 -07:00
Holger Rapp
8aeb1a2e3d Merge pull request #377 from petobens/master
Don't escape backslashes in :UltiSnipsEdit
2014-09-15 06:24:33 +02:00
petobens
0775156de1 Don't escape backslashes in :UltiSnipsEdit 2014-09-13 20:15:59 -03:00
Holger Rapp
386b3a0976 Merge pull request #360 from tafryn/master
Add check to prevent errors when using vimpager.
2014-09-04 06:05:59 -07:00
tafryn
cae25e5330 Change indent level to 3(?!) spaces. 2014-09-03 07:58:13 -07:00
tafryn
9c632378a5 Add missing newline to ftdetect. 2014-09-02 07:32:06 -07:00
tafryn
f6e33387a2 Clean-up vimpager check. 2014-09-01 00:45:20 -07:00
Holger Rapp
c681560b42 Add 'context' value to g:UltiSnipsEditSplit. 2014-08-29 07:30:26 +02:00
Holger Rapp
c79cfd50f4 Merge pull request #370 from sakana/master
Fix UltiSnipsEdit for g:UltiSnipsSnippetsDir paths that include spaces
2014-08-29 07:21:15 +02:00
David Fisher
1129ca67d2 Fix UltiSnipsEdit for g:UltiSnipsSnippetsDir paths that include spaces 2014-08-28 16:43:36 -07:00
petobens
2c3c4a7776 Add 'context' value to g:UltiSnipsEditSplit 2014-08-28 09:34:33 -03:00
Holger Rapp
59defbdd53 Merge pull request #357 from kballard/tweak_ftplugin
Only runo the snippets ftplugin once and make it undo'able.
2014-08-28 08:16:56 +02:00
Kevin Ballard
a69764dff6 Tweak the ftplugin
Update the ftplugin to behave better. This means use b:did_ftplugin,
toggle cpo as appropriate, and define a b:undo_ftplugin.
2014-08-26 01:03:15 -07:00
Holger Rapp
1292b0faea Merge pull request #355 from kballard/fix_syntax_nested_tabstop
Fix highlighting of nested tab stops
2014-08-26 07:00:47 +02:00
tafryn
a8c9caae81 Add check to prevent errors when using vimpager. 2014-08-08 16:27:38 -07:00
Kevin Ballard
81f9173138 Fix highlighting of nested tab stops
Nested tab stops like `${1:head ${2} tail}` were not properly
highlighting the "tail" or the closing `}` of the outer tab stop.
2014-08-05 17:21:35 -07:00
Holger Rapp
279d6e63c9 Updates the doc for the new clearsnippets behavior. Slight rewording by me. 2014-08-02 14:59:42 +02:00
Holger Rapp
c3660128ac Implements clearsnippets by priority. 2014-08-02 14:55:27 +02:00
Holger Rapp
57ed954ccd Merge pull request #348 from cwahbong/select-cr-fix
Fix issue #341 (github).
2014-08-02 13:54:31 +02:00
cwahbong
0abfc3bece Some refinements.
1. Add docstrings.
2. Re-implement get_deep_extends().
3. Remove all inners.
2014-08-01 14:32:47 +08:00
cwahbong
63f65ea874 Add/modify test cases for priority-based clearsnippets. 2014-08-01 14:32:47 +08:00
cwahbong
4784a9e126 Refactor: snippet dictionary does not keep the extend info now. 2014-08-01 14:32:47 +08:00
cwahbong
20f3832ffa Code cleanup.
Full tested and does not break and old tests.
2014-08-01 14:32:47 +08:00
cwahbong
5c87806d7b Implement priority-based clearsnippets. 2014-08-01 14:32:47 +08:00
cwahbong
a9aa8c76a7 Update document for priority based clearsnippets. 2014-08-01 11:33:04 +08:00
cwahbong
a053433e48 Variable rename and illustration. 2014-07-31 21:03:10 +08:00