Mercurial > vim
diff runtime/syntax/r.vim @ 6051:0efec12f52ac
Updated runtime files.
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Thu, 10 Jul 2014 22:01:47 +0200 |
| parents | 2b11ac90d9e9 |
| children | 11d78e58a487 |
line wrap: on
line diff
--- a/runtime/syntax/r.vim +++ b/runtime/syntax/r.vim @@ -3,7 +3,7 @@ " Maintainer: Jakson Aquino <jalvesaq@gmail.com> " Former Maintainers: Vaidotas Zemlys <zemlys@gmail.com> " Tom Payne <tom@tompayne.org> -" Last Change: Sun May 19, 2013 05:59PM +" Last Change: Wed Jul 09, 2014 10:29PM " Filenames: *.R *.r *.Rhistory *.Rt " " NOTE: The highlighting of R functions is defined in the @@ -30,14 +30,16 @@ endif syn case match " Comment -syn match rComment contains=@Spell "#.*" +syn match rCommentTodo contained "\(BUG\|FIXME\|NOTE\|TODO\):" +syn match rComment contains=@Spell,rCommentTodo "#.*" " Roxygen syn match rOKeyword contained "@\(param\|return\|name\|rdname\|examples\|include\|docType\)" syn match rOKeyword contained "@\(S3method\|TODO\|aliases\|alias\|assignee\|author\|callGraphDepth\|callGraph\)" syn match rOKeyword contained "@\(callGraphPrimitives\|concept\|exportClass\|exportMethod\|exportPattern\|export\|formals\)" syn match rOKeyword contained "@\(format\|importClassesFrom\|importFrom\|importMethodsFrom\|import\|keywords\)" -syn match rOKeyword contained "@\(method\|nord\|note\|references\|seealso\|setClass\|slot\|source\|title\|usage\)" +syn match rOKeyword contained "@\(method\|noRd\|note\|references\|seealso\|setClass\|slot\|source\|title\|usage\)" +syn match rOKeyword contained "@\(family\|template\|templateVar\|description\|details\|inheritsParams\)" syn match rOComment contains=@Spell,rOKeyword "#'.*" @@ -119,7 +121,7 @@ if &filetype != "rmd" && &filetype != "r else syn match rOperator "[|!<>^~`/:]" endif -syn match rOperator "%\{2}\|%\S*%" +syn match rOperator "%\{2}\|%\S\{-}%" syn match rOpError '\*\{3}' syn match rOpError '//' syn match rOpError '&&&' @@ -164,8 +166,8 @@ syn match rLstElmt "@[a-zA-Z0-9\\._]*" c syn keyword rPreProc library require attach detach source if &filetype == "rhelp" - syn match rHelpIdent '\\method' - syn match rHelpIdent '\\S4method' + syn match rHelpIdent '\\method' + syn match rHelpIdent '\\S4method' endif " Type @@ -187,6 +189,7 @@ hi def link rArrow Statement hi def link rBoolean Boolean hi def link rBraceError Error hi def link rComment Comment +hi def link rCommentTodo Todo hi def link rOComment Comment hi def link rComplex Number hi def link rConditional Conditional