Mercurial > vim
annotate runtime/ftplugin/eruby.vim @ 33716:bd3ee5abdd7a
runtime(dist): centralize safe executable check and add vim library (#13413)
Commit: https://github.com/vim/vim/commit/cd8a3eaf5348feacfecab4b374b7ea4ce6a97422
Author: D. Ben Knoble <ben.knoble+github@gmail.com>
Date: Sat Nov 4 05:11:17 2023 -0400
runtime(dist): centralize safe executable check and add vim library (https://github.com/vim/vim/issues/13413)
Follow up to 816fbcc26 (patch 9.0.1833: [security] runtime file fixes,
2023-08-31) and f7ac0ef50 (runtime: don't execute external commands when
loading ftplugins, 2023-09-06).
This puts the logic for safe executable checks in a single place, by introducing
a central vim library, so all filetypes benefit from consistency.
Notable changes:
- dist#vim because the (autoload) namespace for a new runtime support
library. Supporting functions should get documentation. It might make
life easier for NeoVim devs to make the documentation a new file
rather than cram it into existing files, though we may want
cross-references to it somewhere?
- The gzip and zip plugins need to be opted into by enabling execution
of those programs (or the global plugin_exec). This needs
documentation or discussion.
- This fixes a bug in the zig plugin: code setting s:tmp_cwd was removed
in f7ac0ef50 (runtime: don't execute external commands when loading
ftplugins, 2023-09-06), but the variable was still referenced. Since
the new function takes care of that automatically, the variable is no
longer needed.
Signed-off-by: D. Ben Knoble <ben.knoble+github@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sat, 04 Nov 2023 10:15:06 +0100 |
| parents | d3d82d3f6006 |
| children | 8ae680be2a51 |
| rev | line source |
|---|---|
| 529 | 1 " Vim filetype plugin |
| 831 | 2 " Language: eRuby |
| 2225 | 3 " Maintainer: Tim Pope <vimNOSPAM@tpope.org> |
| 4869 | 4 " URL: https://github.com/vim-ruby/vim-ruby |
| 831 | 5 " Release Coordinator: Doug Kearns <dougkearns@gmail.com> |
|
33098
d3d82d3f6006
runtime(ruby): Update syntax, indent and ftplugin files
Christian Brabandt <cb@256bit.org>
parents:
25056
diff
changeset
|
6 " Last Change: 2022 May 15 |
| 529 | 7 |
| 8 " Only do this when not done yet for this buffer | |
| 1205 | 9 if exists("b:did_ftplugin") |
| 529 | 10 finish |
| 11 endif | |
| 12 | |
| 13 let s:save_cpo = &cpo | |
| 14 set cpo-=C | |
| 15 | |
| 16 " Define some defaults in case the included ftplugins don't set them. | |
| 17 let s:undo_ftplugin = "" | |
| 1205 | 18 let s:browsefilter = "All Files (*.*)\t*.*\n" |
| 529 | 19 let s:match_words = "" |
| 20 | |
| 1205 | 21 if !exists("g:eruby_default_subtype") |
| 22 let g:eruby_default_subtype = "html" | |
| 23 endif | |
| 24 | |
| 4869 | 25 if &filetype =~ '^eruby\.' |
| 26 let b:eruby_subtype = matchstr(&filetype,'^eruby\.\zs\w\+') | |
| 27 elseif !exists("b:eruby_subtype") | |
| 1205 | 28 let s:lines = getline(1)."\n".getline(2)."\n".getline(3)."\n".getline(4)."\n".getline(5)."\n".getline("$") |
| 29 let b:eruby_subtype = matchstr(s:lines,'eruby_subtype=\zs\w\+') | |
| 30 if b:eruby_subtype == '' | |
| 15512 | 31 let b:eruby_subtype = matchstr(substitute(expand("%:t"),'\c\%(\.erb\|\.eruby\|\.erubis\|\.example\)\+$','',''),'\.\zs\w\+\%(\ze+\w\+\)\=$') |
| 1205 | 32 endif |
| 33 if b:eruby_subtype == 'rhtml' | |
| 34 let b:eruby_subtype = 'html' | |
| 35 elseif b:eruby_subtype == 'rb' | |
| 36 let b:eruby_subtype = 'ruby' | |
| 37 elseif b:eruby_subtype == 'yml' | |
| 38 let b:eruby_subtype = 'yaml' | |
| 39 elseif b:eruby_subtype == 'js' | |
| 40 let b:eruby_subtype = 'javascript' | |
| 41 elseif b:eruby_subtype == 'txt' | |
| 42 " Conventional; not a real file type | |
| 43 let b:eruby_subtype = 'text' | |
| 44 elseif b:eruby_subtype == '' | |
| 45 let b:eruby_subtype = g:eruby_default_subtype | |
| 46 endif | |
| 47 endif | |
| 48 | |
| 15512 | 49 if exists("b:eruby_subtype") && b:eruby_subtype != '' && b:eruby_subtype !=? 'eruby' |
| 1205 | 50 exe "runtime! ftplugin/".b:eruby_subtype.".vim ftplugin/".b:eruby_subtype."_*.vim ftplugin/".b:eruby_subtype."/*.vim" |
| 51 else | |
| 52 runtime! ftplugin/html.vim ftplugin/html_*.vim ftplugin/html/*.vim | |
| 53 endif | |
| 54 unlet! b:did_ftplugin | |
| 529 | 55 |
| 56 " Override our defaults if these were set by an included ftplugin. | |
| 57 if exists("b:undo_ftplugin") | |
| 1205 | 58 let s:undo_ftplugin = b:undo_ftplugin |
| 59 unlet b:undo_ftplugin | |
| 529 | 60 endif |
| 61 if exists("b:browsefilter") | |
| 1205 | 62 let s:browsefilter = b:browsefilter |
| 63 unlet b:browsefilter | |
| 529 | 64 endif |
| 65 if exists("b:match_words") | |
| 1205 | 66 let s:match_words = b:match_words |
| 67 unlet b:match_words | |
| 529 | 68 endif |
| 69 | |
| 15512 | 70 let s:cfilemap = v:version >= 704 ? maparg('<Plug><cfile>', 'c', 0, 1) : {} |
| 71 if !get(s:cfilemap, 'buffer') || !s:cfilemap.expr || s:cfilemap.rhs =~# 'ErubyAtCursor()' | |
| 72 let s:cfilemap = {} | |
| 73 endif | |
| 74 if !has_key(s:cfilemap, 'rhs') | |
| 75 let s:cfilemap.rhs = "substitute(&l:inex =~# '\\<v:fname\\>' && len(expand('<cfile>')) ? eval(substitute(&l:inex, '\\<v:fname\\>', '\\=string(expand(\"<cfile>\"))', 'g')) : '', '^$', \"\\022\\006\",'')" | |
| 76 endif | |
| 77 let s:ctagmap = v:version >= 704 ? maparg('<Plug><ctag>', 'c', 0, 1) : {} | |
| 78 if !get(s:ctagmap, 'buffer') || !s:ctagmap.expr || s:ctagmap.rhs =~# 'ErubyAtCursor()' | |
| 79 let s:ctagmap = {} | |
| 80 endif | |
| 81 let s:include = &l:include | |
| 82 let s:path = &l:path | |
| 83 let s:suffixesadd = &l:suffixesadd | |
| 84 | |
| 529 | 85 runtime! ftplugin/ruby.vim ftplugin/ruby_*.vim ftplugin/ruby/*.vim |
| 86 let b:did_ftplugin = 1 | |
| 87 | |
| 88 " Combine the new set of values with those previously included. | |
|
33098
d3d82d3f6006
runtime(ruby): Update syntax, indent and ftplugin files
Christian Brabandt <cb@256bit.org>
parents:
25056
diff
changeset
|
89 if !exists('b:undo_ftplugin') |
|
d3d82d3f6006
runtime(ruby): Update syntax, indent and ftplugin files
Christian Brabandt <cb@256bit.org>
parents:
25056
diff
changeset
|
90 " No-op |
|
d3d82d3f6006
runtime(ruby): Update syntax, indent and ftplugin files
Christian Brabandt <cb@256bit.org>
parents:
25056
diff
changeset
|
91 let b:undo_ftplugin = 'exe' |
|
d3d82d3f6006
runtime(ruby): Update syntax, indent and ftplugin files
Christian Brabandt <cb@256bit.org>
parents:
25056
diff
changeset
|
92 endif |
|
d3d82d3f6006
runtime(ruby): Update syntax, indent and ftplugin files
Christian Brabandt <cb@256bit.org>
parents:
25056
diff
changeset
|
93 if !empty(s:undo_ftplugin) |
|
d3d82d3f6006
runtime(ruby): Update syntax, indent and ftplugin files
Christian Brabandt <cb@256bit.org>
parents:
25056
diff
changeset
|
94 let b:undo_ftplugin .= '|' . s:undo_ftplugin |
| 529 | 95 endif |
| 96 if exists ("b:browsefilter") | |
| 1205 | 97 let s:browsefilter = substitute(b:browsefilter,'\cAll Files (\*\.\*)\t\*\.\*\n','','') . s:browsefilter |
| 529 | 98 endif |
| 99 if exists("b:match_words") | |
| 1205 | 100 let s:match_words = b:match_words . ',' . s:match_words |
| 529 | 101 endif |
| 102 | |
| 15512 | 103 if len(s:include) |
| 104 let &l:include = s:include | |
| 105 endif | |
| 106 let &l:path = s:path . (s:path =~# ',$\|^$' ? '' : ',') . &l:path | |
| 107 let &l:suffixesadd = s:suffixesadd . (s:suffixesadd =~# ',$\|^$' ? '' : ',') . &l:suffixesadd | |
| 108 exe 'cmap <buffer><script><expr> <Plug><cfile> ErubyAtCursor() ? ' . maparg('<Plug><cfile>', 'c') . ' : ' . s:cfilemap.rhs | |
| 109 exe 'cmap <buffer><script><expr> <Plug><ctag> ErubyAtCursor() ? ' . maparg('<Plug><ctag>', 'c') . ' : ' . get(s:ctagmap, 'rhs', '"\022\027"') | |
| 110 unlet s:cfilemap s:ctagmap s:include s:path s:suffixesadd | |
| 111 | |
| 529 | 112 " Change the browse dialog on Win32 to show mainly eRuby-related files |
| 113 if has("gui_win32") | |
| 1205 | 114 let b:browsefilter="eRuby Files (*.erb, *.rhtml)\t*.erb;*.rhtml\n" . s:browsefilter |
| 529 | 115 endif |
| 116 | |
| 117 " Load the combined list of match_words for matchit.vim | |
| 118 if exists("loaded_matchit") | |
| 1205 | 119 let b:match_words = s:match_words |
| 529 | 120 endif |
| 121 | |
| 122 " TODO: comments= | |
| 123 setlocal commentstring=<%#%s%> | |
| 124 | |
| 25056 | 125 let b:undo_ftplugin = "setl cms< " . |
|
33098
d3d82d3f6006
runtime(ruby): Update syntax, indent and ftplugin files
Christian Brabandt <cb@256bit.org>
parents:
25056
diff
changeset
|
126 \ " | unlet! b:browsefilter b:match_words | " . b:undo_ftplugin |
| 529 | 127 |
| 128 let &cpo = s:save_cpo | |
|
3410
94601b379f38
Updated runtime files. Add Dutch translations.
Bram Moolenaar <bram@vim.org>
parents:
2225
diff
changeset
|
129 unlet s:save_cpo |
| 529 | 130 |
| 15512 | 131 function! ErubyAtCursor() abort |
| 132 let groups = map(['erubyBlock', 'erubyComment', 'erubyExpression', 'erubyOneLiner'], 'hlID(v:val)') | |
| 133 return !empty(filter(synstack(line('.'), col('.')), 'index(groups, v:val) >= 0')) | |
| 134 endfunction | |
| 135 | |
| 1620 | 136 " vim: nowrap sw=2 sts=2 ts=8: |