y0rune/vimwiki
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Syntax: Emoji faster conceal with keyword

Browse Source
This commit is contained in:
Tinmarino 2020-08-09 21:22:04 -04:00
parent a1f1b9c290
commit a241d458ab
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
autoload/vimwiki/emoji.vim
View File

@ -1768,8 +1768,9 @@ endfunction
" Conceal " Conceal
function! vimwiki#emoji#apply_conceal() abort function! vimwiki#emoji#apply_conceal() abort
syn iskeyword 0-9,a-z,A-Z,:-:
for [name, emoji] in items(s:emoji_single) for [name, emoji] in items(s:emoji_single)
exe 'syn match VimwikiEmoji ":' . name . ':" conceal cchar=' . emoji exe 'syn keyword VimwikiEmoji :' . name . ': conceal cchar=' . emoji
endfor endfor
endfunction endfunction

4
doc/vimwiki.txt
View File

@ -3579,7 +3579,7 @@ The default is %%%s.
------------------------------------------------------------------------------ ------------------------------------------------------------------------------
*g:vimwiki_emoji_enable* *g:vimwiki_emoji_enable*
Bitfield: Enable/disable emoji conceal and complete (with |i_CTRL-X_CTRL-U|). Bitfield: Enable/disable emoji conceal and complete
Note that the |completefunc| is only set if it does not exists already to keep Note that the |completefunc| is only set if it does not exists already to keep
other plugin works by default. It can be set it manualy with: > other plugin works by default. It can be set it manualy with: >
set completefunc=vimwiki#emoji#complete set completefunc=vimwiki#emoji#complete
@ -3592,7 +3592,7 @@ Emoji features hard copied from https://github.com/junegunn/vim-emoji
Value Description~ Value Description~
0 Disable emoji support 0 Disable emoji support
1 Enable emoji conceal 1 Enable emoji conceal
2 Enable emoji complete 2 Enable emoji complete (with |i_CTRL-X_CTRL-U|)
3 Enable both 3 Enable both
Default: 3 Default: 3

13
syntax/vimwiki.vim
View File

@ -347,12 +347,6 @@ let s:typeface_dic = vimwiki#vars#get_syntaxlocal('dTypeface')
call vimwiki#u#hi_typeface(s:typeface_dic) call vimwiki#u#hi_typeface(s:typeface_dic)
" Emoji: :dog: (after tags to take precedence)
if and(vimwiki#vars#get_global('emoji_enable'), 1) != 0 && has('conceal')
call vimwiki#emoji#apply_conceal()
endif
" Link highlighting groups " Link highlighting groups
"""""""""""""""""""""""""" """"""""""""""""""""""""""
@ -513,4 +507,11 @@ for u in syntax_dic.dTypeface.eq
\ . ' keepend oneline '. b:vimwiki_syntax_concealends \ . ' keepend oneline '. b:vimwiki_syntax_concealends
endfor endfor
" Emoji: :dog: (after tags to take precedence, after nested to not be reset)
if and(vimwiki#vars#get_global('emoji_enable'), 1) != 0 && has('conceal')
call vimwiki#emoji#apply_conceal()
exe 'syn iskeyword '.&iskeyword.',-,:'
endif
syntax spell toplevel syntax spell toplevel