From 2cfe8fb357f8ad7e99dc03b09e0ec5fa1c2c9029 Mon Sep 17 00:00:00 2001 From: Patrick Walton Date: Tue, 31 Jul 2012 16:32:37 -0700 Subject: rustc: Check self types in method lookup; allow required trait methods to have self types; write self types into metadata --- src/etc/vim/syntax/rust.vim | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/etc/vim') diff --git a/src/etc/vim/syntax/rust.vim b/src/etc/vim/syntax/rust.vim index 49e022b93f6..b9fae069708 100644 --- a/src/etc/vim/syntax/rust.vim +++ b/src/etc/vim/syntax/rust.vim @@ -23,7 +23,7 @@ syn keyword rustKeyword use while with syn keyword rustKeyword mod trait class struct enum type nextgroup=rustIdentifier skipwhite syn keyword rustKeyword fn nextgroup=rustFuncName skipwhite -syn match rustIdentifier "\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*" display contained +syn match rustIdentifier contains=rustIdentifierPrime "\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*" display contained syn match rustFuncName "\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*" display contained " Reserved words @@ -114,8 +114,11 @@ syn match rustFatArrowHead contained ">" conceal cchar=  syn match rustFatArrowTail contained "=" conceal cchar=⟹ syn match rustFatArrowFull "=>" contains=rustFatArrowHead,rustFatArrowTail -hi def link rustHexNumber rustNumber -hi def link rustBinNumber rustNumber +syn match rustIdentifierPrime /\<\@!_\(_*\>\)\@=/ conceal cchar=′ + +hi def link rustHexNumber rustNumber +hi def link rustBinNumber rustNumber +hi def link rustIdentifierPrime rustIdentifier hi def link rustString String hi def link rustCharacter Character -- cgit 1.4.1-3-g733a5