diff options
Diffstat (limited to 'runtime/ftplugin/rmd.vim')
| -rw-r--r-- | runtime/ftplugin/rmd.vim | 29 |
1 files changed, 23 insertions, 6 deletions
diff --git a/runtime/ftplugin/rmd.vim b/runtime/ftplugin/rmd.vim index 2ee72ffc6c..a407c236dd 100644 --- a/runtime/ftplugin/rmd.vim +++ b/runtime/ftplugin/rmd.vim @@ -2,7 +2,7 @@ " Language: R Markdown file " Maintainer: Jakson Alves de Aquino <jalvesaq@gmail.com> " Homepage: https://github.com/jalvesaq/R-Vim-runtime -" Last Change: Sat Aug 15, 2020 12:03PM +" Last Change: Mon May 29, 2023 06:31AM " Original work by Alex Zvoleff (adjusted from R help for rmd by Michel Kuhlmann) " Only do this when not yet done for this buffer @@ -23,7 +23,7 @@ setlocal iskeyword=@,48-57,_,. let s:cpo_save = &cpo set cpo&vim -function! FormatRmd() +function FormatRmd() if search("^[ \t]*```[ ]*{r", "bncW") > search("^[ \t]*```$", "bncW") setlocal comments=:#',:###,:##,:# else @@ -32,13 +32,30 @@ function! FormatRmd() return 1 endfunction -" If you do not want 'comments' dynamically defined, put in your vimrc: -" let g:rmd_dynamic_comments = 0 +let s:last_line = 0 +function SetRmdCommentStr() + if line('.') == s:last_line + return + endif + let s:last_line = line('.') + + if (search("^[ \t]*```[ ]*{r", "bncW") > search("^[ \t]*```$", "bncW")) || ((search('^---$', 'Wn') || search('^\.\.\.$', 'Wn')) && search('^---$', 'bnW')) + set commentstring=#\ %s + else + set commentstring=<!--\ %s\ --> + endif +endfunction + +" If you do not want both 'comments' and 'commentstring' dynamically defined, +" put in your vimrc: let g:rmd_dynamic_comments = 0 if !exists("g:rmd_dynamic_comments") || (exists("g:rmd_dynamic_comments") && g:rmd_dynamic_comments == 1) setlocal formatexpr=FormatRmd() + augroup RmdCStr + autocmd! + autocmd CursorMoved <buffer> call SetRmdCommentStr() + augroup END endif - " Enables pandoc if it is installed unlet! b:did_ftplugin runtime ftplugin/pandoc.vim @@ -47,7 +64,7 @@ runtime ftplugin/pandoc.vim let b:did_ftplugin = 1 if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter") - let b:browsefilter = "R Source Files (*.R *.Rnw *.Rd *.Rmd *.Rrst)\t*.R;*.Rnw;*.Rd;*.Rmd;*.Rrst\n" . + let b:browsefilter = "R Source Files (*.R *.Rnw *.Rd *.Rmd *.Rrst *.qmd)\t*.R;*.Rnw;*.Rd;*.Rmd;*.Rrst;*.qmd\n" . \ "All Files (*.*)\t*.*\n" endif |