bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

vim - fix indent rules, hilight format strings, some keywords

Browse source
This commit is contained in:
Ben Blum 2012-08-23 18:55:49 -04:00
parent 5ccf8175a8
commit f7f909a8cf
2 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/etc/vim/indent/rust.vim
View file

@ -5,6 +5,4 @@ if exists("b:did_indent")
endif endif
let b:did_indent = 1 let b:did_indent = 1
setlocal cindent setlocal smartindent
setlocal cinkeys-=0#
setlocal cino=j1,J1

16
src/etc/vim/syntax/rust.vim
View file

@ -10,14 +10,13 @@ elseif exists("b:current_syntax")
finish finish
endif endif
syn keyword rustAssert assert syn match rustAssert "\<assert\(\w\)*"
syn match rustAssert "assert\(\w\)*" syn keyword rustKeyword again as break
syn keyword rustKeyword alt again as break syn keyword rustKeyword const copy do drop else export extern fail
syn keyword rustKeyword check claim const copy do drop else export extern fail
syn keyword rustKeyword for if impl import in let log syn keyword rustKeyword for if impl import in let log
syn keyword rustKeyword loop match mod module move mut new of owned priv pub pure syn keyword rustKeyword loop match mod module move mut new of owned priv pub pure
syn keyword rustKeyword ref ret return static to unchecked syn keyword rustKeyword ref return static to unchecked
syn match rustKeyword "unsafe" " Allows also matching unsafe::foo() syn match rustKeyword "\<unsafe\>" " Allows also matching unsafe::foo()
syn keyword rustKeyword use while with syn keyword rustKeyword use while with
" FIXME: Scoped impl's name is also fallen in this category " FIXME: Scoped impl's name is also fallen in this category
syn keyword rustKeyword mod trait class struct enum type nextgroup=rustIdentifier skipwhite syn keyword rustKeyword mod trait class struct enum type nextgroup=rustIdentifier skipwhite
@ -73,7 +72,9 @@ syn match rustFuncCall "\w\(\w\)*::<"he=e-3,me=e-3 contains=rustAssert "
syn match rustMacro '\w\(\w\)*!' syn match rustMacro '\w\(\w\)*!'
syn match rustMacro '#\w\(\w\)*' syn match rustMacro '#\w\(\w\)*'
syn region rustString start=+L\="+ skip=+\\\\\|\\"+ end=+"+ contains=rustTodo syn match rustFormat display "%\(\d\+\$\)\=[-+' #0*]*\(\d*\|\*\|\*\d\+\$\)\(\.\(\d*\|\*\|\*\d\+\$\)\)\=\([hlLjzt]\|ll\|hh\)\=\([aAbdiuoxXDOUfFeEgGcCsSpn?]\|\[\^\=.[^]]*\]\)" contained
syn match rustFormat display "%%" contained
syn region rustString start=+L\="+ skip=+\\\\\|\\"+ end=+"+ contains=rustTodo,rustFormat
syn region rustAttribute start="#\[" end="\]" contains=rustString syn region rustAttribute start="#\[" end="\]" contains=rustString
@ -108,6 +109,7 @@ hi def link rustHexNumber rustNumber
hi def link rustBinNumber rustNumber hi def link rustBinNumber rustNumber
hi def link rustIdentifierPrime rustIdentifier hi def link rustIdentifierPrime rustIdentifier
hi def link rustFormat Special
hi def link rustString String hi def link rustString String
hi def link rustCharacter Character hi def link rustCharacter Character
hi def link rustNumber Number hi def link rustNumber Number