about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2013-04-09 18:15:58 -0700
committerbors <bors@rust-lang.org>2013-04-09 18:15:58 -0700
commitec3cfaed8bb636538da3ddf32f9f86a078787b2a (patch)
treece49b29d65cba2494a2f3ae8d98e70017bb2e157 /src
parent92e265cdea0c528ccca4ccdd1e62d8bc3614b3d5 (diff)
parent7a1394d58f6f8b665f32895ae50e13a7747efefa (diff)
downloadrust-ec3cfaed8bb636538da3ddf32f9f86a078787b2a.tar.gz
rust-ec3cfaed8bb636538da3ddf32f9f86a078787b2a.zip
auto merge of #5807 : klutzy/rust/vim-inner-doc, r=brson
Follow-up of #5760:
Add syntax highlight for `/*! doc */` or `//! doc`.
Diffstat (limited to 'src')
-rw-r--r--src/etc/vim/syntax/rust.vim8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/etc/vim/syntax/rust.vim b/src/etc/vim/syntax/rust.vim
index 303cc0834e8..3e6c11c6238 100644
--- a/src/etc/vim/syntax/rust.vim
+++ b/src/etc/vim/syntax/rust.vim
@@ -110,11 +110,11 @@ syn match     rustFloat       display "\<[0-9][0-9_]*\.[0-9_]\+\%([eE][+-]\=[0-9
 syn match     rustLifetime    display "\'\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*"
 syn match   rustCharacter   "'\([^'\\]\|\\\(['nrt\\\"]\|x\x\{2}\|u\x\{4}\|U\x\{8}\)\)'"
 
-syn region    rustCommentDoc  start="/\*\*" end="\*/"
-syn region    rustCommentDoc  start="///" skip="\\$" end="$" keepend
+syn region    rustCommentDoc  start="/\*[\*!]" end="\*/"
+syn region    rustCommentDoc  start="//[/!]" skip="\\$" end="$" keepend
 syn match     rustComment     "/\*\*/"
-syn region    rustComment     start="/\*\([^\*]\|$\)" end="\*/" contains=rustTodo
-syn region    rustComment     start="//\([^/]\|$\)" skip="\\$" end="$" contains=rustTodo keepend
+syn region    rustComment     start="/\*\([^\*!]\|$\)" end="\*/" contains=rustTodo
+syn region    rustComment     start="//\([^/!]\|$\)" skip="\\$" end="$" contains=rustTodo keepend
 
 syn keyword rustTodo contained TODO FIXME XXX NB