Merge #367 #369 #370

367: Syntax: Add `literal` fragment macro matcher. r=ehuss a=ehuss



369: Syntax: Abort on invalid struct syntax. r=ehuss a=ehuss

This helps with macros which use funky syntax.

370: Tests: Update minor wording change 1.34 r=ehuss a=ehuss



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

Author: bors[bot]

RustEnhanced.sublime-syntax

@@ -611,6 +611,9 @@ contexts:
     - match: '\{'
       scope: punctuation.definition.block.begin.rust
       push: struct-classic-body
+    - match: '(?=\S)'
+      # Abort for an invalid match.
+      pop: true
 
   struct-classic-body:
     - meta_scope: meta.block.rust
@@ -628,7 +631,9 @@ contexts:
         - match: ':'
           scope: punctuation.separator.rust
         - include: type-any-identifier
-
+    - match: '(?=\S)'
+      # Abort for an invalid match.
+      pop: true
 
   union-identifier:
     - meta_scope: meta.union.rust
@@ -818,7 +823,7 @@ contexts:
           pop: true
         - include: macro-matchers
 
-    - match: '(\$\s*{{identifier}})\s*(:)\s*(ident|path|expr|ty|pat|stmt|block|item|meta|tt|lifetime|vis)'
+    - match: '(\$\s*{{identifier}})\s*(:)\s*(ident|path|expr|ty|pat|stmt|block|item|meta|tt|lifetime|vis|literal)'
       captures:
         1: variable.parameter.rust
         2: punctuation.separator.rust

tests/error-tests/tests/test_unicode.rs

@@ -6,6 +6,6 @@ fn main() {
 //      ^^^NOTE(>=1.17.0) #[warn(unused_variables)]
 //      ^^^NOTE(>=1.21.0,<1.22.0) to disable this warning
 //      ^^^NOTE(>=1.22.0,<1.25.0-beta) to avoid this warning
-//      ^^^HELP(>=1.25.0-beta) consider using `_foo` instead
+//      ^^^HELP(>=1.25.0-beta) consider
 //      ^^^HELP(>=1.25.0-beta) /Accept Replacement:.*_foo/
 }

tests/syntax-rust/syntax_test_macros.rs

@@ -354,6 +354,9 @@ macro_rules! designators {
      $v:vis,
 //   ^^ variable.parameter
 //      ^^^ storage.type
+     $l:literal,
+//   ^^ variable.parameter
+//      ^^^^^^^ storage.type
     ) => ();
     // And various tokens
     ("Any token" /*comment*/ true => 3.14 'life 'c' @ struct self) => ();