Skip to content

Commit 6e5d2ef

Browse files
committed
Make version 1 of the snippet parser the default
It's been 3 years. It's time. Closes #278.
1 parent 82cb9de commit 6e5d2ef

File tree

3 files changed

+3
-7
lines changed

3 files changed

+3
-7
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ Originally authored by [Michael Sanders][msanders], SnipMate was forked in 2011
1414
after a stagnation in development. This fork is currently maintained by [Rok
1515
Garbas][garbas], [Marc Weber][marcweber], and [Adnan Zafar][ajzafar].
1616

17-
1817
## Installing SnipMate ##
1918

2019
SnipMate can be installed using a package manager or using Vim's built-in
@@ -117,6 +116,7 @@ found at [Contributors.md](Contributors.md).
117116

118117
- Make tlib an optional dependency.
119118
- Add SnipLookupPre and SnipLookupPost autocommand events
119+
- Make version 1 of the snippet parser the default with no message
120120

121121
### 0.90 - 2023-12-29 ###
122122

autoload/snipMate.vim

+2-2
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ fun! snipMate#ReadSnippetsFile(file) abort
212212
if !filereadable(a:file) | return [result, new_scopes] | endif
213213
let inSnip = 0
214214
let line_no = 0
215-
let snipversion = get(g:snipMate, 'snippet_version', 0)
215+
let snipversion = get(g:snipMate, 'snippet_version', 1)
216216
for line in readfile(a:file) + ["\n"]
217217
let line_no += 1
218218

@@ -309,7 +309,7 @@ function! s:source_snippet() abort
309309
let new_snips = []
310310
if fnamemodify(file, ':e') == 'snippet'
311311
call add(new_snips, [trigger, desc, join(readfile(file), "\n"), 0,
312-
\ get(g:snipMate, 'snippet_version', 0)])
312+
\ get(g:snipMate, 'snippet_version', 1)])
313313
else
314314
let [snippets, extends] = s:CachedSnips(file)
315315
let new_snips = deepcopy(snippets)

plugin/snipMate.vim

-4
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,6 @@ endif
5757
let g:snipMate['no_match_completion_feedkeys_chars'] =
5858
\ get(g:snipMate, 'no_match_completion_feedkeys_chars', "\t")
5959

60-
if !exists('g:snipMate.snippet_version')
61-
echom 'The legacy SnipMate parser is deprecated. Please see :h SnipMate-deprecate.'
62-
endif
63-
6460
" Add default scope aliases, without overriding user settings
6561
let g:snipMate.scope_aliases = get(g:snipMate, 'scope_aliases', {})
6662
if exists('g:snipMate_no_default_aliases')

0 commit comments

Comments
 (0)