Fix fenced code block syntax when reopening a file

Fix #259

diff --git a/ftplugin/markdown.vim b/ftplugin/markdown.vim
index e189ec4fce262bfa439d1c5a2272f03ad5fd58f7..c7fba7fae6bdf275344714e9426a7ca5c3dd471d 100644 (file)
--- a/ftplugin/markdown.vim
+++ b/ftplugin/markdown.vim
@@ -706,9 +706,16 @@ function! s:MarkdownRefreshSyntax(force)
     endif
 endfunction
 
     endif
 endfunction
 

+function! s:MarkdownClearSyntaxVariables()
+    if &filetype == 'markdown'
+        unlet! b:mkd_included_filetypes
+    endif
+endfunction
+

 augroup Mkd
     autocmd!
     au BufWinEnter * call s:MarkdownRefreshSyntax(1)
 augroup Mkd
     autocmd!
     au BufWinEnter * call s:MarkdownRefreshSyntax(1)

+    au BufUnload * call s:MarkdownClearSyntaxVariables()

     au BufWritePost * call s:MarkdownRefreshSyntax(0)
     au InsertEnter,InsertLeave * call s:MarkdownRefreshSyntax(0)
     au CursorHold,CursorHoldI * call s:MarkdownRefreshSyntax(0)
     au BufWritePost * call s:MarkdownRefreshSyntax(0)
     au InsertEnter,InsertLeave * call s:MarkdownRefreshSyntax(0)
     au CursorHold,CursorHoldI * call s:MarkdownRefreshSyntax(0)

diff --git a/test/syntax.vader b/test/syntax.vader
index 98548a0562ceef7e26ad8aab09c2ff3d0f34149c..fda56e05c1d82a279696dbc7f2882367fef8be55 100644 (file)
--- a/test/syntax.vader
+++ b/test/syntax.vader
@@ -437,6 +437,22 @@ Execute (fenced code block languages setting):
   AssertEqual SyntaxOf('foo'), 'csString'
   unlet g:vim_markdown_fenced_languages
 
   AssertEqual SyntaxOf('foo'), 'csString'
   unlet g:vim_markdown_fenced_languages
 

+Given markdown;
+```vim
+let g:a = 1
+```
+
+Execute (fenced code block includes language syntax with reopening same buffer):
+  let b:func = Markdown_GetFunc('vim-markdown/ftplugin/markdown.vim', 'MarkdownRefreshSyntax')
+  call b:func(0)
+  split
+  quit
+  edit
+  set filetype=markdown
+  execute "normal! i```vim\<cr>let g:a = 1\<cr>```"
+  call b:func(1)
+  AssertEqual SyntaxOf('g:a'), 'vimVar'
+

 Given markdown;
 ```a+b-
 code
 Given markdown;
 ```a+b-
 code