Support inline code spans inside emphasis

[davidsierradz]

I think conceal is broken when using backticks inside bold or italic sentences:

Input	Spec	Vimwiki rendering
**hello `world`**	hello world	**hello world**
*hello `world`*	hello world	*hello world*

init.vim:

let g:vimwiki_list = [
      \ {'path': '~/notes/',
      \ 'links_space_char': '-',
      \ 'syntax': 'markdown', 'ext': '.md'}]

let g:vimwiki_global_ext = 0

let g:vimwiki_folding = 'custom'

let g:vimwiki_auto_header = 1

nnoremap <F4> "=strftime("%Y-%m-%d_%H:%M:%S")<CR>P
inoremap <F4> <C-R>=strftime("%Y-%m-%d_%H:%M:%S")<CR>
iab <expr> dts strftime("%Y-%m-%d_%H:%M:%S")

autocmd FileType vimwiki setlocal fdm=marker fmr={{{,}}}

:VimwikiShowVersion

Branch: dev

Revision: cf8a16c

Date: 2019-05-11 14:01:45 -0600

[ranebrown]

See commonmark spec rule 17 and example 477.

[tinmarino]

Also the "inline" code must support multiple lines as example 635 and issue #847

[tinmarino]

I'm happy to announce that this has been fixed by the last referencing commit: 94a7885 in the dev branch

Commit Description

• It uses regions syntaxes instead of previous matches:
  

  vimwiki/autoload/vimwiki/u.vim

  Lines 244 to 261 in 94a7885

  	function! vimwiki#u#hi_tag(tag_pre, tag_post, syntax_group, contains, ...) abort
  	let opt_is_contained = a:0 > 0 && a:1 > 0 ? 'contained ' : ''
  	let opt_more = a:0 > 1 ? ' ' . a:2 : ''
  	let opt_contains = ''
  	if a:contains !=# ''
  	let opt_contains = 'contains=' . a:contains . ' '
  	endif
  	let cmd = 'syn region ' . a:syntax_group . ' matchgroup=VimwikiDelimiter ' .
  	\ opt_is_contained .
  	\ 'start="' . a:tag_pre . '" ' .
  	\ 'end="' . a:tag_post . '" ' .
  	\ 'keepend ' .
  	\ opt_contains .
  	\ b:vimwiki_syntax_concealends .
  	\ opt_more
  	"echom cmd
  	exe cmd
  	endfunction

• The magic of the nesting is from these lines:

  vimwiki/autoload/vimwiki/u.vim

  Lines 279 to 283 in 94a7885

  	" Declare nesting capabilities
  	" -- to be embeded in standard: bold, italic, underline
  	let nested = 'VimwikiCode,VimwikiEqIn,VimwikiDelText,VimwikiSuperScript,VimwikiSubScript'
  	" -- to be embeded in exetended (the one above)
  	let nested .= ',VimwikiBold,VimwikiItalic,VimwikiUmderline'

• It includes extended tests:

  vimwiki/test/syntax.vader

  Lines 27 to 42 in 94a7885

  	Given vimwiki (Extended Types nested in basic):
  	From __bold `code in bold ` end of bold__ morF
  	From _it and ~~ strieout in i~~ end of it_ morF
  	From __bold $ equation $ end bold __
  	**bold ^superscript ^ end of bold morF**
  	From normal ,, subscript ,, still normal morF
  	Execute (Set syntax markdown):
  	call SetSyntax('markdown')
  	Execute (Assert Syntax extended types mono):
  	AssertEqual 'VimwikiCode' , SyntaxAt(1, 23)
  	AssertEqual 'VimwikiDelText' , SyntaxAt(2, 23)
  	AssertEqual 'VimwikiEqIn' , SyntaxAt(3, 23)
  	AssertEqual 'VimwikiSuperScript' , SyntaxAt(4, 23)
  	AssertEqual 'VimwikiSubScript' , SyntaxAt(5, 23)

Screenshot

So at the end it looks like this (conceal=3, conceal=0)

Get strikethrough working (gnome-terminal, tmux)

To get the new strikethrough font, you need vim >= 8.1 and a terminfo well configured and not disconfigured by tmux or screen

Bashrc

if command -v tmux &> /dev/null && [ -n "$PS1" ] \
    && [[ ! "$TERM" =~ screen ]]  && [[ ! "$TERM" =~ "screen-256color" ]] \
    && [[ ! "$TERM" =~ tmux ]] && [[ ! "$TERM" =~ "tmux-256color" ]] \
    && [ -z "$TMUX" ]; then
  exec env TERM=tmux-256color tmux
fi

TmuxRc

# get strikethought
set -as terminal-overrides ',*:smxx=\E[9m'
set -g default-terminal "tmux-256color"

Thanks for the issue with such a nice array.