Merge pull request zargony#63 from miqid/master

Provide additional highlighting within function definitions and type declarations

Author: zargony

grammars/rust.cson

@@ -76,6 +76,16 @@
     'name': 'storage.modifier.box.rust'
     'match': '\\bbox\\b'
   }
+  'const': {
+    'comment': 'Const storage modifier'
+    'name': 'storage.modifier.const.rust'
+    'match': '\\bconst\\b'
+  }
+  'pub': {
+    'comment': 'Visibility modifier'
+    'name': 'storage.modifier.visibility.rust'
+    'match': '\\bpub\\b'
+  }
   'lifetime': {
     'comment': 'Named lifetime'
     'name': 'storage.modifier.lifetime.rust'
@@ -209,16 +219,6 @@
     'name': 'storage.modifier.static.rust'
     'match': '\\bstatic\\b'
   }
-  {
-    'comment': 'Const storage modifier'
-    'name': 'storage.modifier.const.rust'
-    'match': '\\bconst\\b'
-  }
-  {
-    'comment': 'Visibility modifier'
-    'name': 'storage.modifier.visibility.rust'
-    'match': '\\bpub\\b'
-  }
   {
     'comment': 'Boolean constant'
     'name': 'constant.language.boolean.rust'
@@ -245,6 +245,8 @@
   { 'include': '#box' }
   { 'include': '#lifetime' }
   { 'include': '#ref_lifetime' }
+  { 'include': '#const' }
+  { 'include': '#pub' }
   # Operators
   {
     'comment': 'Operator'
@@ -317,6 +319,7 @@
       { 'include': '#std_types' }
       { 'include': '#std_traits' }
       { 'include': '#type_params' }
+      { 'include': '#const' }
     ]
   }
   # Type declaration
@@ -334,6 +337,8 @@
       { 'include': '#core_traits' }
       { 'include': '#std_traits' }
       { 'include': '#type_params' }
+      { 'include': '#core_types' }
+      { 'include': '#pub' }
     ]
   }
   # Type alias

test.rs

@@ -207,3 +207,11 @@ let x: Vec<Vec<u8>> = Vec::new();
 // Correct detection of == (#40)
 struct Foo { x: i32 }
 if x == 1 { }
+
+// const function parameter (#52)
+fn foo(bar: *const i32) {
+    let _ = 1234 as *const u32;
+}
+
+// Keywords and known types in wrapper structs (#56)
+pub struct Foobar(pub Option<bool>);