about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorChris Morgan <me@chrismorgan.info>2014-10-14 11:44:34 +1100
committerChris Morgan <me@chrismorgan.info>2014-10-14 11:44:34 +1100
commitadd8a85905e5b352145c8dc26ee7d4f166bfa905 (patch)
tree3a17aaec8d87ccba1901d61b2c55a576bb1203d1 /src
parent36d0346dff9eae54e81f3a5a8417bc1b9c897e78 (diff)
downloadrust-add8a85905e5b352145c8dc26ee7d4f166bfa905.tar.gz
rust-add8a85905e5b352145c8dc26ee7d4f166bfa905.zip
Vim: Stop highlighting foo in `use foo;` specially
This wasn’t really consistent with other things; the last section of the
import was not highlighted in any other case.

Also `use {foo, bar};` was having the foo and bar not highlighted, where
they would have been as separate statements.
Diffstat (limited to 'src')
-rw-r--r--src/etc/vim/syntax/rust.vim5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/etc/vim/syntax/rust.vim b/src/etc/vim/syntax/rust.vim
index 407742b9c34..2d0e6c46e5e 100644
--- a/src/etc/vim/syntax/rust.vim
+++ b/src/etc/vim/syntax/rust.vim
@@ -27,7 +27,7 @@ syn keyword   rustKeyword     for in if impl let
 syn keyword   rustKeyword     loop once proc pub
 syn keyword   rustKeyword     return super
 syn keyword   rustKeyword     unsafe virtual where while
-syn keyword   rustKeyword     use nextgroup=rustModPath,rustModPathInUse skipwhite skipempty
+syn keyword   rustKeyword     use nextgroup=rustModPath skipwhite skipempty
 " FIXME: Scoped impl's name is also fallen in this category
 syn keyword   rustKeyword     mod trait struct enum type nextgroup=rustIdentifier skipwhite skipempty
 syn keyword   rustStorage     mut ref static const
@@ -131,9 +131,7 @@ syn keyword   rustBoolean     true false
 " If foo::bar changes to foo.bar, change this ("::" to "\.").
 " If foo::bar changes to Foo::bar, change this (first "\w" to "\u").
 syn match     rustModPath     "\w\(\w\)*::[^<]"he=e-3,me=e-3
-syn match     rustModPathInUse "\w\(\w\)*" contained " only for 'use path;'
 syn match     rustModPathSep  "::"
-" rustModPathInUse is split out from rustModPath so that :syn-include can get the group list right.
 
 syn match     rustFuncCall    "\w\(\w\)*("he=e-1,me=e-1
 syn match     rustFuncCall    "\w\(\w\)*::<"he=e-3,me=e-3 " foo::<T>();
@@ -252,7 +250,6 @@ hi def link rustReservedKeyword Error
 hi def link rustConditional   Conditional
 hi def link rustIdentifier    Identifier
 hi def link rustCapsIdent     rustIdentifier
-hi def link rustModPathInUse  rustModPath
 hi def link rustModPath       Include
 hi def link rustModPathSep    Delimiter
 hi def link rustFunction      Function