Skip to content

Add new keywords (particularly where & virtual) to editor modes. #16547

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.

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

Merged
merged 1 commit into from
Aug 17, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 3 additions & 2 deletions src/etc/emacs/rust-mode.el
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@
(defconst rust-mode-keywords
'("as"
"box" "break"
"continue" "crate"
"const" "continue" "crate"
"do"
"else" "enum" "extern"
"false" "fn" "for"
Expand All @@ -182,7 +182,8 @@
"self" "static" "struct" "super"
"true" "trait" "type"
"unsafe" "use"
"while"))
"virtual"
"where" "while"))

(defconst rust-special-types
'("u8" "i8"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,8 @@
<keyword>trait</keyword>
<keyword>unsafe</keyword>
<keyword>use</keyword>
<keyword>virtual</keyword>
<keyword>where</keyword>
<keyword>while</keyword>
</context>

Expand Down
3 changes: 3 additions & 0 deletions src/etc/kate/rust.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
<item> as </item>
<item> break </item>
<item> box </item>
<item> const </item>
<item> continue </item>
<item> crate </item>
<item> do </item>
Expand All @@ -44,6 +45,8 @@
<item> trait </item>
<item> unsafe </item>
<item> use </item>
<item> virtual </item>
<item> where </item>
<item> while </item>
</list>
<list name="traits">
Expand Down
2 changes: 1 addition & 1 deletion src/etc/vim/syntax/rust.vim
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ syn keyword rustKeyword fn nextgroup=rustFuncName skipwhite skipempty
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 while
syn keyword rustKeyword unsafe virtual where while
syn keyword rustKeyword use nextgroup=rustModPath,rustModPathInUse 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
Expand Down