Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

auto: vim syntax highlighting improvements #4749

Closed
wants to merge 7 commits into from
Closed

auto: vim syntax highlighting improvements #4749

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0c1a345
vim: export is no longer a keyword
thestinger Feb 1, 2013
405b868
vim: add Self type
thestinger Feb 1, 2013
5b47c55
vim: unsafe:: namespaces were renamed to raw::
thestinger Feb 1, 2013
1c3cca8
vim: 'be' is a reserved keyword
thestinger Feb 1, 2013
00201c9
vim: use StorageClass for mut and const
thestinger Feb 1, 2013
6052d67
vim: pub is just a plain old token keyword
thestinger Feb 1, 2013
dffc3f8
vim: 'fail' is no longer a keyword
thestinger Feb 2, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/etc/vim/syntax/rust.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,25 +12,24 @@ endif

syn match rustAssert "\<assert\(\w\)*"
syn keyword rustKeyword as break
syn keyword rustKeyword const copy do drop else export extern fail
syn keyword rustKeyword copy do drop else extern
syn keyword rustKeyword for if impl let log
syn keyword rustKeyword loop match mod move mut once priv pure
syn match rustKeyword "\<pub\>"
syn keyword rustKeyword loop match mod move once priv pub pure
syn keyword rustKeyword ref return static
syn match rustKeyword "\<unsafe\>" " Allows also matching unsafe::foo()
syn keyword rustKeyword use while
syn keyword rustKeyword unsafe use while
" FIXME: Scoped impl's name is also fallen in this category
syn keyword rustKeyword mod trait struct enum type nextgroup=rustIdentifier skipwhite
syn keyword rustKeyword fn nextgroup=rustFuncName skipwhite
syn keyword rustStorage const mut

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
syn keyword rustKeyword m32 m64 m128 f80 f16 f128
syn keyword rustKeyword m32 m64 m128 f80 f16 f128 be

syn keyword rustType int uint float char bool u8 u16 u32 u64 f32
syn keyword rustType f64 i8 i16 i32 i64 str
syn keyword rustType f64 i8 i16 i32 i64 str Self
syn keyword rustType Option Either

" Types from libc
Expand Down Expand Up @@ -134,6 +133,7 @@ hi def link rustMacro Macro
hi def link rustType Type
hi def link rustTodo Todo
hi def link rustAttribute PreProc
hi def link rustStorage StorageClass

" Other Suggestions:
" hi rustAssert ctermfg=yellow
Expand Down