Merge #360 #361

360: add dbg, debug, trace, info snippet r=ehuss a=PSeitz



361: Syntax: Support `const` functions. r=ehuss a=ehuss



Co-authored-by: Pascal Seitz <[email protected]>
Co-authored-by: Eric Huss <[email protected]>

Author: 3 people

RustEnhanced.sublime-syntax

@@ -106,6 +106,11 @@ contexts:
 
     - include: raw-pointer
 
+    # `const` in a function header has a different scope from `const` values.
+    - match: '\b(const)\s+(?=unsafe|extern|fn)'
+      captures:
+        1: storage.modifier.rust
+
     - match: '\b(const)\s+({{identifier}})'
       captures:
         1: storage.type.rust

snippets/dbg.sublime-snippet

@@ -0,0 +1,6 @@
+<snippet>
+    <content><![CDATA[dbg!($1);$0]]></content>
+    <scope>source.rust</scope>
+    <tabTrigger>dbg</tabTrigger>
+    <description>dbg!(…)</description>
+</snippet>

snippets/debug.sublime-snippet

@@ -0,0 +1,6 @@
+<snippet>
+    <content><![CDATA[debug!("${1:\{${2::?}\}}"${1/([^\{])*(\{.*\})?.*/(?2:, :\);)/}$3${1/([^\{])*(\{.*\})?.*/(?2:\);)/}]]></content>
+    <scope>source.rust</scope>
+    <tabTrigger>debug</tabTrigger>
+    <description>debug!(…)</description>
+</snippet>

snippets/error.sublime-snippet

@@ -0,0 +1,6 @@
+<snippet>
+    <content><![CDATA[error!("${1:\{${2::?}\}}"${1/([^\{])*(\{.*\})?.*/(?2:, :\);)/}$3${1/([^\{])*(\{.*\})?.*/(?2:\);)/}]]></content>
+    <scope>source.rust</scope>
+    <tabTrigger>error</tabTrigger>
+    <description>error!(…)</description>
+</snippet>

snippets/info.sublime-snippet

@@ -0,0 +1,6 @@
+<snippet>
+    <content><![CDATA[info!("${1:\{${2::?}\}}"${1/([^\{])*(\{.*\})?.*/(?2:, :\);)/}$3${1/([^\{])*(\{.*\})?.*/(?2:\);)/}]]></content>
+    <scope>source.rust</scope>
+    <tabTrigger>info</tabTrigger>
+    <description>info!(…)</description>
+</snippet>

snippets/trace.sublime-snippet

@@ -0,0 +1,6 @@
+<snippet>
+    <content><![CDATA[trace!("${1:\{${2::?}\}}"${1/([^\{])*(\{.*\})?.*/(?2:, :\);)/}$3${1/([^\{])*(\{.*\})?.*/(?2:\);)/}]]></content>
+    <scope>source.rust</scope>
+    <tabTrigger>trace</tabTrigger>
+    <description>trace!(…)</description>
+</snippet>

snippets/warn.sublime-snippet

@@ -0,0 +1,6 @@
+<snippet>
+    <content><![CDATA[warn!("${1:\{${2::?}\}}"${1/([^\{])*(\{.*\})?.*/(?2:, :\);)/}$3${1/([^\{])*(\{.*\})?.*/(?2:\);)/}]]></content>
+    <scope>source.rust</scope>
+    <tabTrigger>warn</tabTrigger>
+    <description>warn!(…)</description>
+</snippet>

tests/syntax-rust/syntax_test_functions.rs

@@ -106,3 +106,21 @@ fn f(self,
 //        ^ punctuation.section.brackets.end
 //         ^ punctuation.separator
 {}
+
+const fn f() {}
+// <- storage.modifier
+//    ^^ meta.function storage.type.function
+//       ^ meta.function entity.name.function
+
+const unsafe fn f() {}
+// <- storage.modifier
+//    ^^^^^^ storage.modifier
+//           ^^ meta.function storage.type.function
+//              ^ meta.function entity.name.function
+
+const extern "C" fn f() {}
+// <- storage.modifier
+//    ^^^^^^ keyword.other
+//           ^^^ string.quoted.double
+//               ^^ meta.function storage.type.function
+//                  ^ meta.function entity.name.function