Commit Graph

1128 Commits

Author SHA1 Message Date
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
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
cwahbong
97bad9906a Add test case for #341 (github). 2014-07-31 20:58:43 +08:00
Holger Rapp
f6ce0f92d0 Merge pull request #349 from m42e/master
Ignore Errors E403 from Included Syntax Files
2014-07-30 19:20:02 +02:00
Matthias Bilger
79705c3fcc Ignore Errors E403 from included syntax files
This will silently discard Errors raised by syntax files that
are not designed to be included more than once.
2014-07-30 13:34:15 +02:00
cwahbong
e05788cece Fix issue #341 (github). 2014-07-29 13:02:26 +08:00
Holger Rapp
4dcfca755b Test refactorings. 2014-07-24 08:18:12 +02:00
cwahbong
1cf3b928fe Refactor: split test.py into several smaller files. 2014-07-23 17:22:11 +08:00
Holger Rapp
9521b942b0 Merge pull request #340 from cwahbong/test-fix
Never rely on waiting for Vim to finish something, instead make it write a file.
2014-07-23 06:55:17 +02:00
cwahbong
0872600b9e Ahbong is contributer now. 2014-07-22 15:28:02 +08:00
cwahbong
0dc6a8e4a4 Now test.py check the version or tmux.
Version 1.8 also works.
2014-07-22 15:26:18 +08:00
cwahbong
b11d5496a7 Add docstrings for TempFileManager. 2014-07-22 15:22:07 +08:00
cwahbong
15a0a17af0 Fix tmux interface. 2014-07-21 15:13:47 +08:00
Holger Rapp
e97d52c68c Merge pull request #342 from chivalry/master
Correct spelling error.
2014-07-20 20:30:01 +02:00
Charles Ross
2d8ae2fcd9 Correct misspelling 2014-07-20 09:05:30 -07:00
cwahbong
3002b68521 Solves waiting problem in an elegant way.
1. The keys after launching vim will wait until the vim is full loaded.
2. The keys after leaving vim will wait until the vim process is dead.
3. A bunch of cleanups.
2014-07-18 10:30:43 +08:00
cwahbong
cc4dc37038 Code cleanup for test.py. 2014-07-18 02:14:03 +08:00
cwahbong
9a98039d2b Fix test.py.
It may detect the need-screen-escape incorrectly or not invoke the vim
subprocess in the first test case.  These could be fixed by adding a
short sleep.
2014-07-17 18:43:44 +08:00
Holger Rapp
ccf79ba823 Merge pull request #331 from kballard/tagbar_snippets
Support TagBar for snippets files
2014-07-06 10:37:56 +02:00
Kevin Ballard
dee8265206 Support TagBar for snippets files
Bundle an exuberant ctags definition for UltiSnips and tell TagBar how
to find it.
2014-07-05 19:36:38 -07:00
Holger Rapp
d1f6f7ed81 Better syntax file. 2014-07-02 07:27:29 +02:00
Kevin Ballard
b10b62ae6d Twiddle indentation settings
We just want autoindent, no need for smartindent/etc that may be set by
the user's vimrc.
2014-06-30 21:17:52 -07:00
Kevin Ballard
67c7422ae2 Set up basic highlighting for snipmate files
Try to detect a snipmate-formatted file by looking at the directory name
and searching for endsnippet. If we think it's a snipmate file, switch
over to an alternative syntax highlighting variant.
2014-06-30 21:14:55 -07:00
Kevin Ballard
40145103b6 Stop embedding python/viml/sh if the `` includes {
In order to handle brace balancing properly, we need our own region to
match the {/} pairs, which unfortunately means that if a { occurs in a
command substitution, we have to disable the embedded language
highlighting.
2014-06-30 20:10:42 -07:00
Kevin Ballard
010e2c4fac Remove the coloring for python commands
Python commands tend to be longer than normal commands, and they already
include embedded python syntax coloring, so coloring them red like shell
commands is a bit overwhelming.

Preferably there would be some subtle background color we could apply,
but I don't see any pre-existing group name for that, and defining our
own would not play well with colorschemes.
2014-06-30 19:29:00 -07:00
Kevin Ballard
ebd62751e7 Tweak snippet/global highlighting to always highlight the end
The snippet/global regions were always ending correctly, but an unclosed
contained region could cause the wrong highlighting to apply to the
endsnippet/endglobal. Tweak the definitions such that the snippet/global
regions actually end at the start of the line and the footer occurs
outside the region.
2014-06-30 19:26:28 -07:00
Kevin Ballard
30ecd1d1b0 Rewrite parsing for tab stops 2014-06-30 19:22:32 -07:00
Kevin Ballard
5fa39faa92 fixup! Clean up miscellaneous syntax items 2014-06-30 18:38:50 -07:00
Kevin Ballard
4b73864b74 Fix the docstring for ShellCodeToken
It's not vim-syntax-related, but it was bugging me.
2014-06-30 15:56:32 -07:00
Kevin Ballard
0dba6503e1 Clean up miscellaneous syntax items
Remove a few obsolete items.

Remove the snipTabsOnly item. A tab-only line is not necessarily an
error.

Color leading spaces with a red background, because the default Error
coloring doesn't affect the display of spaces.
2014-06-30 15:41:35 -07:00
Kevin Ballard
acc79747c9 Syntax highlight the snippet trigger properly
This supports multiword triggers, docstrings, options, and even
highlights invalid multiword triggers as errors.
2014-06-30 15:29:48 -07:00
Kevin Ballard
5760eb4033 Fix empty snippets/globals 2014-06-30 00:01:28 -07:00
Kevin Ballard
d239402b7f Rewrite syntax matching for global
The body of a global now only has Python syntax coloring if the trigger
is !p. This matches the actual behavior of UltiSnips. AFAIK right now
globals with other triggers are useless, but this opens the door to
proper syntax coloring for those if they ever gain a use.
2014-06-29 23:45:04 -07:00
Kevin Ballard
cb2905c178 Rewrite syntax matching for snippet 2014-06-29 23:33:36 -07:00
Kevin Ballard
5937cea081 Mark up syntax items with 'display' as appropriate 2014-06-29 23:22:53 -07:00
Kevin Ballard
b82759b250 Rewrite extends/priority/clearsnippets 2014-06-29 23:11:11 -07:00
Kevin Ballard
672117c478 Add hierarchy to syntax file
Redo comments with fold markers to provide an appropriate hierarchy to
the syntax file itself.
2014-06-29 23:04:37 -07:00
Kevin Ballard
739e3d94ad Fix coloring of shell/VimL/Python command substitutions
Include the sh syntax for shell commands.
Make the matching on !v/!p work more accurately.
Highlight the !v/!p separately from the embedded Python/VimL.

AFAIK the only issue now is that "\`" escapes inside shell/VimL/Python
are not treated as bare "`" characters by the embedded syntax, but I
don't believe there's any way to fix that.
2014-06-29 20:47:22 -07:00