diff options
| author | Corey Richardson <corey@octayn.net> | 2014-03-30 08:34:32 -0400 |
|---|---|---|
| committer | Corey Richardson <corey@octayn.net> | 2014-04-04 00:53:23 -0400 |
| commit | b6d5dafea58c7f8f254333d53fe6b4b8ee8763e3 (patch) | |
| tree | 2470b24502b74863ce153950a46df54163e3363f | |
| parent | 2eccb1d0c241b2ad67d0cdadc66bbc45e9f6e290 (diff) | |
etc: attempts at fixing editor highlighting for new attribute syntax
| -rw-r--r-- | src/etc/emacs/rust-mode.el | 2 | ||||
| -rw-r--r-- | src/etc/gedit/share/gtksourceview-3.0/language-specs/rust.lang | 2 | ||||
| -rw-r--r-- | src/etc/kate/rust.xml | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/src/etc/emacs/rust-mode.el b/src/etc/emacs/rust-mode.el index 5cee600c2c0..26bdf7d7fba 100644 --- a/src/etc/emacs/rust-mode.el +++ b/src/etc/emacs/rust-mode.el @@ -122,7 +122,7 @@ ;; but the "else" or "{" should align with the beginning ;; of the expression it's in.) (looking-at "\\<else\\>\\|{") - + (save-excursion (rust-rewind-irrelevant) ;; Point is now at the end of the previous ine diff --git a/src/etc/gedit/share/gtksourceview-3.0/language-specs/rust.lang b/src/etc/gedit/share/gtksourceview-3.0/language-specs/rust.lang index b9b0aa55a86..7ffa35b94e4 100644 --- a/src/etc/gedit/share/gtksourceview-3.0/language-specs/rust.lang +++ b/src/etc/gedit/share/gtksourceview-3.0/language-specs/rust.lang @@ -282,7 +282,7 @@ </context> <context id="attribute" style-ref="attribute" class="attribute"> - <start extended="true">\#\[</start> + <start extended="true">\#!?\[</start> <end>\]</end> <include> <context ref="def:in-comment"/> diff --git a/src/etc/kate/rust.xml b/src/etc/kate/rust.xml index 98d870adf03..7fc44ebad29 100644 --- a/src/etc/kate/rust.xml +++ b/src/etc/kate/rust.xml @@ -202,6 +202,7 @@ <RegExpr String="[0-9][0-9_]*\.[0-9_]*([eE][+-]?[0-9_]+)?(f32|f64|f)?" attribute="Number" context="#stay"/> <RegExpr String="[0-9][0-9_]*&rustIntSuf;" attribute="Number" context="#stay"/> <Detect2Chars char="#" char1="[" attribute="Attribute" context="Attribute" beginRegion="Attribute"/> + <Detect2Chars char="#" char1="!" char2="[" attribute="Attribute" context="Attribute" beginRegion="Attribute"/> <RegExpr String="&rustIdent;::" attribute="Scope"/> <RegExpr String="&rustIdent;!" attribute="Macro"/> <RegExpr String="'&rustIdent;(?!')" attribute="Lifetime"/> |